Allow the Phytium Pi machine to boot a Linux Image directly through the generic Arm loader. Require the matching SDK phytiumpi_firefly.dtb whenever -kernel is used.
Signed-off-by: Bin Meng <[email protected]> --- hw/arm/phytium_e2000.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/hw/arm/phytium_e2000.c b/hw/arm/phytium_e2000.c index 5dd91f662b..5d1e528cc1 100644 --- a/hw/arm/phytium_e2000.c +++ b/hw/arm/phytium_e2000.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "exec/cpu-common.h" #include "system/address-spaces.h" +#include "system/device_tree.h" #include "system/kvm.h" #include "system/system.h" #include "exec/hwaddr.h" @@ -129,6 +130,7 @@ struct PhytiumE2000MachineClass { MachineClass parent_class; const char *machine_name; + const char *direct_boot_dtb; const char *pbr_boot_mode; }; @@ -771,6 +773,61 @@ static void phytium_e2000_create_ram(PhytiumE2000State *s) phytium_e2000_memmap[PHYTIUM_E2000_RAM_HIGH].base, &s->ram_high); } +static void phytium_e2000_add_memory_node(void *fdt, hwaddr base, + uint64_t size) +{ + uint32_t acells; + uint32_t scells; + g_autofree char *name = g_strdup_printf("/memory@%" HWADDR_PRIx, base); + + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); + + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "device_type", "memory"); + qemu_fdt_setprop_sized_cells(fdt, name, "reg", + acells, base, scells, size); +} + +static void phytium_e2000_modify_dtb(const struct arm_boot_info *info, + void *fdt) +{ + uint64_t low_size = + MIN(info->ram_size, phytium_e2000_memmap[PHYTIUM_E2000_RAM].size); + uint64_t high_size = info->ram_size - low_size; + g_auto(GStrv) memory_nodes = NULL; + Error *err = NULL; + int i; + + if (!high_size) { + return; + } + + /* + * arm_load_dtb() normally describes RAM as one range beginning at + * loader_start. E2000 RAM above 2 GiB is instead mapped at 0x2000000000, + * beyond the PCIe aperture. Replace the generic range so Linux never + * treats the intervening address-space hole as RAM. + */ + memory_nodes = qemu_fdt_node_unit_path(fdt, "memory", &err); + if (err) { + error_report_err(err); + exit(1); + } + for (i = 0; memory_nodes[i]; i++) { + if (g_str_has_prefix(memory_nodes[i], "/memory")) { + qemu_fdt_nop_node(fdt, memory_nodes[i]); + } + } + + phytium_e2000_add_memory_node( + fdt, phytium_e2000_memmap[PHYTIUM_E2000_RAM].base, low_size); + phytium_e2000_add_memory_node( + fdt, phytium_e2000_memmap[PHYTIUM_E2000_RAM_HIGH].base, high_size); +} + static void phytium_e2000_create_cpus(PhytiumE2000State *s, bool firmware_loaded) { @@ -830,6 +887,12 @@ static void phytium_e2000_init(MachineState *ms) exit(1); } + if (ms->kernel_filename && !ms->dtb) { + error_report("%s: direct Linux boot requires the SDK %s via -dtb", + pemc->machine_name, pemc->direct_boot_dtb); + exit(1); + } + if (ms->smp.cpus > PHYTIUM_E2000_NUM_CPUS) { error_report("%s supports at most %d CPUs", pemc->machine_name, PHYTIUM_E2000_NUM_CPUS); @@ -880,6 +943,7 @@ static void phytium_e2000_init(MachineState *ms) s->bootinfo.loader_start = phytium_e2000_memmap[PHYTIUM_E2000_RAM].base; s->bootinfo.psci_conduit = QEMU_PSCI_CONDUIT_SMC; s->bootinfo.firmware_loaded = firmware_loaded; + s->bootinfo.modify_dtb = phytium_e2000_modify_dtb; arm_load_kernel(ARM_CPU(first_cpu), ms, &s->bootinfo); } @@ -945,6 +1009,7 @@ static void phytium_pi_class_init(ObjectClass *oc, const void *data) mc->desc = "Phytium Pi board (Phytium E2000Q)"; mc->block_default_type = IF_SD; pemc->machine_name = "phytium-pi"; + pemc->direct_boot_dtb = "phytiumpi_firefly.dtb"; pemc->pbr_boot_mode = PHYTIUM_E2000_PBR_BOOT_MODE_SD0; } -- 2.53.0
