Allow loading a no MMU kernel
Subsystems (2)
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 | 11 +++++---- include/hw/riscv/sifive_u.h | 1 + hw/riscv/boot.c | 47 ++++++++++++++++++++++++------------- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 31 ++++++++++++++++++------ hw/riscv/spike.c | 14 ++++++++--- hw/riscv/virt.c | 14 ++++++++--- 8 files changed, 89 insertions(+), 35 deletions(-)
Signature · 1 line
2.28.0
PATCH 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 v1 1/4] hw/riscv: sifive_u: Allow specifying the CPU
Quoted 10 lines · Alistair Francis
Allow the user to specify the main application CPU for the
sifive_umachine.Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/sifive_u.h | 1 + hw/riscv/sifive_u.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
PATCH 2/4 hw/riscv: Return the end address of the loaded firmware
In reply to Alistair Francis--- 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 v1 2/4] hw/riscv: Return the end address of the loaded firmware
On Fri, Oct 2, 2020 at 11:42 PM Alistair Francis
<[email protected]> wrote:
It merits some commit message to explain why the return value of riscv_load_firmware() was changed from firmware entry address to firmware end address.
Quoted 7 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(-)
Regards,
Bin
Re: [PATCH v1 2/4] hw/riscv: Return the end address of the loaded firmware
Quoted 7 lines · Bin Meng
On Fri, Oct 2, 2020 at 11:42 PM Alistair Francis
<[email protected]> wrote:It merits some commit message to explain why the return value of
riscv_load_firmware()was changed from firmware entry address to firmware end address.
Done.
Alistair
Quoted 11 lines
Quoted 8 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(-)Regards,
Bin
PATCH 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
PATCH 4/4 hw/riscv: Load the kernel after the firmware
In reply to Alistair Francis--- include/hw/riscv/boot.h | 1 + hw/riscv/boot.c | 10 +++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 13 +++++++++++-- hw/riscv/spike.c | 14 +++++++++++--- hw/riscv/virt.c | 14 +++++++++++--- 7 files changed, 43 insertions(+), 15 deletions(-)
include/hw/riscv/boot.h +1 -0
@@ -34,6 +34,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 +5 -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
@@ -123,7 +121,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 +138,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 +11 -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,18 @@ 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 ); +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 ); + }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;
hw/riscv/spike.c +11 -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,19 @@ 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) { +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 ); + }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {
hw/riscv/virt.c +11 -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,18 @@ 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 ); +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 ); + }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + + 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 v1 4/4] hw/riscv: Load the kernel after the firmware
On Fri, Oct 2, 2020 at 11:55 PM Alistair Francis
<[email protected]> wrote:
Please put some commit message to explain why the changes are necessary.
Quoted 104 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 1 + hw/riscv/boot.c | 10 +++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 13 +++++++++++-- hw/riscv/spike.c | 14 +++++++++++--- hw/riscv/virt.c | 14 +++++++++++--- 7 files changed, 43 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +1
-0@@ -34,6 +34,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 +5
-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 @@ -123,7 +121,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 +138,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 +1
-0@@ -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,18 @@ static void sifive_u_machine_init(MachineState *machine)break ;
hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState *machine) · line 483
Quoted 10 lines
hw/riscv/sifive_u.c +4
-2} -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 ); +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 );
Use 4 * MiB
hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState *machine) · line 485
Quoted 2 lines
hw/riscv/sifive_u.c +2
-0+ }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 );
2 * MiB
Quoted 23 lines
hw/riscv/sifive_u.c +4
-0+ } + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c +1
-0@@ -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,19 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom);
hw/riscv/spike.c static void spike_board_init(MachineState *machine) · line 271
Quoted 10 lines
hw/riscv/spike.c +5
-3-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) { +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 );
Ditto
It looks like this same code logic is added in several machine codes, perhaps a new helper function in riscv/boot.c is needed to determine the kernel start address based on the firmware end address.
Quoted 33 lines
hw/riscv/spike.c +5
-0+ }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +4
-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,18 @@ 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 ); +if (riscv_is_32_bit (machine)) {
hw/riscv/virt.c static void virt_machine_init(MachineState *machine) · line 620
Quoted 10 lines
hw/riscv/virt.c +7
-0+ kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 ); + }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;
Regards,
Bin
Re: [PATCH v1 4/4] hw/riscv: Load the kernel after the firmware
Quoted 5 lines · Bin Meng
On Fri, Oct 2, 2020 at 11:55 PM Alistair Francis
<[email protected]> wrote:Please put some commit message to explain why the changes are necessary.
I have added a commit message.
Quoted 159 lines
Quoted 105 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/boot.h | 1 + hw/riscv/boot.c | 10 +++++----- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 13 +++++++++++-- hw/riscv/spike.c | 14 +++++++++++--- hw/riscv/virt.c | 14 +++++++++++--- 7 files changed, 43 insertions(+), 15 deletions(-)include/hw/riscv/boot.h +1
-0@@ -34,6 +34,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 +5
-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 @@ -123,7 +121,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 +138,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 +1
-0@@ -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,18 @@ static void sifive_u_machine_init(MachineState *machine)break ;hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState *machine) · line 483
Quoted 10 lines
hw/riscv/sifive_u.c +4
-2} -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 ); +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 );Use 4 * MiB
hw/riscv/sifive_u.c static void sifive_u_machine_init(MachineState *machine) · line 485
Quoted 2 lines
hw/riscv/sifive_u.c +2
-0+ }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 );2 * MiB
Quoted 23 lines
hw/riscv/sifive_u.c +4
-0+ } + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;hw/riscv/spike.c +1
-0@@ -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,19 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom);hw/riscv/spike.c static void spike_board_init(MachineState *machine) · line 271
Quoted 10 lines
hw/riscv/spike.c +5
-3-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) { +if (riscv_is_32_bit (machine)) { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 );Ditto
Quoted 3 lines
It looks like this same code logic is added in several machine codes, perhaps a new helper function in
riscv/boot.cis needed to determine the kernel start address based on the firmware end address.
Done!
Alistair
Quoted 47 lines
Quoted 34 lines
hw/riscv/spike.c +5
-0+ }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +4
-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,18 @@ 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 ); +if (riscv_is_32_bit (machine)) {hw/riscv/virt.c static void virt_machine_init(MachineState *machine) · line 620
Quoted 10 lines
hw/riscv/virt.c +7
-0+ kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x400000 ); + }else { + kernel_start_addr =QEMU_ALIGN_UP (firmware_end_addr,0x200000 ); + } + + kernel_entry =riscv_load_kernel (machine->kernel_filename, + kernel_start_addr,NULL );if (machine->initrd_filename) {hwaddr start;Regards,
Bin
Hi Alistair,
Quoted 10 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.
Could you please provide test scenarios for this series? I want to have a try. Thanks.
Quoted 7 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
Quoted 9 lines
include/hw/riscv/boot.h | 11 +++++---- include/hw/riscv/sifive_u.h | 1 + hw/riscv/boot.c | 47 ++++++++++++++++++++++++------------- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 31 ++++++++++++++++++------ hw/riscv/spike.c | 14 ++++++++--- hw/riscv/virt.c | 14 ++++++++--- 8 files changed, 89 insertions(+), 35 deletions(-)
Regards,
Bin
Quoted 11 lines · Bin Meng
Hi Alistair,
Quoted 6 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.
Quoted 7 lines
Quoted 4 lines
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.Could you please provide test scenarios for this series? I want to have a try. Thanks.
Yep.
Build a noMMU kernel (you need the latest master commit a78c6f5956a9):
$ CROSS_COMPILE=riscv64-elf- ARCH=riscv make nommu_virt_defconfig $ CROSS_COMPILE=riscv64-elf- ARCH=riscv make -j
Build a noMMU RISC-V userspace
$ git clonehttps://github.com/damien-lemoal/buildroot.git $ make kendryte_k210_defconfig $ make
Run QEMU:
./build/riscv64-softmmu/qemu-system-riscv64 -machine virt -m 64M \
-cpu rv64,mmu=false \
-serial mon:stdio -serial null -nographic \
-append "root=/dev/vda rw highres=off console=ttyS0 mem=1G ip=dhcp earlycon=sbi" \
-device virtio-net-device,netdev=net0,mac=52:54:00:12:34:02 -netdev user,id=net0 \
-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-device,rng=rng0 \
-smp 1 -d guest_errors \
-kernel ./Image \
-drive id=disk0,file=./nommu-rootfs.ext2,if=none,format=raw -device virtio-blk-device,drive=disk0 -bios none
Alistair
Quoted 20 lines
Quoted 8 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 firmwareQuoted 9 lines
include/hw/riscv/boot.h | 11 +++++---- include/hw/riscv/sifive_u.h | 1 + hw/riscv/boot.c | 47 ++++++++++++++++++++++++------------- hw/riscv/opentitan.c | 3 ++- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 31 ++++++++++++++++++------ hw/riscv/spike.c | 14 ++++++++--- hw/riscv/virt.c | 14 ++++++++--- 8 files changed, 89 insertions(+), 35 deletions(-)Regards,
Bin