* [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT
@ 2023-12-18 9:00 Song Gao
2023-12-18 9:00 ` [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
` (16 more replies)
0 siblings, 17 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Hi, All
We already support boot efi kernel with bios, but not support boot elf kernel.
This series adds boot elf kernel with FDT.
'LoongArch supports ACPI and FDT. The information that needs to be passed
to the kernel includes the memmap, the initrd, the command line, optionally
the ACPI/FDT tables, and so on' see [1].
Patch 2-8 : Create efi system table, and three efi configuration table
boot_memmap, initd, FDT.
Patch 9-17 : Fixes FDT problems.
Test:
- Start kernel
See [2] start_kernel.sh
- Start qcow2
See [2] start_qcow2.sh
V2:
- FDT pcie node adds cells 'msi-map';
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/arch/loongarch/booting.rst?h=v6.7-rc4
[2]: https://github.com/gaosong-loongson/loongarch-binary/releases
Please review!
Thanks.
Song Gao
Song Gao (17):
hw/loongarch: Move boot fucntions to boot.c
hw/loongarch: Add load initrd
hw/loongarch: Add init_cmdline
hw/loongarch: Add slave cpu boot_code
hw/loongarch: Init efi_system_table
hw/loongarch: Init efi_boot_memmap table
hw/loongarch: Init efi_initrd table
hw/loongarch: Init efi_fdt table
hw/loongarch: Fix fdt memory node wrong 'reg'
hw/loongarch: fdt adds cpu interrupt controller node
hw/loongarch: fdt adds Extend I/O Interrupt Controller
hw/loongarch: fdt adds pch_pic Controller
hw/loongarch: fdt adds pch_msi Controller
hw/loongarch: fdt adds pcie irq_map node
hw/loongarch: fdt remove unused irqchip node
hw/loongarch: Add cells missing from uart node
hw/loongarch: Add cells missing from rtc node
hw/loongarch/boot.c | 358 ++++++++++++++++++++++++++++
hw/loongarch/meson.build | 1 +
hw/loongarch/virt.c | 360 ++++++++++++++++-------------
include/hw/intc/loongarch_extioi.h | 1 +
include/hw/loongarch/boot.h | 111 +++++++++
include/hw/loongarch/virt.h | 14 ++
include/hw/pci-host/ls7a.h | 2 +
target/loongarch/cpu.h | 2 +
8 files changed, 688 insertions(+), 161 deletions(-)
create mode 100644 hw/loongarch/boot.c
create mode 100644 include/hw/loongarch/boot.h
--
2.25.1
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-21 7:04 ` maobibo
2023-12-18 9:00 ` [PATCH v2 02/17] hw/loongarch: Add load initrd Song Gao
` (15 subsequent siblings)
16 siblings, 1 reply; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Move some boot functions to boot.c and struct
loongarch_boot_info into struct LoongArchMachineState.
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 127 ++++++++++++++++++++++++++++++++++++
hw/loongarch/meson.build | 1 +
hw/loongarch/virt.c | 118 ++-------------------------------
include/hw/loongarch/boot.h | 21 ++++++
include/hw/loongarch/virt.h | 2 +
5 files changed, 155 insertions(+), 114 deletions(-)
create mode 100644 hw/loongarch/boot.c
create mode 100644 include/hw/loongarch/boot.h
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
new file mode 100644
index 0000000000..9f25ea5847
--- /dev/null
+++ b/hw/loongarch/boot.c
@@ -0,0 +1,127 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * LoongArch boot helper functions.
+ *
+ * Copyright (c) 2023 Loongson Technology Corporation Limited
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/units.h"
+#include "target/loongarch/cpu.h"
+#include "hw/loongarch/virt.h"
+#include "hw/loader.h"
+#include "elf.h"
+#include "qemu/error-report.h"
+#include "sysemu/reset.h"
+
+static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
+{
+ return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
+}
+
+static int64_t load_kernel_info(struct loongarch_boot_info *info)
+{
+ uint64_t kernel_entry, kernel_low, kernel_high;
+ ssize_t kernel_size;
+
+ kernel_size = load_elf(info->kernel_filename, NULL,
+ cpu_loongarch_virt_to_phys, NULL,
+ &kernel_entry, &kernel_low,
+ &kernel_high, NULL, 0,
+ EM_LOONGARCH, 1, 0);
+
+ if (kernel_size < 0) {
+ error_report("could not load kernel '%s': %s",
+ info->kernel_filename,
+ load_elf_strerror(kernel_size));
+ exit(1);
+ }
+ return kernel_entry;
+}
+
+static void reset_load_elf(void *opaque)
+{
+ LoongArchCPU *cpu = opaque;
+ CPULoongArchState *env = &cpu->env;
+
+ cpu_reset(CPU(cpu));
+ if (env->load_elf) {
+ cpu_set_pc(CPU(cpu), env->elf_address);
+ }
+}
+
+static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
+ FWCfgState *fw_cfg)
+{
+ /*
+ * Expose the kernel, the command line, and the initrd in fw_cfg.
+ * We don't process them here at all, it's all left to the
+ * firmware.
+ */
+ load_image_to_fw_cfg(fw_cfg,
+ FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
+ info->kernel_filename,
+ false);
+
+ if (info->initrd_filename) {
+ load_image_to_fw_cfg(fw_cfg,
+ FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
+ info->initrd_filename, false);
+ }
+
+ if (info->kernel_cmdline) {
+ fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
+ strlen(info->kernel_cmdline) + 1);
+ fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
+ info->kernel_cmdline);
+ }
+}
+
+static void loongarch_firmware_boot(LoongArchMachineState *lams,
+ struct loongarch_boot_info *info)
+{
+ fw_cfg_add_kernel_info(info, lams->fw_cfg);
+}
+
+static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
+ struct loongarch_boot_info *info)
+{
+ MachineState *machine = MACHINE(lams);
+ int64_t kernel_addr = 0;
+ LoongArchCPU *lacpu;
+ int i;
+
+ if (info->kernel_filename) {
+ kernel_addr = load_kernel_info(info);
+ } else {
+ error_report("Need kernel filename\n");
+ exit(1);
+ }
+
+ for (i = 0; i < machine->smp.cpus; i++) {
+ lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
+ lacpu->env.load_elf = true;
+ lacpu->env.elf_address = kernel_addr;
+ }
+}
+
+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
+{
+ LoongArchMachineState *lams = LOONGARCH_MACHINE(ms);
+ int i;
+
+ /* register reset function */
+ for (i = 0; i < ms->smp.cpus; i++) {
+ qemu_register_reset(reset_load_elf, LOONGARCH_CPU(qemu_get_cpu(i)));
+ }
+
+ info->kernel_filename = ms->kernel_filename;
+ info->kernel_cmdline = ms->kernel_cmdline;
+ info->initrd_filename = ms->initrd_filename;
+
+ if (lams->bios_loaded) {
+ loongarch_firmware_boot(lams, info);
+ } else {
+ loongarch_direct_kernel_boot(lams, info);
+ }
+}
diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
index c0421502ab..d306d82c2e 100644
--- a/hw/loongarch/meson.build
+++ b/hw/loongarch/meson.build
@@ -1,6 +1,7 @@
loongarch_ss = ss.source_set()
loongarch_ss.add(files(
'fw_cfg.c',
+ 'boot.c',
))
loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 4b7dc67a2d..3e27d72f55 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -46,14 +46,6 @@
#include "hw/block/flash.h"
#include "qemu/error-report.h"
-
-struct loaderparams {
- uint64_t ram_size;
- const char *kernel_filename;
- const char *kernel_cmdline;
- const char *initrd_filename;
-};
-
static void virt_flash_create(LoongArchMachineState *lams)
{
DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);
@@ -376,31 +368,6 @@ static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
memmap_entries++;
}
-static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
-{
- return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
-}
-
-static int64_t load_kernel_info(const struct loaderparams *loaderparams)
-{
- uint64_t kernel_entry, kernel_low, kernel_high;
- ssize_t kernel_size;
-
- kernel_size = load_elf(loaderparams->kernel_filename, NULL,
- cpu_loongarch_virt_to_phys, NULL,
- &kernel_entry, &kernel_low,
- &kernel_high, NULL, 0,
- EM_LOONGARCH, 1, 0);
-
- if (kernel_size < 0) {
- error_report("could not load kernel '%s': %s",
- loaderparams->kernel_filename,
- load_elf_strerror(kernel_size));
- exit(1);
- }
- return kernel_entry;
-}
-
static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState *lams)
{
DeviceState *dev;
@@ -668,69 +635,6 @@ static void loongarch_firmware_init(LoongArchMachineState *lams)
memory_region_add_subregion(get_system_memory(), VIRT_BIOS_BASE, &lams->bios);
lams->bios_loaded = true;
}
-
-}
-
-static void reset_load_elf(void *opaque)
-{
- LoongArchCPU *cpu = opaque;
- CPULoongArchState *env = &cpu->env;
-
- cpu_reset(CPU(cpu));
- if (env->load_elf) {
- cpu_set_pc(CPU(cpu), env->elf_address);
- }
-}
-
-static void fw_cfg_add_kernel_info(const struct loaderparams *loaderparams,
- FWCfgState *fw_cfg)
-{
- /*
- * Expose the kernel, the command line, and the initrd in fw_cfg.
- * We don't process them here at all, it's all left to the
- * firmware.
- */
- load_image_to_fw_cfg(fw_cfg,
- FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
- loaderparams->kernel_filename,
- false);
-
- if (loaderparams->initrd_filename) {
- load_image_to_fw_cfg(fw_cfg,
- FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
- loaderparams->initrd_filename, false);
- }
-
- if (loaderparams->kernel_cmdline) {
- fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
- strlen(loaderparams->kernel_cmdline) + 1);
- fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
- loaderparams->kernel_cmdline);
- }
-}
-
-static void loongarch_firmware_boot(LoongArchMachineState *lams,
- const struct loaderparams *loaderparams)
-{
- fw_cfg_add_kernel_info(loaderparams, lams->fw_cfg);
-}
-
-static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
- const struct loaderparams *loaderparams)
-{
- MachineState *machine = MACHINE(lams);
- int64_t kernel_addr = 0;
- LoongArchCPU *lacpu;
- int i;
-
- kernel_addr = load_kernel_info(loaderparams);
- if (!machine->firmware) {
- for (i = 0; i < machine->smp.cpus; i++) {
- lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
- lacpu->env.load_elf = true;
- lacpu->env.elf_address = kernel_addr;
- }
- }
}
static void loongarch_init(MachineState *machine)
@@ -750,7 +654,6 @@ static void loongarch_init(MachineState *machine)
MachineClass *mc = MACHINE_GET_CLASS(machine);
CPUState *cpu;
char *ramName = NULL;
- struct loaderparams loaderparams = { };
if (!cpu_model) {
cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
@@ -844,24 +747,8 @@ static void loongarch_init(MachineState *machine)
sizeof(struct memmap_entry) * (memmap_entries));
}
fdt_add_fw_cfg_node(lams);
- loaderparams.ram_size = ram_size;
- loaderparams.kernel_filename = machine->kernel_filename;
- loaderparams.kernel_cmdline = machine->kernel_cmdline;
- loaderparams.initrd_filename = machine->initrd_filename;
- /* load the kernel. */
- if (loaderparams.kernel_filename) {
- if (lams->bios_loaded) {
- loongarch_firmware_boot(lams, &loaderparams);
- } else {
- loongarch_direct_kernel_boot(lams, &loaderparams);
- }
- }
fdt_add_flash_node(lams);
- /* register reset function */
- for (i = 0; i < machine->smp.cpus; i++) {
- lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
- qemu_register_reset(reset_load_elf, lacpu);
- }
+
/* Initialize the IO interrupt subsystem */
loongarch_irq_init(lams);
fdt_add_irqchip_node(lams);
@@ -886,6 +773,9 @@ static void loongarch_init(MachineState *machine)
fdt_base = 1 * MiB;
qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
rom_add_blob_fixed("fdt", machine->fdt, lams->fdt_size, fdt_base);
+
+ lams->bootinfo.ram_size = ram_size;
+ loongarch_load_kernel(machine, &lams->bootinfo);
}
bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
new file mode 100644
index 0000000000..3275c1e295
--- /dev/null
+++ b/include/hw/loongarch/boot.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Definitions for LoongArch boot.
+ *
+ * Copyright (C) 2023 Loongson Technology Corporation Limited
+ */
+
+#ifndef HW_LOONGARCH_BOOT_H
+#define HW_LOONGARCH_BOOT_H
+
+struct loongarch_boot_info {
+ uint64_t ram_size;
+ const char *kernel_filename;
+ const char *kernel_cmdline;
+ const char *initrd_filename;
+ uint64_t a0, a1, a2;
+};
+
+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
+
+#endif /* HW_LOONGARCH_BOOT_H */
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index 674f4655e0..e4126dd0e7 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -13,6 +13,7 @@
#include "qemu/queue.h"
#include "hw/intc/loongarch_ipi.h"
#include "hw/block/flash.h"
+#include "hw/loongarch/boot.h"
#define LOONGARCH_MAX_CPUS 256
@@ -50,6 +51,7 @@ struct LoongArchMachineState {
DeviceState *platform_bus_dev;
PCIBus *pci_bus;
PFlashCFI01 *flash;
+ struct loongarch_boot_info bootinfo;
};
#define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt")
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 02/17] hw/loongarch: Add load initrd
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
2023-12-18 9:00 ` [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-21 7:09 ` maobibo
2023-12-18 9:00 ` [PATCH v2 03/17] hw/loongarch: Add init_cmdline Song Gao
` (14 subsequent siblings)
16 siblings, 1 reply; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
we load initrd ramdisk after kernel_high address
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 9f25ea5847..2be6dfb037 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -21,7 +21,8 @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
static int64_t load_kernel_info(struct loongarch_boot_info *info)
{
- uint64_t kernel_entry, kernel_low, kernel_high;
+ uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
+ ram_addr_t initrd_offset;
ssize_t kernel_size;
kernel_size = load_elf(info->kernel_filename, NULL,
@@ -36,6 +37,32 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
load_elf_strerror(kernel_size));
exit(1);
}
+
+ if (info->initrd_filename) {
+ initrd_size = get_image_size(info->initrd_filename);
+ if (initrd_size > 0) {
+ initrd_offset = ROUND_UP(kernel_high, 64 * KiB);
+
+ if (initrd_offset + initrd_size > info->ram_size) {
+ error_report("memory too small for initial ram disk '%s'",
+ info->initrd_filename);
+ exit(1);
+ }
+
+ initrd_size = load_image_targphys(info->initrd_filename, initrd_offset,
+ info->ram_size - initrd_offset);
+ }
+
+ if (initrd_size == (target_ulong)-1) {
+ error_report("could not load initial ram disk '%s'",
+ info->initrd_filename);
+ exit(1);
+ }
+ } else {
+ error_report("Need initrd!");
+ exit(1);
+ }
+
return kernel_entry;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 03/17] hw/loongarch: Add init_cmdline
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
2023-12-18 9:00 ` [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
2023-12-18 9:00 ` [PATCH v2 02/17] hw/loongarch: Add load initrd Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-21 7:20 ` maobibo
2023-12-18 9:00 ` [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code Song Gao
` (13 subsequent siblings)
16 siblings, 1 reply; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Add init_cmline and set boot_info->a0, a1
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 21 +++++++++++++++++++++
include/hw/loongarch/virt.h | 2 ++
target/loongarch/cpu.h | 2 ++
3 files changed, 25 insertions(+)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 2be6dfb037..4bfe24274a 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -14,6 +14,20 @@
#include "qemu/error-report.h"
#include "sysemu/reset.h"
+static int init_cmdline(struct loongarch_boot_info *info)
+{
+ hwaddr cmdline_addr;
+ cmdline_addr = 0xff00000ULL;
+
+ pstrcpy_targphys("cmdline", 0xff00000ULL,
+ COMMAND_LINE_SIZE, info->kernel_cmdline);
+
+ info->a0 = 1;
+ info->a1 = cmdline_addr;
+
+ return 0;
+}
+
static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
{
return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
@@ -63,6 +77,8 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
exit(1);
}
+ init_cmdline(info);
+
return kernel_entry;
}
@@ -73,6 +89,10 @@ static void reset_load_elf(void *opaque)
cpu_reset(CPU(cpu));
if (env->load_elf) {
+ if (cpu == LOONGARCH_CPU(first_cpu)) {
+ env->gpr[4] = env->boot_info->a0;
+ env->gpr[5] = env->boot_info->a1;
+ }
cpu_set_pc(CPU(cpu), env->elf_address);
}
}
@@ -129,6 +149,7 @@ static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
lacpu->env.load_elf = true;
lacpu->env.elf_address = kernel_addr;
+ lacpu->env.boot_info = info;
}
}
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index e4126dd0e7..d21de2cef4 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -31,6 +31,8 @@
#define VIRT_GED_MEM_ADDR (VIRT_GED_EVT_ADDR + ACPI_GED_EVT_SEL_LEN)
#define VIRT_GED_REG_ADDR (VIRT_GED_MEM_ADDR + MEMORY_HOTPLUG_IO_LEN)
+#define COMMAND_LINE_SIZE 512
+
struct LoongArchMachineState {
/*< private >*/
MachineState parent_obj;
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 00d1fba597..c7c695138e 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -362,6 +362,8 @@ typedef struct CPUArchState {
uint64_t elf_address;
/* Store ipistate to access from this struct */
DeviceState *ipistate;
+
+ struct loongarch_boot_info *boot_info;
#endif
} CPULoongArchState;
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (2 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 03/17] hw/loongarch: Add init_cmdline Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-21 7:22 ` maobibo
2023-12-18 9:00 ` [PATCH v2 05/17] hw/loongarch: Init efi_system_table Song Gao
` (12 subsequent siblings)
16 siblings, 1 reply; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 65 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 64 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 4bfe24274a..076e795714 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -14,6 +14,62 @@
#include "qemu/error-report.h"
#include "sysemu/reset.h"
+enum {
+ SLAVE_BOOT,
+};
+
+static const MemMapEntry loader_rommap[] = {
+ [SLAVE_BOOT] = {0xf100000, 0x10000},
+};
+
+static unsigned int slave_boot_code[] = {
+ /* Configure reset ebase. */
+ 0x0400302c, /* csrwr $r12,0xc */
+
+ /* Disable interrupt. */
+ 0x0380100c, /* ori $r12,$r0,0x4 */
+ 0x04000180, /* csrxchg $r0,$r12,0x0 */
+
+ /* Clear mailbox. */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x038081ad, /* ori $r13,$r13,0x20 */
+ 0x06481da0, /* iocsrwr.d $r0,$r13 */
+
+ /* Enable IPI interrupt. */
+ 0x1400002c, /* lu12i.w $r12,1(0x1) */
+ 0x0400118c, /* csrxchg $r12,$r12,0x4 */
+ 0x02fffc0c, /* addi.d $r12,$r0,-1(0xfff) */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x038011ad, /* ori $r13,$r13,0x4 */
+ 0x064819ac, /* iocsrwr.w $r12,$r13 */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x038081ad, /* ori $r13,$r13,0x20 */
+
+ /* Wait for wakeup <.L11>: */
+ 0x06488000, /* idle 0x0 */
+ 0x03400000, /* andi $r0,$r0,0x0 */
+ 0x064809ac, /* iocsrrd.w $r12,$r13 */
+ 0x43fff59f, /* beqz $r12,-12(0x7ffff4) # 48 <.L11> */
+
+ /* Read and clear IPI interrupt. */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x064809ac, /* iocsrrd.w $r12,$r13 */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x038031ad, /* ori $r13,$r13,0xc */
+ 0x064819ac, /* iocsrwr.w $r12,$r13 */
+
+ /* Disable IPI interrupt. */
+ 0x1400002c, /* lu12i.w $r12,1(0x1) */
+ 0x04001180, /* csrxchg $r0,$r12,0x4 */
+
+ /* Read mail buf and jump to specified entry */
+ 0x1400002d, /* lu12i.w $r13,1(0x1) */
+ 0x038081ad, /* ori $r13,$r13,0x20 */
+ 0x06480dac, /* iocsrrd.d $r12,$r13 */
+ 0x00150181, /* move $r1,$r12 */
+ 0x4c000020, /* jirl $r0,$r1,0 */
+};
+
static int init_cmdline(struct loongarch_boot_info *info)
{
hwaddr cmdline_addr;
@@ -145,10 +201,17 @@ static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
exit(1);
}
+ rom_add_blob_fixed("slave_boot", slave_boot_code, sizeof(slave_boot_code),
+ loader_rommap[SLAVE_BOOT].base);
+
for (i = 0; i < machine->smp.cpus; i++) {
lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
lacpu->env.load_elf = true;
- lacpu->env.elf_address = kernel_addr;
+ if (i == 0) {
+ lacpu->env.elf_address = kernel_addr;
+ } else {
+ lacpu->env.elf_address = loader_rommap[SLAVE_BOOT].base;
+ }
lacpu->env.boot_info = info;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 05/17] hw/loongarch: Init efi_system_table
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (3 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
` (11 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Add init_systab and set boot_info->a2
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 39 +++++++++++++++++++++++++++++
include/hw/loongarch/boot.h | 50 +++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 076e795714..7d043fd718 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -16,10 +16,14 @@
enum {
SLAVE_BOOT,
+ EFI_SYSTAB,
+ EFI_TABLES,
};
static const MemMapEntry loader_rommap[] = {
[SLAVE_BOOT] = {0xf100000, 0x10000},
+ [EFI_SYSTAB] = {0xf200000, 0x10000},
+ [EFI_TABLES] = {0xf300000, 0x10000},
};
static unsigned int slave_boot_code[] = {
@@ -70,6 +74,39 @@ static unsigned int slave_boot_code[] = {
0x4c000020, /* jirl $r0,$r1,0 */
};
+static void init_systab(struct loongarch_boot_info *info)
+{
+ struct efi_system_table *systab;
+ struct efi_configuration_table *efi_tables;
+ systab = g_malloc0(loader_rommap[EFI_SYSTAB].size);
+ efi_tables = g_malloc0(loader_rommap[EFI_TABLES].size);
+
+ systab->hdr.signature = EFI_SYSTEM_TABLE_SIGNATURE;
+ systab->hdr.revision = EFI_SPECIFICATION_VERSION;
+ systab->hdr.revision = sizeof(struct efi_system_table),
+ systab->fw_revision = FW_VERSION << 16 | FW_PATCHLEVEL << 8;
+ systab->runtime = 0;
+ systab->boottime = 0;
+ systab->nr_tables = 0;
+ systab->tables = efi_tables;
+
+ rom_add_blob_fixed("tables_rom", efi_tables,
+ loader_rommap[EFI_TABLES].size,
+ loader_rommap[EFI_TABLES].base);
+
+ systab->tables = (struct efi_configuration_table *)
+ loader_rommap[EFI_TABLES].base;
+
+ rom_add_blob_fixed("systab_rom", systab,
+ loader_rommap[EFI_SYSTAB].size,
+ loader_rommap[EFI_SYSTAB].base);
+
+ info->a2 = loader_rommap[EFI_SYSTAB].base;
+
+ g_free(systab);
+ g_free(efi_tables);
+}
+
static int init_cmdline(struct loongarch_boot_info *info)
{
hwaddr cmdline_addr;
@@ -134,6 +171,7 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
}
init_cmdline(info);
+ init_systab(info);
return kernel_entry;
}
@@ -148,6 +186,7 @@ static void reset_load_elf(void *opaque)
if (cpu == LOONGARCH_CPU(first_cpu)) {
env->gpr[4] = env->boot_info->a0;
env->gpr[5] = env->boot_info->a1;
+ env->gpr[6] = env->boot_info->a2;
}
cpu_set_pc(CPU(cpu), env->elf_address);
}
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index 3275c1e295..4ee116b25d 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -8,6 +8,56 @@
#ifndef HW_LOONGARCH_BOOT_H
#define HW_LOONGARCH_BOOT_H
+/* UEFI 2.10 */
+#define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249
+#define EFI_2_100_SYSTEM_TABLE_REVISION ((2<<16) | (100))
+#define EFI_SPECIFICATION_VERSION EFI_SYSTEM_TABLE_REVISION
+#define EFI_SYSTEM_TABLE_REVISION EFI_2_100_SYSTEM_TABLE_REVISION
+
+#define FW_VERSION 0x1
+#define FW_PATCHLEVEL 0x0
+
+#define EFI_MAX_CONFIGURATION_TABLES 16
+
+typedef struct {
+ uint8_t b[16];
+} efi_guid_t __attribute__((aligned(8)));
+
+struct efi_config_table {
+ efi_guid_t guid;
+ uint64_t *ptr;
+ const char name[16];
+};
+
+typedef struct {
+ uint64_t signature;
+ uint32_t revision;
+ uint32_t headersize;
+ uint32_t crc32;
+ uint32_t reserved;
+} efi_table_hdr_t;
+
+struct efi_configuration_table {
+ efi_guid_t guid;
+ void *table;
+};
+
+struct efi_system_table {
+ efi_table_hdr_t hdr;
+ uint64_t fw_vendor; /* physical addr of CHAR16 vendor string */
+ uint32_t fw_revision;
+ uint64_t con_in_handle;
+ uint64_t *con_in;
+ uint64_t con_out_handle;
+ uint64_t *con_out;
+ uint64_t stderr_handle;
+ uint64_t stderr;
+ uint64_t *runtime;
+ uint64_t *boottime;
+ uint64_t nr_tables;
+ struct efi_configuration_table *tables;
+};
+
struct loongarch_boot_info {
uint64_t ram_size;
const char *kernel_filename;
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 06/17] hw/loongarch: Init efi_boot_memmap table
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (4 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 05/17] hw/loongarch: Init efi_system_table Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 07/17] hw/loongarch: Init efi_initrd table Song Gao
` (10 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 45 +++++++++++++++++++++++++++++++++++++
hw/loongarch/virt.c | 11 ++-------
include/hw/loongarch/boot.h | 27 ++++++++++++++++++++++
include/hw/loongarch/virt.h | 10 +++++++++
4 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 7d043fd718..5d963176bd 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -18,12 +18,14 @@ enum {
SLAVE_BOOT,
EFI_SYSTAB,
EFI_TABLES,
+ EFI_MEMMAP,
};
static const MemMapEntry loader_rommap[] = {
[SLAVE_BOOT] = {0xf100000, 0x10000},
[EFI_SYSTAB] = {0xf200000, 0x10000},
[EFI_TABLES] = {0xf300000, 0x10000},
+ [EFI_MEMMAP] = {0xf400000, 0x10000},
};
static unsigned int slave_boot_code[] = {
@@ -74,6 +76,47 @@ static unsigned int slave_boot_code[] = {
0x4c000020, /* jirl $r0,$r1,0 */
};
+static inline void *guidcpy(void *dst, const void *src)
+{
+ return memcpy(dst, src, sizeof(efi_guid_t));
+}
+
+static void init_efi_boot_memmap(struct efi_system_table *systab)
+{
+ unsigned i;
+ struct efi_boot_memmap *boot_memmap;
+ efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID;
+
+ boot_memmap = g_malloc0(sizeof(struct efi_boot_memmap) +
+ sizeof(efi_memory_desc_t) * 32);
+ if (!boot_memmap) {
+ error_report("init_boot_memmap :can not malloc memory\n");
+ exit(1);
+ }
+ boot_memmap->desc_size = sizeof(efi_memory_desc_t);
+ boot_memmap->desc_ver = 1;
+ boot_memmap->map_size = 0;
+
+ efi_memory_desc_t *map;
+ for (i = 0; i < memmap_entries; i++) {
+ map = (void *)boot_memmap + sizeof(*map);
+ map[i].type = memmap_table[i].type;
+ map[i].phys_addr = memmap_table[i].address;
+ map[i].num_pages = memmap_table[i].length >> 16; /* 64KB align*/
+ }
+
+ rom_add_blob_fixed("memmap_rom", boot_memmap,
+ loader_rommap[EFI_MEMMAP].size,
+ loader_rommap[EFI_MEMMAP].base);
+
+ /* efi_configuration_table 1 */
+ guidcpy(&systab->tables[0].guid, &tbl_guid);
+ systab->tables[0].table = (void *)loader_rommap[EFI_MEMMAP].base;
+ systab->nr_tables = 1;
+
+ g_free(boot_memmap);
+}
+
static void init_systab(struct loongarch_boot_info *info)
{
struct efi_system_table *systab;
@@ -90,6 +133,8 @@ static void init_systab(struct loongarch_boot_info *info)
systab->nr_tables = 0;
systab->tables = efi_tables;
+ init_efi_boot_memmap(systab);
+
rom_add_blob_fixed("tables_rom", efi_tables,
loader_rommap[EFI_TABLES].size,
loader_rommap[EFI_TABLES].base);
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 3e27d72f55..c45e724961 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -342,15 +342,8 @@ static void virt_powerdown_req(Notifier *notifier, void *opaque)
acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
}
-struct memmap_entry {
- uint64_t address;
- uint64_t length;
- uint32_t type;
- uint32_t reserved;
-};
-
-static struct memmap_entry *memmap_table;
-static unsigned memmap_entries;
+struct memmap_entry *memmap_table;
+unsigned memmap_entries;
static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
{
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index 4ee116b25d..bef9ab659e 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -23,6 +23,15 @@ typedef struct {
uint8_t b[16];
} efi_guid_t __attribute__((aligned(8)));
+#define EFI_GUID(a, b, c, d...) (efi_guid_t){ { \
+ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
+ (b) & 0xff, ((b) >> 8) & 0xff, \
+ (c) & 0xff, ((c) >> 8) & 0xff, d } }
+
+#define LINUX_EFI_BOOT_MEMMAP_GUID \
+ EFI_GUID(0x800f683f, 0xd08b, 0x423a, 0xa2, 0x93, \
+ 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
+
struct efi_config_table {
efi_guid_t guid;
uint64_t *ptr;
@@ -58,6 +67,24 @@ struct efi_system_table {
struct efi_configuration_table *tables;
};
+typedef struct {
+ uint32_t type;
+ uint32_t pad;
+ uint64_t phys_addr;
+ uint64_t virt_addr;
+ uint64_t num_pages;
+ uint64_t attribute;
+} efi_memory_desc_t;
+
+struct efi_boot_memmap {
+ uint64_t map_size;
+ uint64_t desc_size;
+ uint32_t desc_ver;
+ uint64_t map_key;
+ uint64_t buff_size;
+ efi_memory_desc_t map[32];
+};
+
struct loongarch_boot_info {
uint64_t ram_size;
const char *kernel_filename;
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index d21de2cef4..aef4cd05b1 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -33,6 +33,16 @@
#define COMMAND_LINE_SIZE 512
+extern struct memmap_entry *memmap_table;
+extern unsigned memmap_entries;
+
+struct memmap_entry {
+ uint64_t address;
+ uint64_t length;
+ uint32_t type;
+ uint32_t reserved;
+};
+
struct LoongArchMachineState {
/*< private >*/
MachineState parent_obj;
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 07/17] hw/loongarch: Init efi_initrd table
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (5 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 08/17] hw/loongarch: Init efi_fdt table Song Gao
` (9 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 29 +++++++++++++++++++++++++++--
include/hw/loongarch/boot.h | 9 +++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 5d963176bd..1600ae6e55 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -14,11 +14,15 @@
#include "qemu/error-report.h"
#include "sysemu/reset.h"
+ram_addr_t initrd_offset;
+uint64_t initrd_size;
+
enum {
SLAVE_BOOT,
EFI_SYSTAB,
EFI_TABLES,
EFI_MEMMAP,
+ EFI_INITRD,
};
static const MemMapEntry loader_rommap[] = {
@@ -26,6 +30,7 @@ static const MemMapEntry loader_rommap[] = {
[EFI_SYSTAB] = {0xf200000, 0x10000},
[EFI_TABLES] = {0xf300000, 0x10000},
[EFI_MEMMAP] = {0xf400000, 0x10000},
+ [EFI_INITRD] = {0xf500000, 0x10000},
};
static unsigned int slave_boot_code[] = {
@@ -117,6 +122,26 @@ static void init_efi_boot_memmap(struct efi_system_table *systab)
g_free(boot_memmap);
}
+static void init_efi_initrd_table(struct efi_system_table *systab)
+{
+ efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;
+ struct efi_initrd *initrd_table = g_malloc0(loader_rommap[EFI_INITRD].size);
+
+ initrd_table->base = initrd_offset;
+ initrd_table->size = initrd_size;
+
+ rom_add_blob_fixed("initrd_tbl_rom", initrd_table,
+ loader_rommap[EFI_INITRD].size,
+ loader_rommap[EFI_INITRD].base);
+
+ /* efi_configuration_table 2 */
+ guidcpy(&systab->tables[1].guid, &tbl_guid);
+ systab->tables[1].table = (void *)loader_rommap[EFI_INITRD].base;
+ systab->nr_tables = 2;
+
+ g_free(initrd_table);
+}
+
static void init_systab(struct loongarch_boot_info *info)
{
struct efi_system_table *systab;
@@ -134,6 +159,7 @@ static void init_systab(struct loongarch_boot_info *info)
systab->tables = efi_tables;
init_efi_boot_memmap(systab);
+ init_efi_initrd_table(systab);
rom_add_blob_fixed("tables_rom", efi_tables,
loader_rommap[EFI_TABLES].size,
@@ -173,8 +199,7 @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
static int64_t load_kernel_info(struct loongarch_boot_info *info)
{
- uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
- ram_addr_t initrd_offset;
+ uint64_t kernel_entry, kernel_low, kernel_high;
ssize_t kernel_size;
kernel_size = load_elf(info->kernel_filename, NULL,
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index bef9ab659e..e482b829f7 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -32,6 +32,10 @@ typedef struct {
EFI_GUID(0x800f683f, 0xd08b, 0x423a, 0xa2, 0x93, \
0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
+#define LINUX_EFI_INITRD_MEDIA_GUID \
+ EFI_GUID(0x5568e427, 0x68fc, 0x4f3d, 0xac, 0x74, \
+ 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
+
struct efi_config_table {
efi_guid_t guid;
uint64_t *ptr;
@@ -85,6 +89,11 @@ struct efi_boot_memmap {
efi_memory_desc_t map[32];
};
+struct efi_initrd {
+ uint64_t base;
+ uint64_t size;
+};
+
struct loongarch_boot_info {
uint64_t ram_size;
const char *kernel_filename;
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 08/17] hw/loongarch: Init efi_fdt table
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (6 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 07/17] hw/loongarch: Init efi_initrd table Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
` (8 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 11 +++++++++++
include/hw/loongarch/boot.h | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 1600ae6e55..8c28a0ef6f 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -142,6 +142,16 @@ static void init_efi_initrd_table(struct efi_system_table *systab)
g_free(initrd_table);
}
+static void init_efi_fdt_table(struct efi_system_table *systab)
+{
+ efi_guid_t tbl_guid = DEVICE_TREE_GUID;
+
+ /* efi_configuration_table 3 */
+ guidcpy(&systab->tables[2].guid, &tbl_guid);
+ systab->tables[2].table = (void *)0x100000; /* fdt_base 1MiB */
+ systab->nr_tables = 3;
+}
+
static void init_systab(struct loongarch_boot_info *info)
{
struct efi_system_table *systab;
@@ -160,6 +170,7 @@ static void init_systab(struct loongarch_boot_info *info)
init_efi_boot_memmap(systab);
init_efi_initrd_table(systab);
+ init_efi_fdt_table(systab);
rom_add_blob_fixed("tables_rom", efi_tables,
loader_rommap[EFI_TABLES].size,
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index e482b829f7..ce1cd51c01 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -36,6 +36,10 @@ typedef struct {
EFI_GUID(0x5568e427, 0x68fc, 0x4f3d, 0xac, 0x74, \
0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
+#define DEVICE_TREE_GUID \
+ EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, \
+ 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0)
+
struct efi_config_table {
efi_guid_t guid;
uint64_t *ptr;
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg'
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (7 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 08/17] hw/loongarch: Init efi_fdt table Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-21 7:27 ` maobibo
2023-12-18 9:00 ` [PATCH v2 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
` (7 subsequent siblings)
16 siblings, 1 reply; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
The right fdt memory node like [1], not [2]
[1]
memory@0 {
device_type = "memory";
reg = <0x00 0x00 0x00 0x10000000>;
};
[2]
memory@0 {
device_type = "memory";
reg = <0x02 0x00 0x02 0x10000000>;
};
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index c45e724961..eaa0824f73 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -290,7 +290,7 @@ static void fdt_add_memory_node(MachineState *ms,
char *nodename = g_strdup_printf("/memory@%" PRIx64, base);
qemu_fdt_add_subnode(ms->fdt, nodename);
- qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0, base, 0, size);
qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "memory");
if (ms->numa_state && ms->numa_state->num_nodes) {
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 10/17] hw/loongarch: fdt adds cpu interrupt controller node
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (8 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
` (6 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
fdt adds cpu interrupt controller node,
we use 'loongson,cpu-interrupt-controller'.
See:
drivers/irqchip/irq-loongarch-cpu.c
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index eaa0824f73..d251674090 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -81,7 +81,23 @@ static void virt_flash_map(LoongArchMachineState *lams,
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
memory_region_add_subregion(sysmem, base,
sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
+}
+
+static void fdt_add_cpuic_node(LoongArchMachineState *lams,
+ uint32_t *cpuintc_phandle)
+{
+ MachineState *ms = MACHINE(lams);
+ char *nodename;
+ *cpuintc_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+ nodename = g_strdup_printf("/cpuic");
+ qemu_fdt_add_subnode(ms->fdt, nodename);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *cpuintc_phandle);
+ qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+ "loongson,cpu-interrupt-controller");
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
+ g_free(nodename);
}
static void fdt_add_flash_node(LoongArchMachineState *lams)
@@ -494,6 +510,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
CPULoongArchState *env;
CPUState *cpu_state;
int cpu, pin, i, start, num;
+ uint32_t cpuintc_phandle;
extioi = qdev_new(TYPE_LOONGARCH_EXTIOI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal);
@@ -519,6 +536,10 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
* | UARTs | | Devices | | Devices |
* +--------+ +---------+ +---------+
*/
+
+ /* Add cpu interrupt-controller */
+ fdt_add_cpuic_node(lams, &cpuintc_phandle);
+
for (cpu = 0; cpu < ms->smp.cpus; cpu++) {
cpu_state = qemu_get_cpu(cpu);
cpudev = DEVICE(cpu_state);
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (9 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
` (5 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
fdt adds Extend I/O Interrupt Controller,
we use 'loongson,ls2k2000-eiointc'.
See:
drivers/irqchip/irq-loongson-eiointc.c
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 30 +++++++++++++++++++++++++++++-
include/hw/intc/loongarch_extioi.h | 1 +
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index d251674090..7534e42309 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -100,6 +100,31 @@ static void fdt_add_cpuic_node(LoongArchMachineState *lams,
g_free(nodename);
}
+static void fdt_add_extioiic_node(LoongArchMachineState *lams,
+ uint32_t *cpuintc_phandle,
+ uint32_t *extioic_phandle)
+{
+ MachineState *ms = MACHINE(lams);
+ char *nodename;
+ hwaddr extioi_base = APIC_BASE;
+ hwaddr extioi_size = EXTIOI_SIZE;
+
+ *extioic_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+ nodename = g_strdup_printf("/extioiic@%" PRIx64, extioi_base);
+ qemu_fdt_add_subnode(ms->fdt, nodename);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *extioic_phandle);
+ qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+ "loongson,ls2k2000-eiointc");
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+ *cpuintc_phandle);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupts", 3);
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0,
+ extioi_base, 0x0, extioi_size);
+ g_free(nodename);
+}
+
static void fdt_add_flash_node(LoongArchMachineState *lams)
{
MachineState *ms = MACHINE(lams);
@@ -510,7 +535,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
CPULoongArchState *env;
CPUState *cpu_state;
int cpu, pin, i, start, num;
- uint32_t cpuintc_phandle;
+ uint32_t cpuintc_phandle, extioiic_phandle;
extioi = qdev_new(TYPE_LOONGARCH_EXTIOI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal);
@@ -582,6 +607,9 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
}
}
+ /* Add Extend I/O Interrupt Controller node */
+ fdt_add_extioiic_node(lams, &cpuintc_phandle, &extioiic_phandle);
+
pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC);
num = VIRT_PCH_PIC_IRQ_NUM;
qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index fbdef9a7b3..5012584f50 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -39,6 +39,7 @@
#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET)
#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET)
#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET)
+#define EXTIOI_SIZE 0x800
#define TYPE_LOONGARCH_EXTIOI "loongarch.extioi"
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI)
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 12/17] hw/loongarch: fdt adds pch_pic Controller
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (10 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
` (4 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
fdt adds pch pic controller, we use 'loongson,pch-pic-1.0'
See:
drivers/irqchip/irq-loongson-pch-pic.c
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 30 +++++++++++++++++++++++++++++-
include/hw/pci-host/ls7a.h | 1 +
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 7534e42309..166e3f1892 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -125,6 +125,31 @@ static void fdt_add_extioiic_node(LoongArchMachineState *lams,
g_free(nodename);
}
+static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
+ uint32_t *extioic_phandle,
+ uint32_t *pch_pic_phandle)
+{
+ MachineState *ms = MACHINE(lams);
+ char *nodename;
+ hwaddr pch_pic_base = VIRT_PCH_REG_BASE;
+ hwaddr pch_pic_size = VIRT_PCH_REG_SIZE;
+
+ *pch_pic_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+ nodename = g_strdup_printf("/platic@%" PRIx64, pch_pic_base);
+ qemu_fdt_add_subnode(ms->fdt, nodename);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *pch_pic_phandle);
+ qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+ "loongson,pch-pic-1.0");
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0,
+ pch_pic_base, 0, pch_pic_size);
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 2);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+ *extioic_phandle);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,pic-base-vec", 0);
+ g_free(nodename);
+}
+
static void fdt_add_flash_node(LoongArchMachineState *lams)
{
MachineState *ms = MACHINE(lams);
@@ -535,7 +560,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
CPULoongArchState *env;
CPUState *cpu_state;
int cpu, pin, i, start, num;
- uint32_t cpuintc_phandle, extioiic_phandle;
+ uint32_t cpuintc_phandle, extioiic_phandle, pch_pic_phandle;
extioi = qdev_new(TYPE_LOONGARCH_EXTIOI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal);
@@ -629,6 +654,9 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i));
}
+ /* Add PCH PIC node */
+ fdt_add_pch_pic_node(lams, &extioiic_phandle, &pch_pic_phandle);
+
pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI);
start = num;
num = EXTIOI_IRQS - start;
diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
index e753449593..fe260f0183 100644
--- a/include/hw/pci-host/ls7a.h
+++ b/include/hw/pci-host/ls7a.h
@@ -24,6 +24,7 @@
#define VIRT_PCH_REG_BASE 0x10000000UL
#define VIRT_IOAPIC_REG_BASE (VIRT_PCH_REG_BASE)
#define VIRT_PCH_MSI_ADDR_LOW 0x2FF00000UL
+#define VIRT_PCH_REG_SIZE 0x400
/*
* GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 13/17] hw/loongarch: fdt adds pch_msi Controller
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (11 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
` (3 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
fdt adds pch msi controller, we use 'loongson,pch-msi-1.0'.
See:
drivers/irqchip/irq-loongson-pch-msi.c
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 33 ++++++++++++++++++++++++++++++++-
include/hw/pci-host/ls7a.h | 1 +
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 166e3f1892..859f17c2f6 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -150,6 +150,34 @@ static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
g_free(nodename);
}
+static void fdt_add_pch_msi_node(LoongArchMachineState *lams,
+ uint32_t *extioic_phandle,
+ uint32_t *pch_msi_phandle)
+{
+ MachineState *ms = MACHINE(lams);
+ char *nodename;
+ hwaddr pch_msi_base = VIRT_PCH_MSI_ADDR_LOW;
+ hwaddr pch_msi_size = VIRT_PCH_MSI_SIZE;
+
+ *pch_msi_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+ nodename = g_strdup_printf("/msi@%" PRIx64, pch_msi_base);
+ qemu_fdt_add_subnode(ms->fdt, nodename);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *pch_msi_phandle);
+ qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+ "loongson,pch-msi-1.0");
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "reg",
+ 0, pch_msi_base,
+ 0, pch_msi_size);
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+ *extioic_phandle);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-base-vec",
+ VIRT_PCH_PIC_IRQ_NUM);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-num-vecs",
+ EXTIOI_IRQS - VIRT_PCH_PIC_IRQ_NUM);
+ g_free(nodename);
+}
+
static void fdt_add_flash_node(LoongArchMachineState *lams)
{
MachineState *ms = MACHINE(lams);
@@ -560,7 +588,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
CPULoongArchState *env;
CPUState *cpu_state;
int cpu, pin, i, start, num;
- uint32_t cpuintc_phandle, extioiic_phandle, pch_pic_phandle;
+ uint32_t cpuintc_phandle, extioiic_phandle, pch_pic_phandle, pch_msi_phandle;
extioi = qdev_new(TYPE_LOONGARCH_EXTIOI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal);
@@ -671,6 +699,9 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
qdev_get_gpio_in(extioi, i + start));
}
+ /* Add PCH MSI node */
+ fdt_add_pch_msi_node(lams, &extioiic_phandle, &pch_msi_phandle);
+
loongarch_devices_init(pch_pic, lams);
}
diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
index fe260f0183..cd7c9ec7bc 100644
--- a/include/hw/pci-host/ls7a.h
+++ b/include/hw/pci-host/ls7a.h
@@ -25,6 +25,7 @@
#define VIRT_IOAPIC_REG_BASE (VIRT_PCH_REG_BASE)
#define VIRT_PCH_MSI_ADDR_LOW 0x2FF00000UL
#define VIRT_PCH_REG_SIZE 0x400
+#define VIRT_PCH_MSI_SIZE 0x8
/*
* GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 14/17] hw/loongarch: fdt adds pcie irq_map node
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (12 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao
` (2 subsequent siblings)
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 73 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 69 insertions(+), 4 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 859f17c2f6..74cac07e8a 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -316,7 +316,62 @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams)
g_free(nodename);
}
-static void fdt_add_pcie_node(const LoongArchMachineState *lams)
+static void fdt_add_pcie_irq_map_node(const LoongArchMachineState *lams,
+ char *nodename,
+ uint32_t *pch_pic_phandle)
+{
+ int pin, dev;
+ uint32_t irq_map_stride = 0;
+ uint32_t full_irq_map[GPEX_NUM_IRQS *GPEX_NUM_IRQS * 10] = {};
+ uint32_t *irq_map = full_irq_map;
+ const MachineState *ms = MACHINE(lams);
+
+ /* This code creates a standard swizzle of interrupts such that
+ * each device's first interrupt is based on it's PCI_SLOT number.
+ * (See pci_swizzle_map_irq_fn())
+ *
+ * We only need one entry per interrupt in the table (not one per
+ * possible slot) seeing the interrupt-map-mask will allow the table
+ * to wrap to any number of devices.
+ */
+
+ for (dev = 0; dev < GPEX_NUM_IRQS; dev++) {
+ int devfn = dev * 0x8;
+
+ for (pin = 0; pin < GPEX_NUM_IRQS; pin++) {
+ int irq_nr = 16 + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_IRQS);
+ int i = 0;
+
+ /* Fill PCI address cells */
+ irq_map[i] = cpu_to_be32(devfn << 8);
+ i += 3;
+
+ /* Fill PCI Interrupt cells */
+ irq_map[i] = cpu_to_be32(pin + 1);
+ i += 1;
+
+ /* Fill interrupt controller phandle and cells */
+ irq_map[i++] = cpu_to_be32(*pch_pic_phandle);
+ irq_map[i++] = cpu_to_be32(irq_nr);
+
+ if (!irq_map_stride) {
+ irq_map_stride = i;
+ }
+ irq_map += irq_map_stride;
+ }
+ }
+
+
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-map", full_irq_map,
+ GPEX_NUM_IRQS * GPEX_NUM_IRQS *
+ irq_map_stride * sizeof(uint32_t));
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupt-map-mask",
+ 0x1800, 0, 0, 0x7);
+}
+
+static void fdt_add_pcie_node(const LoongArchMachineState *lams,
+ uint32_t *pch_pic_phandle,
+ uint32_t *pch_msi_phandle)
{
char *nodename;
hwaddr base_mmio = VIRT_PCI_MEM_BASE;
@@ -347,6 +402,11 @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams)
2, base_pio, 2, size_pio,
1, FDT_PCI_RANGE_MMIO, 2, base_mmio,
2, base_mmio, 2, size_mmio);
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map",
+ 0, *pch_msi_phandle, 0, 0x10000);
+
+ fdt_add_pcie_irq_map_node(lams, nodename, pch_pic_phandle);
+
g_free(nodename);
}
@@ -505,7 +565,10 @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
return dev;
}
-static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams)
+static void loongarch_devices_init(DeviceState *pch_pic,
+ LoongArchMachineState *lams,
+ uint32_t *pch_pic_phandle,
+ uint32_t *pch_msi_phandle)
{
MachineClass *mc = MACHINE_GET_CLASS(lams);
DeviceState *gpex_dev;
@@ -551,6 +614,9 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
}
+ /* Add pcie node */
+ fdt_add_pcie_node(lams, pch_pic_phandle, pch_msi_phandle);
+
serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0,
qdev_get_gpio_in(pch_pic,
VIRT_UART_IRQ - VIRT_GSI_BASE),
@@ -702,7 +768,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
/* Add PCH MSI node */
fdt_add_pch_msi_node(lams, &extioiic_phandle, &pch_msi_phandle);
- loongarch_devices_init(pch_pic, lams);
+ loongarch_devices_init(pch_pic, lams, &pch_pic_phandle, &pch_msi_phandle);
}
static void loongarch_firmware_init(LoongArchMachineState *lams)
@@ -863,7 +929,6 @@ static void loongarch_init(MachineState *machine)
lams->powerdown_notifier.notify = virt_powerdown_req;
qemu_register_powerdown_notifier(&lams->powerdown_notifier);
- fdt_add_pcie_node(lams);
/*
* Since lowmem region starts from 0 and Linux kernel legacy start address
* at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 15/17] hw/loongarch: fdt remove unused irqchip node
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (13 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 16/17] hw/loongarch: Add cells missing from uart node Song Gao
2023-12-18 9:00 ` [PATCH v2 17/17] hw/loongarch: Add cells missing from rtc node Song Gao
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 74cac07e8a..02a3af3b5e 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -410,34 +410,6 @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams,
g_free(nodename);
}
-static void fdt_add_irqchip_node(LoongArchMachineState *lams)
-{
- MachineState *ms = MACHINE(lams);
- char *nodename;
- uint32_t irqchip_phandle;
-
- irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt);
- qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle);
-
- nodename = g_strdup_printf("/intc@%lx", VIRT_IOAPIC_REG_BASE);
- qemu_fdt_add_subnode(ms->fdt, nodename);
- qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3);
- qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
- qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2);
- qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2);
- qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0);
-
- qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
- "loongarch,ls7a");
-
- qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
- 2, VIRT_IOAPIC_REG_BASE,
- 2, PCH_PIC_ROUTE_ENTRY_OFFSET);
-
- qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle);
- g_free(nodename);
-}
-
static void fdt_add_memory_node(MachineState *ms,
uint64_t base, uint64_t size, int node_id)
{
@@ -918,8 +890,7 @@ static void loongarch_init(MachineState *machine)
/* Initialize the IO interrupt subsystem */
loongarch_irq_init(lams);
- fdt_add_irqchip_node(lams);
- platform_bus_add_all_fdt_nodes(machine->fdt, "/intc",
+ platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
VIRT_PLATFORM_BUS_BASEADDRESS,
VIRT_PLATFORM_BUS_SIZE,
VIRT_PLATFORM_BUS_IRQ);
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 16/17] hw/loongarch: Add cells missing from uart node
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (14 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao
@ 2023-12-18 9:00 ` Song Gao
2023-12-18 9:00 ` [PATCH v2 17/17] hw/loongarch: Add cells missing from rtc node Song Gao
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
uart node need interrupts and interrupt-parent cells.
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 02a3af3b5e..e1a6ec86c8 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -209,7 +209,8 @@ static void fdt_add_rtc_node(LoongArchMachineState *lams)
g_free(nodename);
}
-static void fdt_add_uart_node(LoongArchMachineState *lams)
+static void fdt_add_uart_node(LoongArchMachineState *lams,
+ uint32_t *pch_pic_phandle)
{
char *nodename;
hwaddr base = VIRT_UART_BASE;
@@ -222,6 +223,10 @@ static void fdt_add_uart_node(LoongArchMachineState *lams)
qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0, base, 0x0, size);
qemu_fdt_setprop_cell(ms->fdt, nodename, "clock-frequency", 100000000);
qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", nodename);
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
+ VIRT_UART_IRQ - VIRT_GSI_BASE, 0x4);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+ *pch_pic_phandle);
g_free(nodename);
}
@@ -593,7 +598,7 @@ static void loongarch_devices_init(DeviceState *pch_pic,
qdev_get_gpio_in(pch_pic,
VIRT_UART_IRQ - VIRT_GSI_BASE),
115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);
- fdt_add_uart_node(lams);
+ fdt_add_uart_node(lams, pch_pic_phandle);
/* Network init */
for (i = 0; i < nb_nics; i++) {
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 17/17] hw/loongarch: Add cells missing from rtc node
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
` (15 preceding siblings ...)
2023-12-18 9:00 ` [PATCH v2 16/17] hw/loongarch: Add cells missing from uart node Song Gao
@ 2023-12-18 9:00 ` Song Gao
16 siblings, 0 replies; 27+ messages in thread
From: Song Gao @ 2023-12-18 9:00 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, philmd, peter.maydell, maobibo
rtc node need interrupts and interrupt-parent cells.
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/virt.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index e1a6ec86c8..c122d86048 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -195,7 +195,8 @@ static void fdt_add_flash_node(LoongArchMachineState *lams)
g_free(nodename);
}
-static void fdt_add_rtc_node(LoongArchMachineState *lams)
+static void fdt_add_rtc_node(LoongArchMachineState *lams,
+ uint32_t *pch_pic_phandle)
{
char *nodename;
hwaddr base = VIRT_RTC_REG_BASE;
@@ -204,8 +205,13 @@ static void fdt_add_rtc_node(LoongArchMachineState *lams)
nodename = g_strdup_printf("/rtc@%" PRIx64, base);
qemu_fdt_add_subnode(ms->fdt, nodename);
- qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "loongson,ls7a-rtc");
+ qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+ "loongson,ls7a-rtc");
qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
+ VIRT_RTC_IRQ - VIRT_GSI_BASE , 0x4);
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+ *pch_pic_phandle);
g_free(nodename);
}
@@ -613,7 +619,7 @@ static void loongarch_devices_init(DeviceState *pch_pic,
sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE,
qdev_get_gpio_in(pch_pic,
VIRT_RTC_IRQ - VIRT_GSI_BASE));
- fdt_add_rtc_node(lams);
+ fdt_add_rtc_node(lams, pch_pic_phandle);
/* acpi ged */
lams->acpi_ged = create_acpi_ged(pch_pic, lams);
--
2.25.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c
2023-12-18 9:00 ` [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
@ 2023-12-21 7:04 ` maobibo
2023-12-25 1:08 ` gaosong
0 siblings, 1 reply; 27+ messages in thread
From: maobibo @ 2023-12-21 7:04 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
On 2023/12/18 下午5:00, Song Gao wrote:
> Move some boot functions to boot.c and struct
> loongarch_boot_info into struct LoongArchMachineState.
>
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
> hw/loongarch/boot.c | 127 ++++++++++++++++++++++++++++++++++++
> hw/loongarch/meson.build | 1 +
> hw/loongarch/virt.c | 118 ++-------------------------------
> include/hw/loongarch/boot.h | 21 ++++++
> include/hw/loongarch/virt.h | 2 +
> 5 files changed, 155 insertions(+), 114 deletions(-)
> create mode 100644 hw/loongarch/boot.c
> create mode 100644 include/hw/loongarch/boot.h
>
> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
> new file mode 100644
> index 0000000000..9f25ea5847
> --- /dev/null
> +++ b/hw/loongarch/boot.c
> @@ -0,0 +1,127 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * LoongArch boot helper functions.
> + *
> + * Copyright (c) 2023 Loongson Technology Corporation Limited
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/units.h"
> +#include "target/loongarch/cpu.h"
> +#include "hw/loongarch/virt.h"
> +#include "hw/loader.h"
> +#include "elf.h"
> +#include "qemu/error-report.h"
> +#include "sysemu/reset.h"
> +
> +static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
> +{
> + return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
> +}
> +
> +static int64_t load_kernel_info(struct loongarch_boot_info *info)
> +{
> + uint64_t kernel_entry, kernel_low, kernel_high;
> + ssize_t kernel_size;
> +
> + kernel_size = load_elf(info->kernel_filename, NULL,
> + cpu_loongarch_virt_to_phys, NULL,
> + &kernel_entry, &kernel_low,
> + &kernel_high, NULL, 0,
> + EM_LOONGARCH, 1, 0);
> +
> + if (kernel_size < 0) {
> + error_report("could not load kernel '%s': %s",
> + info->kernel_filename,
> + load_elf_strerror(kernel_size));
> + exit(1);
> + }
> + return kernel_entry;
> +}
> +
> +static void reset_load_elf(void *opaque)
> +{
> + LoongArchCPU *cpu = opaque;
> + CPULoongArchState *env = &cpu->env;
> +
> + cpu_reset(CPU(cpu));
> + if (env->load_elf) {
> + cpu_set_pc(CPU(cpu), env->elf_address);
> + }
> +}
> +
> +static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
> + FWCfgState *fw_cfg)
> +{
> + /*
> + * Expose the kernel, the command line, and the initrd in fw_cfg.
> + * We don't process them here at all, it's all left to the
> + * firmware.
> + */
> + load_image_to_fw_cfg(fw_cfg,
> + FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
> + info->kernel_filename,
> + false);
> +
> + if (info->initrd_filename) {
> + load_image_to_fw_cfg(fw_cfg,
> + FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
> + info->initrd_filename, false);
> + }
> +
> + if (info->kernel_cmdline) {
> + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
> + strlen(info->kernel_cmdline) + 1);
> + fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
> + info->kernel_cmdline);
> + }
> +}
> +
> +static void loongarch_firmware_boot(LoongArchMachineState *lams,
> + struct loongarch_boot_info *info)
> +{
> + fw_cfg_add_kernel_info(info, lams->fw_cfg);
> +}
> +
> +static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
> + struct loongarch_boot_info *info)
> +{
> + MachineState *machine = MACHINE(lams);
> + int64_t kernel_addr = 0;
> + LoongArchCPU *lacpu;
> + int i;
> +
> + if (info->kernel_filename) {
> + kernel_addr = load_kernel_info(info);
> + } else {
> + error_report("Need kernel filename\n");
> + exit(1);
> + }
> +
> + for (i = 0; i < machine->smp.cpus; i++) {
> + lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
> + lacpu->env.load_elf = true;
> + lacpu->env.elf_address = kernel_addr;
> + }
> +}
> +
> +void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
> +{
> + LoongArchMachineState *lams = LOONGARCH_MACHINE(ms);
> + int i;
> +
> + /* register reset function */
> + for (i = 0; i < ms->smp.cpus; i++) {
> + qemu_register_reset(reset_load_elf, LOONGARCH_CPU(qemu_get_cpu(i)));
> + }
> +
> + info->kernel_filename = ms->kernel_filename;
> + info->kernel_cmdline = ms->kernel_cmdline;
> + info->initrd_filename = ms->initrd_filename;
> +
> + if (lams->bios_loaded) {
> + loongarch_firmware_boot(lams, info);
> + } else {
> + loongarch_direct_kernel_boot(lams, info);
> + }
> +}
> diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
> index c0421502ab..d306d82c2e 100644
> --- a/hw/loongarch/meson.build
> +++ b/hw/loongarch/meson.build
> @@ -1,6 +1,7 @@
> loongarch_ss = ss.source_set()
> loongarch_ss.add(files(
> 'fw_cfg.c',
> + 'boot.c',
> ))
> loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
> loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index 4b7dc67a2d..3e27d72f55 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -46,14 +46,6 @@
> #include "hw/block/flash.h"
> #include "qemu/error-report.h"
>
> -
> -struct loaderparams {
> - uint64_t ram_size;
> - const char *kernel_filename;
> - const char *kernel_cmdline;
> - const char *initrd_filename;
> -};
> -
> static void virt_flash_create(LoongArchMachineState *lams)
> {
> DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);
> @@ -376,31 +368,6 @@ static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
> memmap_entries++;
> }
>
> -static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
> -{
> - return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
> -}
> -
> -static int64_t load_kernel_info(const struct loaderparams *loaderparams)
> -{
> - uint64_t kernel_entry, kernel_low, kernel_high;
> - ssize_t kernel_size;
> -
> - kernel_size = load_elf(loaderparams->kernel_filename, NULL,
> - cpu_loongarch_virt_to_phys, NULL,
> - &kernel_entry, &kernel_low,
> - &kernel_high, NULL, 0,
> - EM_LOONGARCH, 1, 0);
> -
> - if (kernel_size < 0) {
> - error_report("could not load kernel '%s': %s",
> - loaderparams->kernel_filename,
> - load_elf_strerror(kernel_size));
> - exit(1);
> - }
> - return kernel_entry;
> -}
> -
> static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState *lams)
> {
> DeviceState *dev;
> @@ -668,69 +635,6 @@ static void loongarch_firmware_init(LoongArchMachineState *lams)
> memory_region_add_subregion(get_system_memory(), VIRT_BIOS_BASE, &lams->bios);
> lams->bios_loaded = true;
> }
> -
> -}
> -
> -static void reset_load_elf(void *opaque)
> -{
> - LoongArchCPU *cpu = opaque;
> - CPULoongArchState *env = &cpu->env;
> -
> - cpu_reset(CPU(cpu));
> - if (env->load_elf) {
> - cpu_set_pc(CPU(cpu), env->elf_address);
> - }
> -}
> -
> -static void fw_cfg_add_kernel_info(const struct loaderparams *loaderparams,
> - FWCfgState *fw_cfg)
> -{
> - /*
> - * Expose the kernel, the command line, and the initrd in fw_cfg.
> - * We don't process them here at all, it's all left to the
> - * firmware.
> - */
> - load_image_to_fw_cfg(fw_cfg,
> - FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
> - loaderparams->kernel_filename,
> - false);
> -
> - if (loaderparams->initrd_filename) {
> - load_image_to_fw_cfg(fw_cfg,
> - FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
> - loaderparams->initrd_filename, false);
> - }
> -
> - if (loaderparams->kernel_cmdline) {
> - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
> - strlen(loaderparams->kernel_cmdline) + 1);
> - fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
> - loaderparams->kernel_cmdline);
> - }
> -}
> -
> -static void loongarch_firmware_boot(LoongArchMachineState *lams,
> - const struct loaderparams *loaderparams)
> -{
> - fw_cfg_add_kernel_info(loaderparams, lams->fw_cfg);
> -}
> -
> -static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
> - const struct loaderparams *loaderparams)
> -{
> - MachineState *machine = MACHINE(lams);
> - int64_t kernel_addr = 0;
> - LoongArchCPU *lacpu;
> - int i;
> -
> - kernel_addr = load_kernel_info(loaderparams);
> - if (!machine->firmware) {
> - for (i = 0; i < machine->smp.cpus; i++) {
> - lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
> - lacpu->env.load_elf = true;
> - lacpu->env.elf_address = kernel_addr;
> - }
> - }
> }
>
> static void loongarch_init(MachineState *machine)
> @@ -750,7 +654,6 @@ static void loongarch_init(MachineState *machine)
> MachineClass *mc = MACHINE_GET_CLASS(machine);
> CPUState *cpu;
> char *ramName = NULL;
> - struct loaderparams loaderparams = { };
>
> if (!cpu_model) {
> cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
> @@ -844,24 +747,8 @@ static void loongarch_init(MachineState *machine)
> sizeof(struct memmap_entry) * (memmap_entries));
> }
> fdt_add_fw_cfg_node(lams);
> - loaderparams.ram_size = ram_size;
> - loaderparams.kernel_filename = machine->kernel_filename;
> - loaderparams.kernel_cmdline = machine->kernel_cmdline;
> - loaderparams.initrd_filename = machine->initrd_filename;
> - /* load the kernel. */
> - if (loaderparams.kernel_filename) {
> - if (lams->bios_loaded) {
> - loongarch_firmware_boot(lams, &loaderparams);
> - } else {
> - loongarch_direct_kernel_boot(lams, &loaderparams);
> - }
> - }
> fdt_add_flash_node(lams);
> - /* register reset function */
> - for (i = 0; i < machine->smp.cpus; i++) {
> - lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
How about use CPU_FOREACH(cpu) here?
There is while-loop in function qemu_get_cpu, with for loop in previous
line there will be double loop sentences.
Regards
Bibo Mao
> - qemu_register_reset(reset_load_elf, lacpu);
> - }
> +
> /* Initialize the IO interrupt subsystem */
> loongarch_irq_init(lams);
> fdt_add_irqchip_node(lams);
> @@ -886,6 +773,9 @@ static void loongarch_init(MachineState *machine)
> fdt_base = 1 * MiB;
> qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
> rom_add_blob_fixed("fdt", machine->fdt, lams->fdt_size, fdt_base);
> +
> + lams->bootinfo.ram_size = ram_size;
> + loongarch_load_kernel(machine, &lams->bootinfo);
> }
>
> bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
> diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
> new file mode 100644
> index 0000000000..3275c1e295
> --- /dev/null
> +++ b/include/hw/loongarch/boot.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Definitions for LoongArch boot.
> + *
> + * Copyright (C) 2023 Loongson Technology Corporation Limited
> + */
> +
> +#ifndef HW_LOONGARCH_BOOT_H
> +#define HW_LOONGARCH_BOOT_H
> +
> +struct loongarch_boot_info {
> + uint64_t ram_size;
> + const char *kernel_filename;
> + const char *kernel_cmdline;
> + const char *initrd_filename;
> + uint64_t a0, a1, a2;
> +};
> +
> +void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
> +
> +#endif /* HW_LOONGARCH_BOOT_H */
> diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
> index 674f4655e0..e4126dd0e7 100644
> --- a/include/hw/loongarch/virt.h
> +++ b/include/hw/loongarch/virt.h
> @@ -13,6 +13,7 @@
> #include "qemu/queue.h"
> #include "hw/intc/loongarch_ipi.h"
> #include "hw/block/flash.h"
> +#include "hw/loongarch/boot.h"
>
> #define LOONGARCH_MAX_CPUS 256
>
> @@ -50,6 +51,7 @@ struct LoongArchMachineState {
> DeviceState *platform_bus_dev;
> PCIBus *pci_bus;
> PFlashCFI01 *flash;
> + struct loongarch_boot_info bootinfo;
> };
>
> #define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt")
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 02/17] hw/loongarch: Add load initrd
2023-12-18 9:00 ` [PATCH v2 02/17] hw/loongarch: Add load initrd Song Gao
@ 2023-12-21 7:09 ` maobibo
2023-12-25 1:09 ` gaosong
0 siblings, 1 reply; 27+ messages in thread
From: maobibo @ 2023-12-21 7:09 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
On 2023/12/18 下午5:00, Song Gao wrote:
> we load initrd ramdisk after kernel_high address
>
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
> hw/loongarch/boot.c | 29 ++++++++++++++++++++++++++++-
> 1 file changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
> index 9f25ea5847..2be6dfb037 100644
> --- a/hw/loongarch/boot.c
> +++ b/hw/loongarch/boot.c
> @@ -21,7 +21,8 @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
>
> static int64_t load_kernel_info(struct loongarch_boot_info *info)
> {
> - uint64_t kernel_entry, kernel_low, kernel_high;
> + uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
> + ram_addr_t initrd_offset;
> ssize_t kernel_size;
>
> kernel_size = load_elf(info->kernel_filename, NULL,
> @@ -36,6 +37,32 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
> load_elf_strerror(kernel_size));
> exit(1);
> }
> +
> + if (info->initrd_filename) {
> + initrd_size = get_image_size(info->initrd_filename);
> + if (initrd_size > 0) {
> + initrd_offset = ROUND_UP(kernel_high, 64 * KiB);
Do you test self-compressed vmlinuz elf load?
I think that offset of initrd had better be 4 * kernel_size from
kernel_high, else uncompressed kernel may overwrite INITRD image.
such as:
initrd_offset = ROUND_UP(kernel_high + 4 * kernel_size, 64 * KiB);
Regards
Bibo Mao
> +
> + if (initrd_offset + initrd_size > info->ram_size) {
> + error_report("memory too small for initial ram disk '%s'",
> + info->initrd_filename);
> + exit(1);
> + }
> +
> + initrd_size = load_image_targphys(info->initrd_filename, initrd_offset,
> + info->ram_size - initrd_offset);
> + }
> +
> + if (initrd_size == (target_ulong)-1) {
> + error_report("could not load initial ram disk '%s'",
> + info->initrd_filename);
> + exit(1);
> + }
> + } else {
> + error_report("Need initrd!");
> + exit(1);
> + }
> +
> return kernel_entry;
> }
>
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 03/17] hw/loongarch: Add init_cmdline
2023-12-18 9:00 ` [PATCH v2 03/17] hw/loongarch: Add init_cmdline Song Gao
@ 2023-12-21 7:20 ` maobibo
2023-12-25 1:09 ` gaosong
0 siblings, 1 reply; 27+ messages in thread
From: maobibo @ 2023-12-21 7:20 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
On 2023/12/18 下午5:00, Song Gao wrote:
> Add init_cmline and set boot_info->a0, a1
>
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
> hw/loongarch/boot.c | 21 +++++++++++++++++++++
> include/hw/loongarch/virt.h | 2 ++
> target/loongarch/cpu.h | 2 ++
> 3 files changed, 25 insertions(+)
>
> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
> index 2be6dfb037..4bfe24274a 100644
> --- a/hw/loongarch/boot.c
> +++ b/hw/loongarch/boot.c
> @@ -14,6 +14,20 @@
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
>
> +static int init_cmdline(struct loongarch_boot_info *info)
> +{
> + hwaddr cmdline_addr;
> + cmdline_addr = 0xff00000ULL;
> +
> + pstrcpy_targphys("cmdline", 0xff00000ULL,
> + COMMAND_LINE_SIZE, info->kernel_cmdline);
There are two places using 0xff00000ULL here, it had better be defined
as macro. Also can address for cmdline be before FDT base
address(0x100000) rather than strange value 0xff00000 ? -:)
> +
> + info->a0 = 1;
> + info->a1 = cmdline_addr;
> +
> + return 0;
> +}
> +
> static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
> {
> return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
> @@ -63,6 +77,8 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
> exit(1);
> }
>
> + init_cmdline(info);
> +
> return kernel_entry;
> }
>
> @@ -73,6 +89,10 @@ static void reset_load_elf(void *opaque)
>
> cpu_reset(CPU(cpu));
> if (env->load_elf) {
> + if (cpu == LOONGARCH_CPU(first_cpu)) {
> + env->gpr[4] = env->boot_info->a0;
> + env->gpr[5] = env->boot_info->a1;
> + }
> cpu_set_pc(CPU(cpu), env->elf_address);
> }
> }
> @@ -129,6 +149,7 @@ static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
> lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
> lacpu->env.load_elf = true;
> lacpu->env.elf_address = kernel_addr;
> + lacpu->env.boot_info = info;
> }
> }
>
> diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
> index e4126dd0e7..d21de2cef4 100644
> --- a/include/hw/loongarch/virt.h
> +++ b/include/hw/loongarch/virt.h
> @@ -31,6 +31,8 @@
> #define VIRT_GED_MEM_ADDR (VIRT_GED_EVT_ADDR + ACPI_GED_EVT_SEL_LEN)
> #define VIRT_GED_REG_ADDR (VIRT_GED_MEM_ADDR + MEMORY_HOTPLUG_IO_LEN)
>
> +#define COMMAND_LINE_SIZE 512
The macro COMMAND_LINE_SIZE is already defined in Linux header file,
maybe standard header file can be used.
/usr/include/asm-generic/setup.h
#define COMMAND_LINE_SIZE 512
Regards
Bibo Mao
> +
> struct LoongArchMachineState {
> /*< private >*/
> MachineState parent_obj;
> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
> index 00d1fba597..c7c695138e 100644
> --- a/target/loongarch/cpu.h
> +++ b/target/loongarch/cpu.h
> @@ -362,6 +362,8 @@ typedef struct CPUArchState {
> uint64_t elf_address;
> /* Store ipistate to access from this struct */
> DeviceState *ipistate;
> +
> + struct loongarch_boot_info *boot_info;
> #endif
> } CPULoongArchState;
>
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code
2023-12-18 9:00 ` [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code Song Gao
@ 2023-12-21 7:22 ` maobibo
2023-12-25 1:09 ` gaosong
0 siblings, 1 reply; 27+ messages in thread
From: maobibo @ 2023-12-21 7:22 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
On 2023/12/18 下午5:00, Song Gao wrote:
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
> hw/loongarch/boot.c | 65 ++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
> index 4bfe24274a..076e795714 100644
> --- a/hw/loongarch/boot.c
> +++ b/hw/loongarch/boot.c
> @@ -14,6 +14,62 @@
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
>
> +enum {
> + SLAVE_BOOT,
> +};
> +
> +static const MemMapEntry loader_rommap[] = {
> + [SLAVE_BOOT] = {0xf100000, 0x10000},
> +};
Address 0xf100000 had better be defined before 0x100000
Regards
Bibo Mao
> +
> +static unsigned int slave_boot_code[] = {
> + /* Configure reset ebase. */
> + 0x0400302c, /* csrwr $r12,0xc */
> +
> + /* Disable interrupt. */
> + 0x0380100c, /* ori $r12,$r0,0x4 */
> + 0x04000180, /* csrxchg $r0,$r12,0x0 */
> +
> + /* Clear mailbox. */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x038081ad, /* ori $r13,$r13,0x20 */
> + 0x06481da0, /* iocsrwr.d $r0,$r13 */
> +
> + /* Enable IPI interrupt. */
> + 0x1400002c, /* lu12i.w $r12,1(0x1) */
> + 0x0400118c, /* csrxchg $r12,$r12,0x4 */
> + 0x02fffc0c, /* addi.d $r12,$r0,-1(0xfff) */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x038011ad, /* ori $r13,$r13,0x4 */
> + 0x064819ac, /* iocsrwr.w $r12,$r13 */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x038081ad, /* ori $r13,$r13,0x20 */
> +
> + /* Wait for wakeup <.L11>: */
> + 0x06488000, /* idle 0x0 */
> + 0x03400000, /* andi $r0,$r0,0x0 */
> + 0x064809ac, /* iocsrrd.w $r12,$r13 */
> + 0x43fff59f, /* beqz $r12,-12(0x7ffff4) # 48 <.L11> */
> +
> + /* Read and clear IPI interrupt. */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x064809ac, /* iocsrrd.w $r12,$r13 */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x038031ad, /* ori $r13,$r13,0xc */
> + 0x064819ac, /* iocsrwr.w $r12,$r13 */
> +
> + /* Disable IPI interrupt. */
> + 0x1400002c, /* lu12i.w $r12,1(0x1) */
> + 0x04001180, /* csrxchg $r0,$r12,0x4 */
> +
> + /* Read mail buf and jump to specified entry */
> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
> + 0x038081ad, /* ori $r13,$r13,0x20 */
> + 0x06480dac, /* iocsrrd.d $r12,$r13 */
> + 0x00150181, /* move $r1,$r12 */
> + 0x4c000020, /* jirl $r0,$r1,0 */
> +};
> +
> static int init_cmdline(struct loongarch_boot_info *info)
> {
> hwaddr cmdline_addr;
> @@ -145,10 +201,17 @@ static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
> exit(1);
> }
>
> + rom_add_blob_fixed("slave_boot", slave_boot_code, sizeof(slave_boot_code),
> + loader_rommap[SLAVE_BOOT].base);
> +
> for (i = 0; i < machine->smp.cpus; i++) {
> lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
> lacpu->env.load_elf = true;
> - lacpu->env.elf_address = kernel_addr;
> + if (i == 0) {
> + lacpu->env.elf_address = kernel_addr;
> + } else {
> + lacpu->env.elf_address = loader_rommap[SLAVE_BOOT].base;
> + }
> lacpu->env.boot_info = info;
> }
> }
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg'
2023-12-18 9:00 ` [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
@ 2023-12-21 7:27 ` maobibo
0 siblings, 0 replies; 27+ messages in thread
From: maobibo @ 2023-12-21 7:27 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
On 2023/12/18 下午5:00, Song Gao wrote:
> The right fdt memory node like [1], not [2]
>
> [1]
> memory@0 {
> device_type = "memory";
> reg = <0x00 0x00 0x00 0x10000000>;
> };
> [2]
> memory@0 {
> device_type = "memory";
> reg = <0x02 0x00 0x02 0x10000000>;
> };
>
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
> hw/loongarch/virt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index c45e724961..eaa0824f73 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -290,7 +290,7 @@ static void fdt_add_memory_node(MachineState *ms,
> char *nodename = g_strdup_printf("/memory@%" PRIx64, base);
>
> qemu_fdt_add_subnode(ms->fdt, nodename);
> - qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
> + qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0, base, 0, size);
> qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "memory");
>
> if (ms->numa_state && ms->numa_state->num_nodes) {
>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c
2023-12-21 7:04 ` maobibo
@ 2023-12-25 1:08 ` gaosong
0 siblings, 0 replies; 27+ messages in thread
From: gaosong @ 2023-12-25 1:08 UTC (permalink / raw)
To: maobibo, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
在 2023/12/21 下午3:04, maobibo 写道:
>
>
> On 2023/12/18 下午5:00, Song Gao wrote:
>> Move some boot functions to boot.c and struct
>> loongarch_boot_info into struct LoongArchMachineState.
>>
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> ---
>> hw/loongarch/boot.c | 127 ++++++++++++++++++++++++++++++++++++
>> hw/loongarch/meson.build | 1 +
>> hw/loongarch/virt.c | 118 ++-------------------------------
>> include/hw/loongarch/boot.h | 21 ++++++
>> include/hw/loongarch/virt.h | 2 +
>> 5 files changed, 155 insertions(+), 114 deletions(-)
>> create mode 100644 hw/loongarch/boot.c
>> create mode 100644 include/hw/loongarch/boot.h
>>
>> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
>> new file mode 100644
>> index 0000000000..9f25ea5847
>> --- /dev/null
>> +++ b/hw/loongarch/boot.c
>> @@ -0,0 +1,127 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> +/*
>> + * LoongArch boot helper functions.
>> + * Yes, #include <>
>> + * Copyright (c) 2023 Loongson Technology Corporation Limited
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "qemu/units.h"
>> +#include "target/loongarch/cpu.h"
>> +#include "hw/loongarch/virt.h"
>> +#include "hw/loader.h"
>> +#include "elf.h"
>> +#include "qemu/error-report.h"
>> +#include "sysemu/reset.h"
>> +
>> +static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
>> +{
>> + return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
>> +}
>> +
>> +static int64_t load_kernel_info(struct loongarch_boot_info *info)
>> +{
>> + uint64_t kernel_entry, kernel_low, kernel_high;
>> + ssize_t kernel_size;
>> +
>> + kernel_size = load_elf(info->kernel_filename, NULL,
>> + cpu_loongarch_virt_to_phys, NULL,
>> + &kernel_entry, &kernel_low,
>> + &kernel_high, NULL, 0,
>> + EM_LOONGARCH, 1, 0);
>> +
>> + if (kernel_size < 0) {
>> + error_report("could not load kernel '%s': %s",
>> + info->kernel_filename,
>> + load_elf_strerror(kernel_size));
>> + exit(1);
>> + }
>> + return kernel_entry;
>> +}
>> +
>> +static void reset_load_elf(void *opaque)
>> +{
>> + LoongArchCPU *cpu = opaque;
>> + CPULoongArchState *env = &cpu->env;
>> +
>> + cpu_reset(CPU(cpu));
>> + if (env->load_elf) {
>> + cpu_set_pc(CPU(cpu), env->elf_address);
>> + }
>> +}
>> +
>> +static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
>> + FWCfgState *fw_cfg)
>> +{
>> + /*
>> + * Expose the kernel, the command line, and the initrd in fw_cfg.
>> + * We don't process them here at all, it's all left to the
>> + * firmware.
>> + */
>> + load_image_to_fw_cfg(fw_cfg,
>> + FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
>> + info->kernel_filename,
>> + false);
>> +
>> + if (info->initrd_filename) {
>> + load_image_to_fw_cfg(fw_cfg,
>> + FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
>> + info->initrd_filename, false);
>> + }
>> +
>> + if (info->kernel_cmdline) {
>> + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
>> + strlen(info->kernel_cmdline) + 1);
>> + fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
>> + info->kernel_cmdline);
>> + }
>> +}
>> +
>> +static void loongarch_firmware_boot(LoongArchMachineState *lams,
>> + struct loongarch_boot_info *info)
>> +{
>> + fw_cfg_add_kernel_info(info, lams->fw_cfg);
>> +}
>> +
>> +static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
>> + struct loongarch_boot_info
>> *info)
>> +{
>> + MachineState *machine = MACHINE(lams);
>> + int64_t kernel_addr = 0;
>> + LoongArchCPU *lacpu;
>> + int i;
>> +
>> + if (info->kernel_filename) {
>> + kernel_addr = load_kernel_info(info);
>> + } else {
>> + error_report("Need kernel filename\n");
>> + exit(1);
>> + }
>> +
>> + for (i = 0; i < machine->smp.cpus; i++) {
>> + lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
>> + lacpu->env.load_elf = true;
>> + lacpu->env.elf_address = kernel_addr;
>> + }
>> +}
>> +
>> +void loongarch_load_kernel(MachineState *ms, struct
>> loongarch_boot_info *info)
>> +{
>> + LoongArchMachineState *lams = LOONGARCH_MACHINE(ms);
>> + int i;
>> +
>> + /* register reset function */
>> + for (i = 0; i < ms->smp.cpus; i++) {
>> + qemu_register_reset(reset_load_elf,
>> LOONGARCH_CPU(qemu_get_cpu(i)));
>> + }
>> +
>> + info->kernel_filename = ms->kernel_filename;
>> + info->kernel_cmdline = ms->kernel_cmdline;
>> + info->initrd_filename = ms->initrd_filename;
>> +
>> + if (lams->bios_loaded) {
>> + loongarch_firmware_boot(lams, info);
>> + } else {
>> + loongarch_direct_kernel_boot(lams, info);
>> + }
>> +}
>> diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
>> index c0421502ab..d306d82c2e 100644
>> --- a/hw/loongarch/meson.build
>> +++ b/hw/loongarch/meson.build
>> @@ -1,6 +1,7 @@
>> loongarch_ss = ss.source_set()
>> loongarch_ss.add(files(
>> 'fw_cfg.c',
>> + 'boot.c',
>> ))
>> loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true:
>> [files('virt.c'), fdt])
>> loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
>> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
>> index 4b7dc67a2d..3e27d72f55 100644
>> --- a/hw/loongarch/virt.c
>> +++ b/hw/loongarch/virt.c
>> @@ -46,14 +46,6 @@
>> #include "hw/block/flash.h"
>> #include "qemu/error-report.h"
>> -
>> -struct loaderparams {
>> - uint64_t ram_size;
>> - const char *kernel_filename;
>> - const char *kernel_cmdline;
>> - const char *initrd_filename;
>> -};
>> -
>> static void virt_flash_create(LoongArchMachineState *lams)
>> {
>> DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);
>> @@ -376,31 +368,6 @@ static void memmap_add_entry(uint64_t address,
>> uint64_t length, uint32_t type)
>> memmap_entries++;
>> }
>> -static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t
>> addr)
>> -{
>> - return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
>> -}
>> -
>> -static int64_t load_kernel_info(const struct loaderparams
>> *loaderparams)
>> -{
>> - uint64_t kernel_entry, kernel_low, kernel_high;
>> - ssize_t kernel_size;
>> -
>> - kernel_size = load_elf(loaderparams->kernel_filename, NULL,
>> - cpu_loongarch_virt_to_phys, NULL,
>> - &kernel_entry, &kernel_low,
>> - &kernel_high, NULL, 0,
>> - EM_LOONGARCH, 1, 0);
>> -
>> - if (kernel_size < 0) {
>> - error_report("could not load kernel '%s': %s",
>> - loaderparams->kernel_filename,
>> - load_elf_strerror(kernel_size));
>> - exit(1);
>> - }
>> - return kernel_entry;
>> -}
>> -
>> static DeviceState *create_acpi_ged(DeviceState *pch_pic,
>> LoongArchMachineState *lams)
>> {
>> DeviceState *dev;
>> @@ -668,69 +635,6 @@ static void
>> loongarch_firmware_init(LoongArchMachineState *lams)
>> memory_region_add_subregion(get_system_memory(),
>> VIRT_BIOS_BASE, &lams->bios);
>> lams->bios_loaded = true;
>> }
>> -
>> -}
>> -
>> -static void reset_load_elf(void *opaque)
>> -{
>> - LoongArchCPU *cpu = opaque;
>> - CPULoongArchState *env = &cpu->env;
>> -
>> - cpu_reset(CPU(cpu));
>> - if (env->load_elf) {
>> - cpu_set_pc(CPU(cpu), env->elf_address);
>> - }
>> -}
>> -
>> -static void fw_cfg_add_kernel_info(const struct loaderparams
>> *loaderparams,
>> - FWCfgState *fw_cfg)
>> -{
>> - /*
>> - * Expose the kernel, the command line, and the initrd in fw_cfg.
>> - * We don't process them here at all, it's all left to the
>> - * firmware.
>> - */
>> - load_image_to_fw_cfg(fw_cfg,
>> - FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
>> - loaderparams->kernel_filename,
>> - false);
>> -
>> - if (loaderparams->initrd_filename) {
>> - load_image_to_fw_cfg(fw_cfg,
>> - FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
>> - loaderparams->initrd_filename, false);
>> - }
>> -
>> - if (loaderparams->kernel_cmdline) {
>> - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
>> - strlen(loaderparams->kernel_cmdline) + 1);
>> - fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
>> - loaderparams->kernel_cmdline);
>> - }
>> -}
>> -
>> -static void loongarch_firmware_boot(LoongArchMachineState *lams,
>> - const struct loaderparams
>> *loaderparams)
>> -{
>> - fw_cfg_add_kernel_info(loaderparams, lams->fw_cfg);
>> -}
>> -
>> -static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
>> - const struct loaderparams
>> *loaderparams)
>> -{
>> - MachineState *machine = MACHINE(lams);
>> - int64_t kernel_addr = 0;
>> - LoongArchCPU *lacpu;
>> - int i;
>> -
>> - kernel_addr = load_kernel_info(loaderparams);
>> - if (!machine->firmware) {
>> - for (i = 0; i < machine->smp.cpus; i++) {
>> - lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
>> - lacpu->env.load_elf = true;
>> - lacpu->env.elf_address = kernel_addr;
>> - }
>> - }
>> }
>> static void loongarch_init(MachineState *machine)
>> @@ -750,7 +654,6 @@ static void loongarch_init(MachineState *machine)
>> MachineClass *mc = MACHINE_GET_CLASS(machine);
>> CPUState *cpu;
>> char *ramName = NULL;
>> - struct loaderparams loaderparams = { };
>> if (!cpu_model) {
>> cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
>> @@ -844,24 +747,8 @@ static void loongarch_init(MachineState *machine)
>> sizeof(struct memmap_entry) *
>> (memmap_entries));
>> }
>> fdt_add_fw_cfg_node(lams);
>> - loaderparams.ram_size = ram_size;
>> - loaderparams.kernel_filename = machine->kernel_filename;
>> - loaderparams.kernel_cmdline = machine->kernel_cmdline;
>> - loaderparams.initrd_filename = machine->initrd_filename;
>> - /* load the kernel. */
>> - if (loaderparams.kernel_filename) {
>> - if (lams->bios_loaded) {
>> - loongarch_firmware_boot(lams, &loaderparams);
>> - } else {
>> - loongarch_direct_kernel_boot(lams, &loaderparams);
>> - }
>> - }
>> fdt_add_flash_node(lams);
>> - /* register reset function */
>> - for (i = 0; i < machine->smp.cpus; i++) {
>> - lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
> How about use CPU_FOREACH(cpu) here?
>
> There is while-loop in function qemu_get_cpu, with for loop in
> previous line there will be double loop sentences.
>
Got it, I will correct it on v3.
Thanks,
Song Gao
> Regards
> Bibo Mao
>
>> - qemu_register_reset(reset_load_elf, lacpu);
>> - }
>> +
>> /* Initialize the IO interrupt subsystem */
>> loongarch_irq_init(lams);
>> fdt_add_irqchip_node(lams);
>> @@ -886,6 +773,9 @@ static void loongarch_init(MachineState *machine)
>> fdt_base = 1 * MiB;
>> qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
>> rom_add_blob_fixed("fdt", machine->fdt, lams->fdt_size, fdt_base);
>> +
>> + lams->bootinfo.ram_size = ram_size;
>> + loongarch_load_kernel(machine, &lams->bootinfo);
>> }
>> bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
>> diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
>> new file mode 100644
>> index 0000000000..3275c1e295
>> --- /dev/null
>> +++ b/include/hw/loongarch/boot.h
>> @@ -0,0 +1,21 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> +/*
>> + * Definitions for LoongArch boot.
>> + *
>> + * Copyright (C) 2023 Loongson Technology Corporation Limited
>> + */
>> +
>> +#ifndef HW_LOONGARCH_BOOT_H
>> +#define HW_LOONGARCH_BOOT_H
>> +
>> +struct loongarch_boot_info {
>> + uint64_t ram_size;
>> + const char *kernel_filename;
>> + const char *kernel_cmdline;
>> + const char *initrd_filename;
>> + uint64_t a0, a1, a2;
>> +};
>> +
>> +void loongarch_load_kernel(MachineState *ms, struct
>> loongarch_boot_info *info);
>> +
>> +#endif /* HW_LOONGARCH_BOOT_H */
>> diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
>> index 674f4655e0..e4126dd0e7 100644
>> --- a/include/hw/loongarch/virt.h
>> +++ b/include/hw/loongarch/virt.h
>> @@ -13,6 +13,7 @@
>> #include "qemu/queue.h"
>> #include "hw/intc/loongarch_ipi.h"
>> #include "hw/block/flash.h"
>> +#include "hw/loongarch/boot.h"
>> #define LOONGARCH_MAX_CPUS 256
>> @@ -50,6 +51,7 @@ struct LoongArchMachineState {
>> DeviceState *platform_bus_dev;
>> PCIBus *pci_bus;
>> PFlashCFI01 *flash;
>> + struct loongarch_boot_info bootinfo;
>> };
>> #define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt")
>>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 02/17] hw/loongarch: Add load initrd
2023-12-21 7:09 ` maobibo
@ 2023-12-25 1:09 ` gaosong
0 siblings, 0 replies; 27+ messages in thread
From: gaosong @ 2023-12-25 1:09 UTC (permalink / raw)
To: maobibo, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
在 2023/12/21 下午3:09, maobibo 写道:
>
>
> On 2023/12/18 下午5:00, Song Gao wrote:
>> we load initrd ramdisk after kernel_high address
>>
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> ---
>> hw/loongarch/boot.c | 29 ++++++++++++++++++++++++++++-
>> 1 file changed, 28 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
>> index 9f25ea5847..2be6dfb037 100644
>> --- a/hw/loongarch/boot.c
>> +++ b/hw/loongarch/boot.c
>> @@ -21,7 +21,8 @@ static uint64_t cpu_loongarch_virt_to_phys(void
>> *opaque, uint64_t addr)
>> static int64_t load_kernel_info(struct loongarch_boot_info *info)
>> {
>> - uint64_t kernel_entry, kernel_low, kernel_high;
>> + uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
>> + ram_addr_t initrd_offset;
>> ssize_t kernel_size;
>> kernel_size = load_elf(info->kernel_filename, NULL,
>> @@ -36,6 +37,32 @@ static int64_t load_kernel_info(struct
>> loongarch_boot_info *info)
>> load_elf_strerror(kernel_size));
>> exit(1);
>> }
>> +
>> + if (info->initrd_filename) {
>> + initrd_size = get_image_size(info->initrd_filename);
>> + if (initrd_size > 0) {
>> + initrd_offset = ROUND_UP(kernel_high, 64 * KiB);
> Do you test self-compressed vmlinuz elf load?
>
The LoongArch kenrel not support build bzimage.
> I think that offset of initrd had better be 4 * kernel_size from
> kernel_high, else uncompressed kernel may overwrite INITRD image.
> such as:
> initrd_offset = ROUND_UP(kernel_high + 4 * kernel_size, 64 * KiB);
>
but I think we can do this.
Thanks.
Song Gao
> Regards
> Bibo Mao
>> +
>> + if (initrd_offset + initrd_size > info->ram_size) {
>> + error_report("memory too small for initial ram disk
>> '%s'",
>> + info->initrd_filename);
>> + exit(1);
>> + }
>> +
>> + initrd_size = load_image_targphys(info->initrd_filename,
>> initrd_offset,
>> + info->ram_size -
>> initrd_offset);
>> + }
>> +
>> + if (initrd_size == (target_ulong)-1) {
>> + error_report("could not load initial ram disk '%s'",
>> + info->initrd_filename);
>> + exit(1);
>> + }
>> + } else {
>> + error_report("Need initrd!");
>> + exit(1);
>> + }
>> +
>> return kernel_entry;
>> }
>>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 03/17] hw/loongarch: Add init_cmdline
2023-12-21 7:20 ` maobibo
@ 2023-12-25 1:09 ` gaosong
0 siblings, 0 replies; 27+ messages in thread
From: gaosong @ 2023-12-25 1:09 UTC (permalink / raw)
To: maobibo, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
在 2023/12/21 下午3:20, maobibo 写道:
>
>
> On 2023/12/18 下午5:00, Song Gao wrote:
>> Add init_cmline and set boot_info->a0, a1
>>
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> ---
>> hw/loongarch/boot.c | 21 +++++++++++++++++++++
>> include/hw/loongarch/virt.h | 2 ++
>> target/loongarch/cpu.h | 2 ++
>> 3 files changed, 25 insertions(+)
>>
>> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
>> index 2be6dfb037..4bfe24274a 100644
>> --- a/hw/loongarch/boot.c
>> +++ b/hw/loongarch/boot.c
>> @@ -14,6 +14,20 @@
>> #include "qemu/error-report.h"
>> #include "sysemu/reset.h"
>> +static int init_cmdline(struct loongarch_boot_info *info)
>> +{
>> + hwaddr cmdline_addr;
>> + cmdline_addr = 0xff00000ULL;
>> +
>> + pstrcpy_targphys("cmdline", 0xff00000ULL,
>> + COMMAND_LINE_SIZE, info->kernel_cmdline);
> There are two places using 0xff00000ULL here, it had better be defined
> as macro. Also can address for cmdline be before FDT base
> address(0x100000) rather than strange value 0xff00000 ? -:)
>
>> +
>> + info->a0 = 1;
>> + info->a1 = cmdline_addr;
>> +
>> + return 0;
>> +}
>> +
>> static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t
>> addr)
>> {
>> return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
>> @@ -63,6 +77,8 @@ static int64_t load_kernel_info(struct
>> loongarch_boot_info *info)
>> exit(1);
>> }
>> + init_cmdline(info);
>> +
>> return kernel_entry;
>> }
>> @@ -73,6 +89,10 @@ static void reset_load_elf(void *opaque)
>> cpu_reset(CPU(cpu));
>> if (env->load_elf) {
>> + if (cpu == LOONGARCH_CPU(first_cpu)) {
>> + env->gpr[4] = env->boot_info->a0;
>> + env->gpr[5] = env->boot_info->a1;
>> + }
>> cpu_set_pc(CPU(cpu), env->elf_address);
>> }
>> }
>> @@ -129,6 +149,7 @@ static void
>> loongarch_direct_kernel_boot(LoongArchMachineState *lams,
>> lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
>> lacpu->env.load_elf = true;
>> lacpu->env.elf_address = kernel_addr;
>> + lacpu->env.boot_info = info;
>> }
>> }
>> diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
>> index e4126dd0e7..d21de2cef4 100644
>> --- a/include/hw/loongarch/virt.h
>> +++ b/include/hw/loongarch/virt.h
>> @@ -31,6 +31,8 @@
>> #define VIRT_GED_MEM_ADDR (VIRT_GED_EVT_ADDR +
>> ACPI_GED_EVT_SEL_LEN)
>> #define VIRT_GED_REG_ADDR (VIRT_GED_MEM_ADDR +
>> MEMORY_HOTPLUG_IO_LEN)
>> +#define COMMAND_LINE_SIZE 512
> The macro COMMAND_LINE_SIZE is already defined in Linux header file,
> maybe standard header file can be used.
>
> /usr/include/asm-generic/setup.h
> #define COMMAND_LINE_SIZE 512
>
Yes,
#include <asm-generic/setup.h>
Thanks.
Song Gao
>
> Regards
> Bibo Mao
>> +
>> struct LoongArchMachineState {
>> /*< private >*/
>> MachineState parent_obj;
>> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
>> index 00d1fba597..c7c695138e 100644
>> --- a/target/loongarch/cpu.h
>> +++ b/target/loongarch/cpu.h
>> @@ -362,6 +362,8 @@ typedef struct CPUArchState {
>> uint64_t elf_address;
>> /* Store ipistate to access from this struct */
>> DeviceState *ipistate;
>> +
>> + struct loongarch_boot_info *boot_info;
>> #endif
>> } CPULoongArchState;
>>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code
2023-12-21 7:22 ` maobibo
@ 2023-12-25 1:09 ` gaosong
0 siblings, 0 replies; 27+ messages in thread
From: gaosong @ 2023-12-25 1:09 UTC (permalink / raw)
To: maobibo, qemu-devel; +Cc: richard.henderson, philmd, peter.maydell
在 2023/12/21 下午3:22, maobibo 写道:
>
>
> On 2023/12/18 下午5:00, Song Gao wrote:
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> ---
>> hw/loongarch/boot.c | 65 ++++++++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 64 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
>> index 4bfe24274a..076e795714 100644
>> --- a/hw/loongarch/boot.c
>> +++ b/hw/loongarch/boot.c
>> @@ -14,6 +14,62 @@
>> #include "qemu/error-report.h"
>> #include "sysemu/reset.h"
>> +enum {
>> + SLAVE_BOOT,
>> +};
>> +
>> +static const MemMapEntry loader_rommap[] = {
>> + [SLAVE_BOOT] = {0xf100000, 0x10000},
>> +};
> Address 0xf100000 had better be defined before 0x100000
>
I will correct it on v3
Thanks.
Song Gao
> Regards
> Bibo Mao
>
>> +
>> +static unsigned int slave_boot_code[] = {
>> + /* Configure reset ebase. */
>> + 0x0400302c, /* csrwr $r12,0xc */
>> +
>> + /* Disable interrupt. */
>> + 0x0380100c, /* ori $r12,$r0,0x4 */
>> + 0x04000180, /* csrxchg $r0,$r12,0x0 */
>> +
>> + /* Clear mailbox. */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x038081ad, /* ori $r13,$r13,0x20 */
>> + 0x06481da0, /* iocsrwr.d $r0,$r13 */
>> +
>> + /* Enable IPI interrupt. */
>> + 0x1400002c, /* lu12i.w $r12,1(0x1) */
>> + 0x0400118c, /* csrxchg $r12,$r12,0x4 */
>> + 0x02fffc0c, /* addi.d $r12,$r0,-1(0xfff) */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x038011ad, /* ori $r13,$r13,0x4 */
>> + 0x064819ac, /* iocsrwr.w $r12,$r13 */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x038081ad, /* ori $r13,$r13,0x20 */
>> +
>> + /* Wait for wakeup <.L11>: */
>> + 0x06488000, /* idle 0x0 */
>> + 0x03400000, /* andi $r0,$r0,0x0 */
>> + 0x064809ac, /* iocsrrd.w $r12,$r13 */
>> + 0x43fff59f, /* beqz $r12,-12(0x7ffff4) # 48 <.L11> */
>> +
>> + /* Read and clear IPI interrupt. */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x064809ac, /* iocsrrd.w $r12,$r13 */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x038031ad, /* ori $r13,$r13,0xc */
>> + 0x064819ac, /* iocsrwr.w $r12,$r13 */
>> +
>> + /* Disable IPI interrupt. */
>> + 0x1400002c, /* lu12i.w $r12,1(0x1) */
>> + 0x04001180, /* csrxchg $r0,$r12,0x4 */
>> +
>> + /* Read mail buf and jump to specified entry */
>> + 0x1400002d, /* lu12i.w $r13,1(0x1) */
>> + 0x038081ad, /* ori $r13,$r13,0x20 */
>> + 0x06480dac, /* iocsrrd.d $r12,$r13 */
>> + 0x00150181, /* move $r1,$r12 */
>> + 0x4c000020, /* jirl $r0,$r1,0 */
>> +};
>> +
>> static int init_cmdline(struct loongarch_boot_info *info)
>> {
>> hwaddr cmdline_addr;
>> @@ -145,10 +201,17 @@ static void
>> loongarch_direct_kernel_boot(LoongArchMachineState *lams,
>> exit(1);
>> }
>> + rom_add_blob_fixed("slave_boot", slave_boot_code,
>> sizeof(slave_boot_code),
>> + loader_rommap[SLAVE_BOOT].base);
>> +
>> for (i = 0; i < machine->smp.cpus; i++) {
>> lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
>> lacpu->env.load_elf = true;
>> - lacpu->env.elf_address = kernel_addr;
>> + if (i == 0) {
>> + lacpu->env.elf_address = kernel_addr;
>> + } else {
>> + lacpu->env.elf_address = loader_rommap[SLAVE_BOOT].base;
>> + }
>> lacpu->env.boot_info = info;
>> }
>> }
>>
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2023-12-25 1:10 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-18 9:00 [PATCH v2 00/17] Add boot LoongArch elf kernel with FDT Song Gao
2023-12-18 9:00 ` [PATCH v2 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
2023-12-21 7:04 ` maobibo
2023-12-25 1:08 ` gaosong
2023-12-18 9:00 ` [PATCH v2 02/17] hw/loongarch: Add load initrd Song Gao
2023-12-21 7:09 ` maobibo
2023-12-25 1:09 ` gaosong
2023-12-18 9:00 ` [PATCH v2 03/17] hw/loongarch: Add init_cmdline Song Gao
2023-12-21 7:20 ` maobibo
2023-12-25 1:09 ` gaosong
2023-12-18 9:00 ` [PATCH v2 04/17] hw/loongarch: Add slave cpu boot_code Song Gao
2023-12-21 7:22 ` maobibo
2023-12-25 1:09 ` gaosong
2023-12-18 9:00 ` [PATCH v2 05/17] hw/loongarch: Init efi_system_table Song Gao
2023-12-18 9:00 ` [PATCH v2 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
2023-12-18 9:00 ` [PATCH v2 07/17] hw/loongarch: Init efi_initrd table Song Gao
2023-12-18 9:00 ` [PATCH v2 08/17] hw/loongarch: Init efi_fdt table Song Gao
2023-12-18 9:00 ` [PATCH v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
2023-12-21 7:27 ` maobibo
2023-12-18 9:00 ` [PATCH v2 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
2023-12-18 9:00 ` [PATCH v2 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
2023-12-18 9:00 ` [PATCH v2 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
2023-12-18 9:00 ` [PATCH v2 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
2023-12-18 9:00 ` [PATCH v2 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
2023-12-18 9:00 ` [PATCH v2 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao
2023-12-18 9:00 ` [PATCH v2 16/17] hw/loongarch: Add cells missing from uart node Song Gao
2023-12-18 9:00 ` [PATCH v2 17/17] hw/loongarch: Add cells missing from rtc node Song Gao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.