Allow loading a no MMU kernel
Subsystems (2)
v2 cover Allow loading a no MMU kernel
This series allows loading a noMMU kernel using the -kernel option. Currently if using -kernel QEMU assumes you also have firmware and loads the kernel at a hardcoded offset. This series changes that so we only load the kernel at an offset if a firmware (-bios) was loaded.
This series also adds a function to check if the CPU is 32-bit. This is a step towards running 32-bit and 64-bit CPUs on the 64-bit RISC-V build by using run time checks instead of compile time checks. We also allow the user to sepcify a CPU for the sifive_u machine.
Alistair Francis (4):
hw/riscv: sifive_u: Allow specifying the CPU hw/riscv: Return the end address of the loaded firmware hw/riscv: Add a riscv_is_32_bit() function hw/riscv: Load the kernel after the firmware
include/hw/riscv/boot.h | 13 ++++++--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/boot.c | 56 ++++++++++++++++++++++++++----------- hw/riscv/opentitan.c | 3 +- hw/riscv/sifive_e.c | 3 +- hw/riscv/sifive_u.c | 28 ++++++++++++++----- hw/riscv/spike.c | 11 ++++++-- hw/riscv/virt.c | 11 ++++++-- 8 files changed, 91 insertions(+), 35 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/4 hw/riscv: sifive_u: Allow specifying the CPU
Allow the user to specify the main application CPU for the sifive_u machine.
--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/sifive_u.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
include/hw/riscv/sifive_u.h +1 -0
@@ -48,6 +48,7 @@ typedef struct SiFiveUSoCState {CadenceGEMState gem;uint32_t serial; +char *cpu_type; } SiFiveUSoCState;#define TYPE_RISCV_U_MACHINE MACHINE_TYPE_NAME("sifive_u")
hw/riscv/sifive_u.c +13 -5
@@ -424,6 +424,8 @@ static void sifive_u_machine_init(MachineState *machine)object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_U_SOC );object_property_set_uint (OBJECT (&s->soc),"serial" , s->serial, &error_abort); +object_property_set_str (OBJECT (&s->soc),"cpu-type" , machine->cpu_type, + &error_abort);qdev_realize (DEVICE (&s->soc),NULL , &error_abort);/* register RAM */
@@ -590,6 +592,11 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) mc->init = sifive_u_machine_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; +#if defined(TARGET_RISCV32 ) + mc->default_cpu_type =TYPE_RISCV_CPU_SIFIVE_U34 ; +#elif defined(TARGET_RISCV64 ) + mc->default_cpu_type =TYPE_RISCV_CPU_SIFIVE_U54 ; +#endif mc->default_cpus = mc->min_cpus; object_class_property_add_bool(oc, "start-in-flash",
@@ -618,7 +625,6 @@ type_init(sifive_u_machine_init_register_types)static void sifive_u_soc_instance_init (Object *obj) { -MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj);object_initialize_child (obj,"e-cluster" , &s->e_cluster,TYPE_CPU_CLUSTER );
@@ -636,10 +642,6 @@ static void sifive_u_soc_instance_init(Object *obj)object_initialize_child (OBJECT (&s->u_cluster),"u-cpus" , &s->u_cpus,TYPE_RISCV_HART_ARRAY ); -qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 ); -qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 ); -qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,SIFIVE_U_CPU ); -qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,0x1004 );object_initialize_child (obj,"prci" , &s->prci,TYPE_SIFIVE_U_PRCI );object_initialize_child (obj,"otp" , &s->otp,TYPE_SIFIVE_U_OTP );
@@ -661,6 +663,11 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)int i;NICInfo *nd = &nd_table[0 ]; +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 ); +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 ); +qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" , s->cpu_type); +qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,0x1004 ); +sysbus_realize (SYS_BUS_DEVICE (&s->e_cpus), &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->u_cpus), &error_abort);/*
@@ -792,6 +799,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)static Property sifive_u_soc_props[] = {DEFINE_PROP_UINT32 ("serial" , SiFiveUSoCState, serial,OTP_SERIAL ), +DEFINE_PROP_STRING ("cpu-type" , SiFiveUSoCState, cpu_type),DEFINE_PROP_END_OF_LIST () };
Signature · 1 line
2.28.0
Re: [PATCH v2 1/4] hw/riscv: sifive_u: Allow specifying the CPU
Quoted 79 lines · Alistair Francis
Allow the user to specify the main application CPU for the
sifive_umachine.Signed-off-by Alistair Francis <[email protected]>Reviewed-by Bin Meng <[email protected]>--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/sifive_u.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)include/hw/riscv/sifive_u.h +1
-0@@ -48,6 +48,7 @@ typedef struct SiFiveUSoCState {CadenceGEMState gem;uint32_t serial; +char *cpu_type; } SiFiveUSoCState;#define TYPE_RISCV_U_MACHINE MACHINE_TYPE_NAME("sifive_u")hw/riscv/sifive_u.c +12
-5@@ -424,6 +424,8 @@ static void sifive_u_machine_init(MachineState *machine)object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_U_SOC );object_property_set_uint (OBJECT (&s->soc),"serial" , s->serial, &error_abort); +object_property_set_str (OBJECT (&s->soc),"cpu-type" , machine->cpu_type, + &error_abort);qdev_realize (DEVICE (&s->soc),NULL , &error_abort);/* register RAM */ @@ -590,6 +592,11 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) mc->init = sifive_u_machine_init; mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; +#if defined(TARGET_RISCV32 ) + mc->default_cpu_type =TYPE_RISCV_CPU_SIFIVE_U34 ; +#elif defined(TARGET_RISCV64 ) + mc->default_cpu_type =TYPE_RISCV_CPU_SIFIVE_U54 ; +#endif mc->default_cpus = mc->min_cpus; object_class_property_add_bool(oc, "start-in-flash",@@ -618,7 +625,6 @@ type_init(sifive_u_machine_init_register_types)static void sifive_u_soc_instance_init (Object *obj) { -MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj);object_initialize_child (obj,"e-cluster" , &s->e_cluster,TYPE_CPU_CLUSTER );@@ -636,10 +642,6 @@ static void sifive_u_soc_instance_init(Object *obj)object_initialize_child (OBJECT (&s->u_cluster),"u-cpus" , &s->u_cpus,TYPE_RISCV_HART_ARRAY ); -qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 ); -qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 ); -qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,SIFIVE_U_CPU ); -qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,0x1004 );object_initialize_child (obj,"prci" , &s->prci,TYPE_SIFIVE_U_PRCI );object_initialize_child (obj,"otp" , &s->otp,TYPE_SIFIVE_U_OTP );@@ -661,6 +663,11 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)int i;NICInfo *nd = &nd_table[0 ]; +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 ); +qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 ); +qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" , s->cpu_type); +qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,0x1004 ); +sysbus_realize (SYS_BUS_DEVICE (&s->e_cpus), &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->u_cpus), &error_abort);/*
hw/riscv/sifive_u.c static void sifive_u_soc_realize(DeviceState *dev, Error **errp) · line 804
Quoted 6 lines
hw/riscv/sifive_u.c +1
-0@@ -792,6 +799,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)static Property sifive_u_soc_props[] = {DEFINE_PROP_UINT32 ("serial" , SiFiveUSoCState, serial,OTP_SERIAL ), +DEFINE_PROP_STRING ("cpu-type" , SiFiveUSoCState, cpu_type),DEFINE_PROP_END_OF_LIST () };
Re: [PATCH v2 1/4] hw/riscv: sifive_u: Allow specifying the CPU
In reply to Alistair FrancisQuoted 11 lines · Alistair Francis
Allow the user to specify the main application CPU for the
sifive_umachine.Signed-off-by Alistair Francis <[email protected]>Reviewed-by Bin Meng <[email protected]>--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/sifive_u.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
PATCH v2 2/4 hw/riscv: Return the end address of the loaded firmware
In reply to Alistair FrancisInstead of returning the unused entry address from riscv_load_firmware() instead return the end address. Also return the end address from riscv_find_and_load_firmware().
This tells the caller if a firmware was loaded and how big it is. This can be used to determine the load address of the next image (usually the kernel).
--- include/hw/riscv/boot.h | 8 ++++---- hw/riscv/boot.c | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-)
include/hw/riscv/boot.h +4 -4
@@ -23,10 +23,10 @@#include "exec/cpu-defs.h" #include "hw/loader.h" -void riscv_find_and_load_firmware (MachineState *machine, -const char *default_machine_firmware, -hwaddr firmware_load_addr, -symbol_fn_t sym_cb); +target_ulong riscv_find_and_load_firmware (MachineState *machine, +const char *default_machine_firmware, +hwaddr firmware_load_addr, +symbol_fn_t sym_cb);char *riscv_find_firmware (const char *firmware_filename); target_ulong riscv_load_firmware(const char *firmware_filename, hwaddr firmware_load_addr,
hw/riscv/boot.c +17 -11
@@ -40,12 +40,13 @@#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif -void riscv_find_and_load_firmware (MachineState *machine, -const char *default_machine_firmware, -hwaddr firmware_load_addr, -symbol_fn_t sym_cb) +target_ulong riscv_find_and_load_firmware (MachineState *machine, +const char *default_machine_firmware, +hwaddr firmware_load_addr, +symbol_fn_t sym_cb) {char *firmware_filename =NULL ; +target_ulong firmware_end_addr = firmware_load_addr;if ((!machine->firmware) || (!strcmp (machine->firmware,"default" ))) {/*
@@ -60,9 +61,12 @@ void riscv_find_and_load_firmware(MachineState *machine,if (firmware_filename) {/* If not "none" load the firmware */ -riscv_load_firmware (firmware_filename, firmware_load_addr, sym_cb); + firmware_end_addr =riscv_load_firmware (firmware_filename, + firmware_load_addr, sym_cb);g_free (firmware_filename); } + +return firmware_end_addr; }char *riscv_find_firmware (const char *firmware_filename)
@@ -91,17 +95,19 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb) { - uint64_t firmware_entry; + uint64_t firmware_entry, firmware_size, firmware_end;if (load_elf_ram_sym (firmware_filename,NULL ,NULL ,NULL , - &firmware_entry,NULL ,NULL ,NULL , + &firmware_entry,NULL , &firmware_end,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return firmware_entry; +return firmware_end; } -if (load_image_targphys_as (firmware_filename, firmware_load_addr, - ram_size,NULL ) >0 ) { -return firmware_load_addr; + firmware_size =load_image_targphys_as (firmware_filename, + firmware_load_addr, ram_size,NULL ); + +if (firmware_size >0 ) { +return firmware_load_addr + firmware_size; }error_report ("could not load firmware '%s'" , firmware_filename);
Signature · 1 line
2.28.0
Re: [PATCH v2 2/4] hw/riscv: Return the end address of the loaded firmware
Quoted 85 lines · Alistair Francis
Instead of returning the unused entry address from
riscv_load_firmware()instead return the end address. Also return the end address fromriscv_find_and_load_firmware().This tells the caller if a firmware was loaded and how big it is. This can be used to determine the load address of the next image (usually the kernel).
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 8 ++++---- hw/riscv/boot.c | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +4
-4@@ -23,10 +23,10 @@#include "exec/cpu-defs.h" #include "hw/loader.h" -void riscv_find_and_load_firmware (MachineState *machine, -const char *default_machine_firmware, -hwaddr firmware_load_addr, -symbol_fn_t sym_cb); +target_ulong riscv_find_and_load_firmware (MachineState *machine, +const char *default_machine_firmware, +hwaddr firmware_load_addr, +symbol_fn_t sym_cb);char *riscv_find_firmware (const char *firmware_filename); target_ulong riscv_load_firmware(const char *firmware_filename, hwaddr firmware_load_addr,hw/riscv/boot.c +12
-9@@ -40,12 +40,13 @@#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif -void riscv_find_and_load_firmware (MachineState *machine, -const char *default_machine_firmware, -hwaddr firmware_load_addr, -symbol_fn_t sym_cb) +target_ulong riscv_find_and_load_firmware (MachineState *machine, +const char *default_machine_firmware, +hwaddr firmware_load_addr, +symbol_fn_t sym_cb) {char *firmware_filename =NULL ; +target_ulong firmware_end_addr = firmware_load_addr;if ((!machine->firmware) || (!strcmp (machine->firmware,"default" ))) {/* @@ -60,9 +61,12 @@ void riscv_find_and_load_firmware(MachineState *machine,if (firmware_filename) {/* If not "none" load the firmware */ -riscv_load_firmware (firmware_filename, firmware_load_addr, sym_cb); + firmware_end_addr =riscv_load_firmware (firmware_filename, + firmware_load_addr, sym_cb);g_free (firmware_filename); } + +return firmware_end_addr; }char *riscv_find_firmware (const char *firmware_filename)@@ -91,17 +95,19 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb) { - uint64_t firmware_entry; + uint64_t firmware_entry, firmware_size, firmware_end;if (load_elf_ram_sym (firmware_filename,NULL ,NULL ,NULL , - &firmware_entry,NULL ,NULL ,NULL , + &firmware_entry,NULL , &firmware_end,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return firmware_entry; +return firmware_end; } - if (load_image_targphys_as(firmware_filename, firmware_load_addr,
hw/riscv/boot.c target_ulong riscv_load_firmware(const char *firmware_filename, · line 113
Quoted 10 lines
hw/riscv/boot.c +5
-2- ram_size, NULL) > 0) { -return firmware_load_addr; + firmware_size =load_image_targphys_as (firmware_filename, + firmware_load_addr, ram_size,NULL ); + +if (firmware_size >0 ) { +return firmware_load_addr + firmware_size; }error_report ("could not load firmware '%s'" , firmware_filename);
Re: [PATCH v2 2/4] hw/riscv: Return the end address of the loaded firmware
In reply to Alistair FrancisQuoted 9 lines · Alistair Francis
Instead of returning the unused entry address from
riscv_load_firmware()instead return the end address. Also return the end address fromriscv_find_and_load_firmware().This tells the caller if a firmware was loaded and how big it is. This can be used to determine the load address of the next image (usually the kernel).
Quoted 6 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 8 ++++---- hw/riscv/boot.c | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-)
PATCH v2 3/4 hw/riscv: Add a riscv_is_32_bit() function
In reply to Alistair Francis--- include/hw/riscv/boot.h | 2 ++ hw/riscv/boot.c | 9 +++++++++ 2 files changed, 11 insertions(+)
include/hw/riscv/boot.h +2 -0
@@ -23,6 +23,8 @@#include "exec/cpu-defs.h" #include "hw/loader.h" +bool riscv_is_32_bit (MachineState *machine); + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,
hw/riscv/boot.c +9 -0
@@ -40,6 +40,15 @@#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif +bool riscv_is_32_bit (MachineState *machine) +{ +if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +return true; + }else { +return false; + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,
Signature · 1 line
2.28.0
Re: [PATCH v2 3/4] hw/riscv: Add a riscv_is_32_bit() function
Quoted 29 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 2 ++ hw/riscv/boot.c | 9 +++++++++ 2 files changed, 11 insertions(+)include/hw/riscv/boot.h +2
-0@@ -23,6 +23,8 @@#include "exec/cpu-defs.h" #include "hw/loader.h" +bool riscv_is_32_bit (MachineState *machine); + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,hw/riscv/boot.c +2
-0@@ -40,6 +40,15 @@#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif +bool riscv_is_32_bit (MachineState *machine) +{
hw/riscv/boot.c line 54
Quoted 10 lines
hw/riscv/boot.c +7
-0+if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +return true; + }else { +return false; + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,
Re: [PATCH v2 3/4] hw/riscv: Add a riscv_is_32_bit() function
In reply to Alistair FrancisQuoted 7 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 2 ++ hw/riscv/boot.c | 9 +++++++++ 2 files changed, 11 insertions(+)
PATCH v2 4/4 hw/riscv: Load the kernel after the firmware
In reply to Alistair FrancisInstead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the firmware.
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)
include/hw/riscv/boot.h +3 -0
@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine); +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr); target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,
@@ -34,6 +36,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong firmware_end_addr,symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start);
hw/riscv/boot.c +14 -5
@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif
@@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } } +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else { +return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,
@@ -123,7 +130,9 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename,symbol_fn_t sym_cb) +target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;
@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)return kernel_entry; } -if (load_image_targphys_as (kernel_filename,KERNEL_BOOT_ADDRESS , +if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }error_report ("could not load kernel '%s'" , kernel_filename);
hw/riscv/opentitan.c +2 -1
@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }
hw/riscv/sifive_e.c +2 -1
@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }
hw/riscv/sifive_u.c +8 -2
@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState *machine)MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;
@@ -474,10 +475,15 @@ static void sifive_u_machine_init(MachineState *machine)break ; } -riscv_find_and_load_firmware (machine,BIOS_FILENAME , start_addr,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;
hw/riscv/spike.c +8 -3
@@ -195,6 +195,7 @@ static void spike_board_init(MachineState *machine)MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;
@@ -261,12 +262,16 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {
hw/riscv/virt.c +8 -3
@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState *machine)char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;
@@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[VIRT_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;
Signature · 1 line
2.28.0
Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
Quoted 203 lines · Alistair Francis
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the firmware.
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +3
-0@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine); +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr); target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -34,6 +36,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong firmware_end_addr,symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start);hw/riscv/boot.c +14
-5@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif @@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } } +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else { +return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -123,7 +130,9 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename,symbol_fn_t sym_cb) +target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)return kernel_entry; } -if (load_image_targphys_as (kernel_filename,KERNEL_BOOT_ADDRESS , +if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }error_report ("could not load kernel '%s'" , kernel_filename);hw/riscv/opentitan.c +2
-1@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }hw/riscv/sifive_e.c +2
-1@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }hw/riscv/sifive_u.c +8
-2@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState *machine)MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;@@ -474,10 +475,15 @@ static void sifive_u_machine_init(MachineState *machine)break ; } -riscv_find_and_load_firmware (machine,BIOS_FILENAME , start_addr,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c +8
-3@@ -195,6 +195,7 @@ static void spike_board_init(MachineState *machine)MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;@@ -261,12 +262,16 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +3
-2@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState *machine)char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;@@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[VIRT_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );
hw/riscv/virt.c static void virt_machine_init(MachineState *machine) · line 617
Quoted 10 lines
hw/riscv/virt.c +5
-1if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;
It's probably worth going through and making sure we mark the right regions as reserved in the DT, as with these being mobile we might run into latent bugs. I haven't actually looked so maybe we're fine, but IIRC we sort of papered over a handful of memory layout agreements that weren't even in specs (or event meant to be in specs) that have stuck around for quite a while.
Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
Quoted 213 lines · Palmer Dabbelt
Quoted 211 lines · Alistair Francis
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the firmware.
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +3
-0@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine); +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr); target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -34,6 +36,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong firmware_end_addr,symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start);hw/riscv/boot.c +14
-5@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif @@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } } +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else { +return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -123,7 +130,9 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename,symbol_fn_t sym_cb) +target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)return kernel_entry; } -if (load_image_targphys_as (kernel_filename,KERNEL_BOOT_ADDRESS , +if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }error_report ("could not load kernel '%s'" , kernel_filename);hw/riscv/opentitan.c +2
-1@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }hw/riscv/sifive_e.c +2
-1@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }hw/riscv/sifive_u.c +8
-2@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState *machine)MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;@@ -474,10 +475,15 @@ static void sifive_u_machine_init(MachineState *machine)break ; } -riscv_find_and_load_firmware (machine,BIOS_FILENAME , start_addr,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c +8
-3@@ -195,6 +195,7 @@ static void spike_board_init(MachineState *machine)MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;@@ -261,12 +262,16 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +8
-3@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState *machine)char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;@@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[VIRT_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );
Quoted 5 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine) · line 617
Quoted 2 lines
hw/riscv/virt.c +0
-0if (machine->initrd_filename) {hwaddr start;It's probably worth going through and making sure we mark the right regions as reserved in the DT, as with these being mobile we might run into latent bugs.
Do you mean mark where the firmware is as reserved?
Quoted 3 lines
I haven't actually looked so maybe we're fine, but IIRC we sort of papered over a handful of memory layout agreements that weren't even in specs (or event meant to be in specs) that have stuck around for quite a while.
For the virt machine or the sifive_u?
Quoted 2 lines
Reviewed-by Palmer Dabbelt <[email protected]>
Thanks
Alistair
Palmer Dabbelt
maintainerRe: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
Quoted 214 lines · On Tue, 20 Oct 2020 08:46:45 PDT (-0700), [email protected] wrote:
Quoted 213 lines · Palmer Dabbelt
Quoted 211 lines · Alistair Francis
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the firmware.
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +3
-0@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine); +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr); target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -34,6 +36,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,hwaddr firmware_load_addr, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong firmware_end_addr,symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start);hw/riscv/boot.c +14
-5@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif @@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } } +target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else { +return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} + target_ulong riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr,@@ -123,7 +130,9 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename,symbol_fn_t sym_cb) +target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)return kernel_entry; } -if (load_image_targphys_as (kernel_filename,KERNEL_BOOT_ADDRESS , +if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }error_report ("could not load kernel '%s'" , kernel_filename);hw/riscv/opentitan.c +2
-1@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }hw/riscv/sifive_e.c +2
-1@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }hw/riscv/sifive_u.c +8
-2@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState *machine)MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;@@ -474,10 +475,15 @@ static void sifive_u_machine_init(MachineState *machine)break ; } -riscv_find_and_load_firmware (machine,BIOS_FILENAME , start_addr,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c +8
-3@@ -195,6 +195,7 @@ static void spike_board_init(MachineState *machine)MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;@@ -261,12 +262,16 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +8
-3@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState *machine)char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;@@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[VIRT_MROM ].base, mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , + start_addr,NULL );if (machine->kernel_filename) { - kernel_entry =riscv_load_kernel (machine->kernel_filename,NULL ); + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );
Quoted 7 lines
Quoted 5 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine) · line 617
Quoted 2 lines
hw/riscv/virt.c +0
-0if (machine->initrd_filename) {hwaddr start;It's probably worth going through and making sure we mark the right regions as reserved in the DT, as with these being mobile we might run into latent bugs.
Do you mean mark where the firmware is as reserved?
Ya. We have some things like Linux assuming that the first page in memory is reserved for the bootloader, which IIRC never really got written down in any specifications. That's an implicit S-mode ABI, so it doesn't apply directly, but I'd guess there's some of this floating around elsewhere in the stack.
Quoted 5 lines
Quoted 3 lines
I haven't actually looked so maybe we're fine, but IIRC we sort of papered over a handful of memory layout agreements that weren't even in specs (or event meant to be in specs) that have stuck around for quite a while.
For the virt machine or the
sifive_u?
My guess is that any of this would apply to both of these, as the issue would be assumptions within the firmware about the memory image provided to it when it's entered. That would be an ABI between the firmware and whatever loads it, but IIRC for both the virt board and the sifive_u we assume the firmware is just loaded directly my QEMU.
The sifive_u board may be additionally constrained by SiFive's boot ROM, but I don't remember it really caring about any of this. Also not sure it's even used any more, as it was really just a vehicle to demonstrate initializing the widgets for which we couldn't release RTL.
Quoted 5 lines
Quoted 1 line
Reviewed-by Palmer Dabbelt <[email protected]>Thanks
Alistair
RE: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
Quoted 261 lines
-----Original Message-----
From: Qemu-riscv <qemu-riscv- [email protected]> On Behalf Of Palmer Dabbelt
Sent: 06 November 2020 08:19
To: [email protected]
Cc: [email protected]; [email protected]; Alistair Francis <[email protected]>; [email protected]
Subject: Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmwareQuoted 1 line · On Tue, 20 Oct 2020 08:46:45 PDT (-0700), [email protected] wrote:
On Mon, Oct 19, 2020 at 4:17 PM Palmer Dabbelt <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines · Alistair Francis
Quoted 2 lines
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the
firmware.
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +0
-0@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine);Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/hw/riscv/boot.h +3
-0+target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong +firmware_end_addr);target_ulong riscv_find_and_load_firmware (MachineState *machine,const char *default_machine_firmware, hwaddr
firmware_load_addr, @@ -34,6 +36,7 @@target_ulongriscv_load_firmware(const char
*firmware_filename,Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
hwaddr firmware_load_addr, symbol_fn_t sym_cb);
target_ulongriscv_load_kernel(const char*kernel_filename,
+target_ulongfirmware_end_addr,
symbol_fn_tsym_cb); hwaddr
riscv_load_initrd(const char *filename,uint64_tmem_size,uint64_t kernel_entry, hwaddr *start);hw/riscv/boot.c index renamed from hw/riscv/boot.c +0
-0
5dea644f47..9b3fe3fb1e100644hw/riscv/boot.c +0
-2@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif @@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } }Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
hw/riscv/boot.c +5
-0+target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else {Quoted 8 lines
Quoted 8 lines
hw/riscv/boot.c +4
-0+return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} +target_ulong riscv_find_and_load_firmware (MachineState *machine,const char *default_machine_firmware, hwaddr
firmware_load_addr, @@ -123,7 +130,9 @@target_ulongriscv_load_firmware(const char
*firmware_filename,Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
exit(1);}
-target_ulong
riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)hw/riscv/boot.c +3
-0+target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;Quoted 1 line
Quoted 1 line
hw/riscv/boot.c target_ulong riscv_load_kernel(const char
Quoted 1 line
hw/riscv/boot.c +0
-0@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char
*kernel_filename,symbol_fn_tsym_cb)Quoted 4 lines
Quoted 4 lines
hw/riscv/boot.c target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)
Quoted 4 lines
hw/riscv/boot.c +0
-1return kernel_entry; } - if (load_image_targphys_as(kernel_filename,
KERNEL_BOOT_ADDRESS,Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
hw/riscv/boot.c +2
-1+if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }Quoted 6 lines
Quoted 6 lines
hw/riscv/opentitan.c static void opentitan_board_init(MachineState
Quoted 6 lines
hw/riscv/boot.c +0
-0error_report ("could not load kernel '%s'" , kernel_filename);hw/riscv/opentitan.c index renamed from hw/riscv/opentitan.c +0
-0
0531bd879b..cc758b78b8100644hw/riscv/opentitan.c +0
-0@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState*machine)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/riscv/opentitan.c +2
-1}if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_e.c static void sifive_e_machine_init(MachineState
Quoted 5 lines
hw/riscv/sifive_e.c index renamed from hw/riscv/sifive_e.c +0
-0
fcfac16816..59bac4cc9a100644hw/riscv/sifive_e.c +0
-0@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState*machine)
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
hw/riscv/sifive_e.c +2
-1memmap[SIFIVE_E_DEV_MROM ].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState
Quoted 5 lines
hw/riscv/sifive_u.c index renamed from hw/riscv/sifive_u.c +0
-0
5f3ad9bc0f..b2472c6627100644hw/riscv/sifive_u.c +0
-0@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState*machine)
Quoted 8 lines
Quoted 8 lines
hw/riscv/sifive_u.c static void
Quoted 8 lines
hw/riscv/sifive_u.c +1
-0MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;@@ -474,10 +475,15 @@ static void
sifive_u_machine_init(MachineState *machine)Quoted 4 lines
Quoted 4 lines
hw/riscv/sifive_u.c static void · line 477
Quoted 4 lines
hw/riscv/sifive_u.c +0
-1break ; } - riscv_find_and_load_firmware(machine, BIOS_FILENAME,
start_addr, NULL);Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c static void · line 478
Quoted 1 line
hw/riscv/sifive_u.c +1
-0+ firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void · line 480
Quoted 5 lines
hw/riscv/sifive_u.c +2
-1+ start_addr, + NULL);if (machine->kernel_filename) { - kernel_entry = riscv_load_kernel(machine->kernel_filename,NULL);
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/riscv/sifive_u.c +6
-0+ kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );Quoted 7 lines
Quoted 7 lines
hw/riscv/spike.c static void spike_board_init(MachineState
Quoted 7 lines
hw/riscv/sifive_u.c +0
-0if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c index renamed from hw/riscv/spike.c +0
-0
3fd152a035..facac6e7d2100644hw/riscv/spike.c +0
-0@@ -195,6 +195,7 @@ static void spike_board_init(MachineState*machine)
Quoted 8 lines
Quoted 8 lines
hw/riscv/spike.c static void spike_board_init(MachineState
Quoted 8 lines
hw/riscv/spike.c +1
-0MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;@@ -261,12 +262,16 @@ static void spike_board_init(MachineState*machine)
Quoted 1 line
Quoted 1 line
hw/riscv/spike.c static void spike_board_init(MachineState · line 262
Quoted 1 line
hw/riscv/spike.c +0
-0memory_region_add_subregion(system_memory,memmap[SPIKE_MROM].base,
Quoted 6 lines
Quoted 6 lines
hw/riscv/spike.c static void spike_board_init(MachineState *machine)
Quoted 6 lines
hw/riscv/spike.c +1
-3mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
hw/riscv/spike.c +8
-0+ memmap[SPIKE_DRAM ].base, + + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);Quoted 6 lines
Quoted 6 lines
hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 6 lines
if (machine->initrd_filename) { diff --git
a/hw/riscv/virt.cb/hw/riscv/virt.cindex41bd2f38ba..6bfd10dfc7100644hw/riscv/virt.c +0
-0@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState*machine)
Quoted 9 lines
Quoted 9 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 9 lines
hw/riscv/virt.c +2
-0char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry; DeviceState *mmio_plic, *virtio_plic, *pcie_plic; @@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine) memory_region_add_subregion(system_memory,memmap[VIRT_MROM].base,
Quoted 5 lines
Quoted 5 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 5 lines
mask_rom);hw/riscv/virt.c +1
-2-riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 5 lines
Quoted 5 lines
hw/riscv/virt.c
Quoted 5 lines
hw/riscv/virt.c +2
-1+ start_addr, + NULL);if (machine->kernel_filename) { - kernel_entry = riscv_load_kernel(machine->kernel_filename,NULL);
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/riscv/virt.c +6
-0+ kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
if (machine->initrd_filename) { hwaddr start;It's probably worth going through and making sure we mark the right regions as reserved in the DT, as with these being mobile we might run
Quoted 8 lines
into latent bugs.
Quoted 2 lines
Do you mean mark where the firmware is as reserved?
Ya. We have some things like Linux assuming that the first page in memory is reserved for the bootloader, which IIRC never really got written down in any specifications. That's an implicit S-mode ABI, so it doesn't apply directly, but I'd guess there's some of this floating around elsewhere in the stack.
Let's not do any DT reservation based on firmware load location because firmwares can relocate itself to some other address. Further, firmware such as OpenSBI can now create domains where only firmware knows how the system is partitioned into domains and do DT reservations accordingly.
I suggest we let firmware add the required reservations in DT
Quoted 14 lines
Quoted 4 lines
Quoted 4 lines
I haven't actually looked so maybe we're fine, but IIRC we sort of papered over a handful of memory layout agreements that weren't even in specs (or event meant to be in specs) that have stuck around for quite a
while.
Quoted 2 lines
For the virt machine or the
sifive_u?My guess is that any of this would apply to both of these, as the issue would be assumptions within the firmware about the memory image provided to it when it's entered. That would be an ABI between the firmware and whatever loads it, but IIRC for both the virt board and the
sifive_uwe assume the firmware is just loaded directly my QEMU.
Quoted 10 lines
The
sifive_uboard may be additionally constrained by SiFive's boot ROM, but I don't remember it really caring about any of this. Also not sure it's even used any more, as it was really just a vehicle to demonstrate initializing the widgets for which we couldn't release RTL.Quoted 5 lines
Quoted 1 line
Reviewed-by Palmer Dabbelt <[email protected]>Thanks
Alistair
Regards,
Anup
Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
Quoted 271 lines · Anup Patel
Quoted 262 lines
-----Original Message-----
From: Qemu-riscv <qemu-riscv- [email protected]> On Behalf Of Palmer Dabbelt
Sent: 06 November 2020 08:19
To: [email protected]
Cc: [email protected]; [email protected]; Alistair Francis <[email protected]>; [email protected]
Subject: Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmwareQuoted 1 line · On Tue, 20 Oct 2020 08:46:45 PDT (-0700), [email protected] wrote:
On Mon, Oct 19, 2020 at 4:17 PM Palmer Dabbelt <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines · Alistair Francis
Quoted 2 lines
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the
firmware.
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +0
-0@@ -25,6 +25,8 @@bool riscv_is_32_bit (MachineState *machine);Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/hw/riscv/boot.h +3
-0+target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong +firmware_end_addr);target_ulong riscv_find_and_load_firmware (MachineState *machine,const char *default_machine_firmware, hwaddr
firmware_load_addr, @@ -34,6 +36,7 @@target_ulongriscv_load_firmware(const char
*firmware_filename,Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
hwaddr firmware_load_addr, symbol_fn_t sym_cb);
target_ulongriscv_load_kernel(const char*kernel_filename,
+target_ulongfirmware_end_addr,
symbol_fn_tsym_cb); hwaddr
riscv_load_initrd(const char *filename,uint64_tmem_size,uint64_t kernel_entry, hwaddr *start);hw/riscv/boot.c index renamed from hw/riscv/boot.c +0
-0
5dea644f47..9b3fe3fb1e100644hw/riscv/boot.c +0
-2@@ -33,10 +33,8 @@#include <libfdt.h> #if defined(TARGET_RISCV32 ) -# define KERNEL_BOOT_ADDRESS 0x80400000#define fw_dynamic_info_data (__val) cpu_to_le32(__val)#else -# define KERNEL_BOOT_ADDRESS 0x80200000#define fw_dynamic_info_data (__val) cpu_to_le64(__val)#endif @@ -49,6 +47,15 @@ bool riscv_is_32_bit(MachineState *machine) } }Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
hw/riscv/boot.c +5
-0+target_ulong riscv_calc_kernel_start_addr (MachineState *machine, +target_ulong firmware_end_addr) { +if (riscv_is_32_bit (machine)) { +return QEMU_ALIGN_UP (firmware_end_addr,4 * MiB); + }else {Quoted 8 lines
Quoted 8 lines
hw/riscv/boot.c +4
-0+return QEMU_ALIGN_UP (firmware_end_addr,2 * MiB); + } +} +target_ulong riscv_find_and_load_firmware (MachineState *machine,const char *default_machine_firmware, hwaddr
firmware_load_addr, @@ -123,7 +130,9 @@target_ulongriscv_load_firmware(const char
*firmware_filename,Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
exit(1);}
-target_ulong
riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)hw/riscv/boot.c +3
-0+target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong kernel_start_addr, +symbol_fn_t sym_cb) {uint64_t kernel_entry;Quoted 1 line
Quoted 1 line
hw/riscv/boot.c target_ulong riscv_load_kernel(const char
Quoted 1 line
hw/riscv/boot.c +0
-0@@ -138,9 +147,9 @@ target_ulong riscv_load_kernel(const char
*kernel_filename,symbol_fn_tsym_cb)Quoted 4 lines
Quoted 4 lines
hw/riscv/boot.c target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb)
Quoted 4 lines
hw/riscv/boot.c +0
-1return kernel_entry; } - if (load_image_targphys_as(kernel_filename,
KERNEL_BOOT_ADDRESS,Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
hw/riscv/boot.c +2
-1+if (load_image_targphys_as (kernel_filename, kernel_start_addr, ram_size,NULL ) >0 ) { -return KERNEL_BOOT_ADDRESS ; +return kernel_start_addr; }Quoted 6 lines
Quoted 6 lines
hw/riscv/opentitan.c static void opentitan_board_init(MachineState
Quoted 6 lines
hw/riscv/boot.c +0
-0error_report ("could not load kernel '%s'" , kernel_filename);hw/riscv/opentitan.c index renamed from hw/riscv/opentitan.c +0
-0
0531bd879b..cc758b78b8100644hw/riscv/opentitan.c +0
-0@@ -75,7 +75,8 @@ static void opentitan_board_init(MachineState*machine)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/riscv/opentitan.c +2
-1}if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[IBEX_DEV_RAM ].base,NULL ); } }Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_e.c static void sifive_e_machine_init(MachineState
Quoted 5 lines
hw/riscv/sifive_e.c index renamed from hw/riscv/sifive_e.c +0
-0
fcfac16816..59bac4cc9a100644hw/riscv/sifive_e.c +0
-0@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState*machine)
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
hw/riscv/sifive_e.c +2
-1memmap[SIFIVE_E_DEV_MROM ].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename,NULL ); +riscv_load_kernel (machine->kernel_filename, + memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState
Quoted 5 lines
hw/riscv/sifive_u.c index renamed from hw/riscv/sifive_u.c +0
-0
5f3ad9bc0f..b2472c6627100644hw/riscv/sifive_u.c +0
-0@@ -415,6 +415,7 @@ static void sifive_u_machine_init(MachineState*machine)
Quoted 8 lines
Quoted 8 lines
hw/riscv/sifive_u.c static void
Quoted 8 lines
hw/riscv/sifive_u.c +1
-0MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *flash0 =g_new (MemoryRegion,1 );target_ulong start_addr = memmap[SIFIVE_U_DEV_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t start_addr_hi32 =0x00000000 ;int i;uint32_t fdt_load_addr;@@ -474,10 +475,15 @@ static void
sifive_u_machine_init(MachineState *machine)Quoted 4 lines
Quoted 4 lines
hw/riscv/sifive_u.c static void · line 477
Quoted 4 lines
hw/riscv/sifive_u.c +0
-1break ; } - riscv_find_and_load_firmware(machine, BIOS_FILENAME,
start_addr, NULL);Quoted 1 line
Quoted 1 line
hw/riscv/sifive_u.c static void · line 478
Quoted 1 line
hw/riscv/sifive_u.c +1
-0+ firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 5 lines
Quoted 5 lines
hw/riscv/sifive_u.c static void · line 480
Quoted 5 lines
hw/riscv/sifive_u.c +2
-1+ start_addr, + NULL);if (machine->kernel_filename) { - kernel_entry = riscv_load_kernel(machine->kernel_filename,NULL);
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/riscv/sifive_u.c +6
-0+ kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );Quoted 7 lines
Quoted 7 lines
hw/riscv/spike.c static void spike_board_init(MachineState
Quoted 7 lines
hw/riscv/sifive_u.c +0
-0if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c index renamed from hw/riscv/spike.c +0
-0
3fd152a035..facac6e7d2100644hw/riscv/spike.c +0
-0@@ -195,6 +195,7 @@ static void spike_board_init(MachineState*machine)
Quoted 8 lines
Quoted 8 lines
hw/riscv/spike.c static void spike_board_init(MachineState
Quoted 8 lines
hw/riscv/spike.c +1
-0MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 );MemoryRegion *mask_rom =g_new (MemoryRegion,1 ); +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry;char *soc_name;@@ -261,12 +262,16 @@ static void spike_board_init(MachineState*machine)
Quoted 1 line
Quoted 1 line
hw/riscv/spike.c static void spike_board_init(MachineState · line 262
Quoted 1 line
hw/riscv/spike.c +0
-0memory_region_add_subregion(system_memory,memmap[SPIKE_MROM].base,
Quoted 6 lines
Quoted 6 lines
hw/riscv/spike.c static void spike_board_init(MachineState *machine)
Quoted 6 lines
hw/riscv/spike.c +1
-3mask_rom); -riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); + firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
hw/riscv/spike.c +8
-0+ memmap[SPIKE_DRAM ].base, + + htif_symbol_callback);if (machine->kernel_filename) { + kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);Quoted 6 lines
Quoted 6 lines
hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 6 lines
if (machine->initrd_filename) { diff --git
a/hw/riscv/virt.cb/hw/riscv/virt.cindex41bd2f38ba..6bfd10dfc7100644hw/riscv/virt.c +0
-0@@ -493,6 +493,7 @@ static void virt_machine_init(MachineState*machine)
Quoted 9 lines
Quoted 9 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 9 lines
hw/riscv/virt.c +2
-0char *plic_hart_config, *soc_name;size_t plic_hart_config_len;target_ulong start_addr = memmap[VIRT_DRAM ].base; +target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry; DeviceState *mmio_plic, *virtio_plic, *pcie_plic; @@ -602,11 +603,15 @@ static void virt_machine_init(MachineState *machine) memory_region_add_subregion(system_memory,memmap[VIRT_MROM].base,
Quoted 5 lines
Quoted 5 lines
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 5 lines
mask_rom);hw/riscv/virt.c +1
-2-riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[VIRT_DRAM ].base,NULL ); + firmware_end_addr = riscv_find_and_load_firmware(machine,
BIOS_FILENAME,Quoted 5 lines
Quoted 5 lines
hw/riscv/virt.c
Quoted 5 lines
hw/riscv/virt.c +2
-1+ start_addr, + NULL);if (machine->kernel_filename) { - kernel_entry = riscv_load_kernel(machine->kernel_filename,NULL);
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/riscv/virt.c +6
-0+ kernel_start_addr =riscv_calc_kernel_start_addr (machine, + + firmware_end_addr); + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
if (machine->initrd_filename) { hwaddr start;It's probably worth going through and making sure we mark the right regions as reserved in the DT, as with these being mobile we might run
Quoted 8 lines
into latent bugs.
Quoted 2 lines
Do you mean mark where the firmware is as reserved?
Ya. We have some things like Linux assuming that the first page in memory is reserved for the bootloader, which IIRC never really got written down in any specifications. That's an implicit S-mode ABI, so it doesn't apply directly, but I'd guess there's some of this floating around elsewhere in the stack.
Quoted 6 lines
Let's not do any DT reservation based on firmware load location because firmwares can relocate itself to some other address. Further, firmware such as OpenSBI can now create domains where only firmware knows how the system is partitioned into domains and do DT reservations accordingly.
I suggest we let firmware add the required reservations in DT
Agreed. I don't think QEMU should be editing a DT for the firmware. The firmware should do that itself if it wants to or needs to.
Alistair
Quoted 29 lines
Quoted 15 lines
Quoted 5 lines
Quoted 5 lines
I haven't actually looked so maybe we're fine, but IIRC we sort of papered over a handful of memory layout agreements that weren't even in specs (or event meant to be in specs) that have stuck around for quite a
while.
Quoted 2 lines
For the virt machine or the
sifive_u?My guess is that any of this would apply to both of these, as the issue would be assumptions within the firmware about the memory image provided to it when it's entered. That would be an ABI between the firmware and whatever loads it, but IIRC for both the virt board and the
sifive_uwe assume the firmware is just loaded directly my QEMU.Quoted 10 lines
The
sifive_uboard may be additionally constrained by SiFive's boot ROM, but I don't remember it really caring about any of this. Also not sure it's even used any more, as it was really just a vehicle to demonstrate initializing the widgets for which we couldn't release RTL.Quoted 5 lines
Quoted 1 line
Reviewed-by Palmer Dabbelt <[email protected]>Thanks
Alistair
Regards,
Anup
Re: [PATCH v2 4/4] hw/riscv: Load the kernel after the firmware
In reply to Alistair FrancisQuoted 3 lines · Alistair Francis
Instead of loading the kernel at a hardcoded start address, let's load the kernel at the next alligned address after the end of the firmware.
typo of "aligned"
Quoted 5 lines
This should have no impact for current users of OpenSBI, but will allow loading a noMMU kernel at the start of memory.
Signed-off-by Alistair Francis <[email protected]>
Quoted 10 lines
--- include/hw/riscv/boot.h | 3 +++ hw/riscv/boot.c | 19 ++++++++++++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 10 ++++++++-- hw/riscv/spike.c | 11 ++++++++--- hw/riscv/virt.c | 11 ++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-)
Alistair Francis
AppliedQuoted 11 lines · Alistair Francis
This series allows loading a noMMU kernel using the -kernel option. Currently if using -kernel QEMU assumes you also have firmware and loads the kernel at a hardcoded offset. This series changes that so we only load the kernel at an offset if a firmware (-bios) was loaded.
This series also adds a function to check if the CPU is 32-bit. This is a step towards running 32-bit and 64-bit CPUs on the 64-bit RISC-V build by using run time checks instead of compile time checks. We also allow the user to sepcify a CPU for the
sifive_umachine.
Quoted 5 lines
Alistair Francis (4):
hw/riscv:sifive_u: Allow specifying the CPU hw/riscv: Return the end address of the loaded firmware hw/riscv: Add ariscv_is_32_bit()function hw/riscv: Load the kernel after the firmware
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 14 lines
include/hw/riscv/boot.h | 13 ++++++--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/boot.c | 56 ++++++++++++++++++++++++++----------- hw/riscv/opentitan.c | 3 +- hw/riscv/sifive_e.c | 3 +- hw/riscv/sifive_u.c | 28 ++++++++++++++----- hw/riscv/spike.c | 11 ++++++-- hw/riscv/virt.c | 11 ++++++-- 8 files changed, 91 insertions(+), 35 deletions(-)--
2.28.0