riscv: OpenSBI boot test and cleanups
Subsystems (2)
v5 cover riscv: OpenSBI boot test and cleanups
Hi,
This new version is still rebased on top of [1]:
"[PATCH v2 00/12] hw/riscv: Improve Spike HTIF emulation fidelity"
from Bin Meng.
The change from v4 is on patch 9 where we added an extra flag in riscv_load_kernel() to allow for boards that don't load initrd (e.g. opentitan and sifive_e) to opt out from loading it altogether.
* Patch without reviews: 9
Changes from v4:
- patch 9:
- added a 'load_init' flag in riscv_load_kernel() to control whether the function should execute riscv_load_initrd() or not
v4 link: https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg04652.html
Changes from v3:
- patch 1:
- fixed more instances of 'opensbi' and 'Opensbi' to 'OpenSBI'
- changed tests order
- patch 4 (new):
- added a g_assert(filename) guard in riscv_load_initrd() and riscv_load_kernel()
v3 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg04491.html
Changes from v2:
- patch 1:
- reduced code repetition with a boot_opensbi() helper
- renamed 'opensbi' to 'OpenSBI' in the file header
- patch 9:
- renamed riscv_load_kernel() to riscv_load_kernel_and_initrd()
v2 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg04466.html
Changes from v1:
- patches were rebased with [1]
- patches 13-15: removed
* will be re-sent in a follow-up series
- patches 4-5: removed since they're picked by Bin in [1]
- patch 1:
- added a 'skip' riscv32 spike test
v1 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg03860.html
Based-on: <[email protected]>
[1] https://patchwork.ozlabs.org/project/qemu-devel/list/?series=334352
Daniel Henrique Barboza (11):
tests/avocado: add RISC-V OpenSBI boot test hw/riscv/spike: use 'fdt' from MachineState hw/riscv/sifive_u: use 'fdt' from MachineState hw/riscv/boot.c: exit early if filename is NULL in load functions hw/riscv/spike.c: load initrd right after riscv_load_kernel() hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd() hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel() hw/riscv/boot.c: use MachineState in riscv_load_initrd() hw/riscv/boot.c: use MachineState in riscv_load_kernel() hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel() hw/riscv/boot.c: make riscv_load_initrd() static
hw/riscv/boot.c | 91 +++++++++++++++++++++++----------- hw/riscv/microchip_pfsoc.c | 20 +------- hw/riscv/opentitan.c | 3 +- hw/riscv/sifive_e.c | 4 +- hw/riscv/sifive_u.c | 32 +++--------- hw/riscv/spike.c | 37 ++++---------- hw/riscv/virt.c | 21 +------- include/hw/riscv/boot.h | 5 +- include/hw/riscv/sifive_u.h | 3 -- include/hw/riscv/spike.h | 2 - tests/avocado/riscv_opensbi.py | 65 ++++++++++++++++++++++++ 11 files changed, 150 insertions(+), 133 deletions(-) create mode 100644 tests/avocado/riscv_opensbi.py
Signature · 1 line
2.39.0
PATCH v5 1/11 tests/avocado: add RISC-V OpenSBI boot test
This test is used to do a quick sanity check to ensure that we're able to run the existing QEMU FW image.
'sifive_u', 'spike' and 'virt' riscv64 machines, and 'sifive_u' and 'virt' 32 bit machines are able to run the default RISCV64_BIOS_BIN | RISCV32_BIOS_BIN firmware with minimal options.
The riscv32 'spike' machine isn't bootable at this moment, requiring an OpenSBI fix [1] and QEMU side changes [2]. We could just leave at that or add a 'skip' test to remind us about it. To work as a reminder that we have a riscv32 'spike' test that should be enabled as soon as OpenSBI QEMU rom receives the fix, we're adding a 'skip' test:
(06/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_spike:
SKIP: requires OpenSBI fix to work
[1] https://patchwork.ozlabs.org/project/opensbi/patch/[email protected]/
[2] https://patchwork.ozlabs.org/project/qemu-devel/list/?series=334159
--- tests/avocado/riscv_opensbi.py | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 tests/avocado/riscv_opensbi.py
tests/avocado/riscv_opensbi.py new file +65 -0
@@ -0,0 +1,65 @@ +# OpenSBI boot test for RISC-V machines +# +# Copyright (c) 2022, Ventana Micro +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import QemuSystemTest +from avocado import skip +from avocado_qemu import wait_for_console_pattern + +class RiscvOpenSBI(QemuSystemTest): + """ + :avocado: tags=accel:tcg + """ + timeout = 5 + + def boot_opensbi(self): + self.vm.set_console() + self.vm.launch() + wait_for_console_pattern(self, 'Platform Name') + wait_for_console_pattern(self, 'Boot HART MEDELEG') + + @skip("requires OpenSBI fix to work") + def test_riscv32_spike(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:spike + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:spike + """ + self.boot_opensbi() + + def test_riscv32_sifive_u(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi() + + def test_riscv64_sifive_u(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi() + + def test_riscv32_virt(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi()
Signature · 1 line
2.39.0
Re: [PATCH v5 01/11] tests/avocado: add RISC-V OpenSBI boot test
Quoted 20 lines · Daniel Henrique Barboza
This test is used to do a quick sanity check to ensure that we're able to run the existing QEMU FW image.
'
sifive_u', 'spike' and 'virt' riscv64 machines, and 'sifive_u' and 'virt' 32 bit machines are able to run the defaultRISCV64_BIOS_BIN|RISCV32_BIOS_BINfirmware with minimal options.The riscv32 'spike' machine isn't bootable at this moment, requiring an OpenSBI fix [1] and QEMU side changes [2]. We could just leave at that or add a 'skip' test to remind us about it. To work as a reminder that we have a riscv32 'spike' test that should be enabled as soon as OpenSBI QEMU rom receives the fix, we're adding a 'skip' test:
(06/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_spike:
SKIP: requires OpenSBI fix to work[1] https://patchwork.ozlabs.org/project/opensbi/patch/[email protected]/
[2] https://patchwork.ozlabs.org/project/qemu-devel/list/?series=334159
Quoted 6 lines
Cc Cleber Rosa <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 80 lines
--- tests/avocado/riscv_opensbi.py | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 tests/avocado/riscv_opensbi.pytests/avocado/riscv_opensbi.py new file +65
-1@@ -0,0 +1,65 @@ +# OpenSBI boot test for RISC-V machines +# +# Copyright (c) 2022, Ventana Micro +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import QemuSystemTest +from avocado import skip +from avocado_qemu import wait_for_console_pattern + +class RiscvOpenSBI(QemuSystemTest): + """ + :avocado: tags=accel:tcg + """ + timeout = 5 + + def boot_opensbi(self): + self.vm.set_console() + self.vm.launch() + wait_for_console_pattern(self, 'Platform Name') + wait_for_console_pattern(self, 'Boot HART MEDELEG') + + @skip("requires OpenSBI fix to work") + def test_riscv32_spike(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:spike + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:spike + """ + self.boot_opensbi() + + def test_riscv32_sifive_u(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi() + + def test_riscv64_sifive_u(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi() + + def test_riscv32_virt(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi() --2.39.0
PATCH v5 2/11 hw/riscv/spike: use 'fdt' from MachineState
In reply to Daniel Henrique BarbozaThe MachineState object provides a 'fdt' pointer that is already being used by other RISC-V machines, and it's also used by the 'dumpdtb' QMP command.
Remove the 'fdt' pointer from SpikeState and use MachineState::fdt instead.
--- hw/riscv/spike.c | 12 +++++------- include/hw/riscv/spike.h | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-)
hw/riscv/spike.c +5 -7
@@ -53,6 +53,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, bool is_32_bit, bool htif_custom_base) {void *fdt; +int fdt_size;uint64_t addr, size;unsigned long clint_addr;int cpu, socket;
@@ -65,7 +66,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, "sifive,clint0", "riscv,clint0" }; - fdt = s->fdt =create_device_tree (&s->fdt_size); + fdt = mc->fdt =create_device_tree (&fdt_size);if (!fdt) {error_report ("create_device_tree() failed" );exit (1 );
@@ -327,18 +328,15 @@ static void spike_board_init(MachineState *machine)hwaddr end =riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , +qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , +qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , end); }/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, - machine->ram_size, s->fdt); - -/* Set machine->fdt for 'dumpdtb' QMP/HMP command */ - machine->fdt = s->fdt; + machine->ram_size, machine->fdt);/* load the reset vector */ riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base,
include/hw/riscv/spike.h +0 -2
@@ -37,8 +37,6 @@ struct SpikeState {/*< public >*/ RISCVHartArrayState soc[SPIKE_SOCKETS_MAX ]; -void *fdt; -int fdt_size; };enum {
Signature · 1 line
2.39.0
PATCH v5 3/11 hw/riscv/sifive_u: use 'fdt' from MachineState
In reply to Daniel Henrique BarbozaThe MachineState object provides a 'fdt' pointer that is already being used by other RISC-V machines, and it's also used by the 'dumpdtb' QMP command.
Remove the 'fdt' pointer from SiFiveUState and use MachineState::fdt instead.
--- hw/riscv/sifive_u.c | 15 ++++++--------- include/hw/riscv/sifive_u.h | 3 --- 2 files changed, 6 insertions(+), 12 deletions(-)
hw/riscv/sifive_u.c +6 -9
@@ -98,7 +98,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, {MachineState *ms =MACHINE (qdev_get_machine ());void *fdt; -int cpu; +int cpu, fdt_size;uint32_t *cells;char *nodename;uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle =1 ;
@@ -112,14 +112,14 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, };if (ms->dtb) { - fdt = s->fdt =load_device_tree (ms->dtb, &s->fdt_size); + fdt = ms->fdt =load_device_tree (ms->dtb, &fdt_size);if (!fdt) {error_report ("load_device_tree() failed" );exit (1 ); } goto update_bootargs; }else { - fdt = s->fdt =create_device_tree (&s->fdt_size); + fdt = ms->fdt =create_device_tree (&fdt_size);if (!fdt) {error_report ("create_device_tree() failed" );exit (1 );
@@ -612,9 +612,9 @@ static void sifive_u_machine_init(MachineState *machine)hwaddr end =riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , +qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , +qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , end); } }else {
@@ -627,14 +627,11 @@ static void sifive_u_machine_init(MachineState *machine)/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SIFIVE_U_DEV_DRAM ].base, - machine->ram_size, s->fdt); + machine->ram_size, machine->fdt);if (!riscv_is_32bit (&s->soc.u_cpus)) { start_addr_hi32 = (uint64_t )start_addr >>32 ; } -/* Set machine->fdt for 'dumpdtb' QMP/HMP command */ - machine->fdt = s->fdt; -/* reset vector */ uint32_t reset_vec[12 ] = { s->msel,/* MSEL pin state */
include/hw/riscv/sifive_u.h +0 -3
@@ -67,9 +67,6 @@ typedef struct SiFiveUState {/*< public >*/ SiFiveUSoCState soc; -void *fdt; -int fdt_size; -bool start_in_flash;uint32_t msel;uint32_t serial;
Signature · 1 line
2.39.0
PATCH v5 4/11 hw/riscv/boot.c: exit early if filename is NULL in load functions
In reply to Daniel Henrique Barbozariscv_load_firmware(), riscv_load_initrd() and riscv_load_kernel() works under the assumption that a 'filename' parameter is always not NULL.
This is currently the case since all callers of these functions are checking for NULL before calling them. Add an g_assert() to make sure that a NULL value in these cases are to be considered a bug.
--- hw/riscv/boot.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/riscv/boot.c +6 -0
@@ -153,6 +153,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename,uint64_t firmware_entry, firmware_end;ssize_t firmware_size; +g_assert (firmware_filename !=NULL ); +if (load_elf_ram_sym (firmware_filename,NULL ,NULL ,NULL , &firmware_entry,NULL , &firmware_end,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) {
@@ -177,6 +179,8 @@ target_ulong riscv_load_kernel(const char *kernel_filename, {uint64_t kernel_load_base, kernel_entry; +g_assert (kernel_filename !=NULL ); +/* * NB: Use low address not ELF entry point to ensure that the fw_dynamic * behaviour when loading an ELF matches the fw_payload, fw_jump and BBL
@@ -209,6 +213,8 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, {ssize_t size; +g_assert (filename !=NULL ); +/* * We want to put the initrd far enough into RAM that when the * kernel is uncompressed it will not clobber the initrd. However
Signature · 1 line
2.39.0
Re: [PATCH v5 04/11] hw/riscv/boot.c: exit early if filename is NULL in load functions
Quoted 8 lines · Daniel Henrique Barboza
riscv_load_firmware(),riscv_load_initrd()andriscv_load_kernel()works under the assumption that a 'filename' parameter is always not NULL.This is currently the case since all callers of these functions are checking for NULL before calling them. Add an
g_assert()to make sure that a NULL value in these cases are to be considered a bug.
Quoted 7 lines
Suggested-by Alex Bennée <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 6 ++++++ 1 file changed, 6 insertions(+)
Re: [PATCH v5 04/11] hw/riscv/boot.c: exit early if filename is NULL in load functions
In reply to Daniel Henrique BarbozaQuoted 11 lines · Daniel Henrique Barboza
riscv_load_firmware(),riscv_load_initrd()andriscv_load_kernel()works under the assumption that a 'filename' parameter is always not NULL.This is currently the case since all callers of these functions are checking for NULL before calling them. Add an
g_assert()to make sure that a NULL value in these cases are to be considered a bug.Suggested-by Alex Bennée <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 39 lines
--- hw/riscv/boot.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/riscv/boot.c +6
-1@@ -153,6 +153,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename,uint64_t firmware_entry, firmware_end;ssize_t firmware_size; +g_assert (firmware_filename !=NULL ); +if (load_elf_ram_sym (firmware_filename,NULL ,NULL ,NULL , &firmware_entry,NULL , &firmware_end,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) {@@ -177,6 +179,8 @@ target_ulong riscv_load_kernel(const char *kernel_filename, {uint64_t kernel_load_base, kernel_entry; +g_assert (kernel_filename !=NULL ); +/* * NB: Use low address not ELF entry point to ensure that the fw_dynamic * behaviour when loading an ELF matches the fw_payload, fw_jump and BBL @@ -209,6 +213,8 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, {ssize_t size; +g_assert (filename !=NULL ); +/* * We want to put the initrd far enough into RAM that when the * kernel is uncompressed it will not clobber the initrd. However -- 2.39.0
PATCH v5 5/11 hw/riscv/spike.c: load initrd right after riscv_load_kernel()
In reply to Daniel Henrique BarbozaThis will make the code more in line with what the other boards are doing. We'll also avoid an extra check to machine->kernel_filename since we already checked that before executing riscv_load_kernel().
--- hw/riscv/spike.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
hw/riscv/spike.c +15 -16
@@ -302,6 +302,10 @@ static void spike_board_init(MachineState *machine)g_free (firmware_name); } +/* Create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32bit (&s->soc[0 ]), htif_custom_base); +/* Load kernel */ if (machine->kernel_filename) { kernel_start_addr = riscv_calc_kernel_start_addr(&s->soc[0],
@@ -310,6 +314,17 @@ static void spike_board_init(MachineState *machine) kernel_entry =riscv_load_kernel (machine->kernel_filename, kernel_start_addr, htif_symbol_callback); + +if (machine->initrd_filename) { +hwaddr start; +hwaddr end =riscv_load_initrd (machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (machine->fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , + end); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
@@ -318,22 +333,6 @@ static void spike_board_init(MachineState *machine) kernel_entry =0 ; } -/* Create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, -riscv_is_32bit (&s->soc[0 ]), htif_custom_base); - -/* Load initrd */ -if (machine->kernel_filename && machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); - } -/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, machine->fdt);
Signature · 1 line
2.39.0
PATCH v5 6/11 hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd()
In reply to Daniel Henrique Barbozariscv_load_initrd() returns the initrd end addr while also writing a 'start' var to mark the addr start. These informations are being used just to write the initrd FDT node. Every existing caller of riscv_load_initrd() is writing the FDT in the same manner.
We can simplify things by writing the FDT inside riscv_load_initrd(), sparing callers from having to manage start/end addrs to write the FDT themselves.
An 'if (fdt)' check is already inserted at the end of the function because we'll end up using it later on with other boards that doesn´t have a FDT.
--- hw/riscv/boot.c | 18 ++++++++++++------ hw/riscv/microchip_pfsoc.c | 10 ++-------- hw/riscv/sifive_u.c | 10 ++-------- hw/riscv/spike.c | 10 ++-------- hw/riscv/virt.c | 10 ++-------- include/hw/riscv/boot.h | 4 ++-- 6 files changed, 22 insertions(+), 40 deletions(-)
hw/riscv/boot.c +12 -6
@@ -208,9 +208,10 @@ target_ulong riscv_load_kernel(const char *kernel_filename,exit (1 ); } -hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,hwaddr *start) +void riscv_load_initrd (const char *filename,uint64_t mem_size, +uint64_t kernel_entry,void *fdt) { +hwaddr start, end;ssize_t size;g_assert (filename !=NULL );
@@ -226,18 +227,23 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,* halfway into RAM, and for boards with 256MB of RAM or more we put * the initrd at 128MB. */ - *start = kernel_entry +MIN (mem_size /2 ,128 * MiB); + start = kernel_entry +MIN (mem_size /2 ,128 * MiB); - size =load_ramdisk (filename, *start, mem_size - *start); + size =load_ramdisk (filename, start, mem_size - start);if (size ==-1 ) { - size =load_image_targphys (filename, *start, mem_size - *start); + size =load_image_targphys (filename, start, mem_size - start);if (size ==-1 ) {error_report ("could not load ramdisk '%s'" , filename);exit (1 ); } } -return *start + size; +/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ +if (fdt) { + end = start + size; +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); + } }uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt)
hw/riscv/microchip_pfsoc.c +2 -8
@@ -633,14 +633,8 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-end" , end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {
hw/riscv/sifive_u.c +2 -8
@@ -608,14 +608,8 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/*
hw/riscv/spike.c +2 -8
@@ -316,14 +316,8 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/*
hw/riscv/virt.c +2 -8
@@ -1291,14 +1291,8 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/*
include/hw/riscv/boot.h +2 -2
@@ -46,8 +46,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename,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); +void riscv_load_initrd (const char *filename,uint64_t mem_size, +uint64_t kernel_entry,void *fdt);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr,
Signature · 1 line
2.39.0
Re: [PATCH v5 06/11] hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd()
Quoted 10 lines · Daniel Henrique Barboza
riscv_load_initrd()returns the initrd end addr while also writing a 'start' var to mark the addr start. These informations are being used just to write the initrd FDT node. Every existing caller ofriscv_load_initrd()is writing the FDT in the same manner.We can simplify things by writing the FDT inside
riscv_load_initrd(), sparing callers from having to manage start/end addrs to write the FDT themselves.
Quoted 8 lines
An 'if (fdt)' check is already inserted at the end of the function because we'll end up using it later on with other boards that doesn´t have a FDT.
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Bin Meng <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 157 lines
--- hw/riscv/boot.c | 18 ++++++++++++------ hw/riscv/microchip_pfsoc.c | 10 ++-------- hw/riscv/sifive_u.c | 10 ++-------- hw/riscv/spike.c | 10 ++-------- hw/riscv/virt.c | 10 ++-------- include/hw/riscv/boot.h | 4 ++-- 6 files changed, 22 insertions(+), 40 deletions(-)hw/riscv/boot.c +12
-6@@ -208,9 +208,10 @@ target_ulong riscv_load_kernel(const char *kernel_filename,exit (1 ); } -hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,hwaddr *start) +void riscv_load_initrd (const char *filename,uint64_t mem_size, +uint64_t kernel_entry,void *fdt) { +hwaddr start, end;ssize_t size;g_assert (filename !=NULL );@@ -226,18 +227,23 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,* halfway into RAM, and for boards with 256MB of RAM or more we put * the initrd at 128MB. */ - *start = kernel_entry +MIN (mem_size /2 ,128 * MiB); + start = kernel_entry +MIN (mem_size /2 ,128 * MiB); - size =load_ramdisk (filename, *start, mem_size - *start); + size =load_ramdisk (filename, start, mem_size - start);if (size ==-1 ) { - size =load_image_targphys (filename, *start, mem_size - *start); + size =load_image_targphys (filename, start, mem_size - start);if (size ==-1 ) {error_report ("could not load ramdisk '%s'" , filename);exit (1 ); } } -return *start + size; +/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ +if (fdt) { + end = start + size; +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); + } }uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt)hw/riscv/microchip_pfsoc.c +2
-8@@ -633,14 +633,8 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-end" , end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {hw/riscv/sifive_u.c +2
-8@@ -608,14 +608,8 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/* hw/riscv/spike.c +2
-8@@ -316,14 +316,8 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/* hw/riscv/virt.c +2
-8@@ -1291,14 +1291,8 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr, NULL);if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (machine->fdt,"/chosen" ,"linux,initrd-end" , - end); +riscv_load_initrd (machine->initrd_filename, machine->ram_size, + kernel_entry, machine->fdt); } }else {/* include/hw/riscv/boot.h +2
-3@@ -46,8 +46,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename,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); +void riscv_load_initrd (const char *filename,uint64_t mem_size, +uint64_t kernel_entry,void *fdt);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr, --2.39.0
PATCH v5 7/11 hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel()
In reply to Daniel Henrique BarbozaThe sifive_u, spike and virt machines are writing the 'bootargs' FDT node during their respective create_fdt().
Given that bootargs is written only when '-append' is used, and this option is only allowed with the '-kernel' option, which in turn is already being check before executing riscv_load_kernel(), write 'bootargs' in the same code path as riscv_load_kernel().
--- hw/riscv/sifive_u.c | 11 +++++------ hw/riscv/spike.c | 9 +++++---- hw/riscv/virt.c | 11 +++++------ 3 files changed, 15 insertions(+), 16 deletions(-)
hw/riscv/sifive_u.c +5 -6
@@ -117,7 +117,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,error_report ("load_device_tree() failed" );exit (1 ); } - goto update_bootargs; }else { fdt = ms->fdt =create_device_tree (&fdt_size);if (!fdt) {
@@ -510,11 +509,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt,"/aliases" ,"serial0" , nodename);g_free (nodename); - -update_bootargs: -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); - } }static void sifive_u_machine_reset (void *opaque,int n,int level)
@@ -611,6 +605,11 @@ static void sifive_u_machine_init(MachineState *machine)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
hw/riscv/spike.c +5 -4
@@ -179,10 +179,6 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); - -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); - } }static bool spike_test_elf_image (char *filename)
@@ -319,6 +315,11 @@ static void spike_board_init(MachineState *machine)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
hw/riscv/virt.c +5 -6
@@ -1012,7 +1012,6 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,error_report ("load_device_tree() failed" );exit (1 ); } - goto update_bootargs; }else { mc->fdt =create_device_tree (&s->fdt_size);if (!mc->fdt) {
@@ -1050,11 +1049,6 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,create_fdt_fw_cfg (s, memmap);create_fdt_pmu (s); -update_bootargs: -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (mc->fdt,"/chosen" ,"bootargs" , cmdline); - } -/* Pass seed to RNG */ qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed));qemu_fdt_setprop (mc->fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed));
@@ -1294,6 +1288,11 @@ static void virt_machine_done(Notifier *notifier, void *data)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
Signature · 1 line
2.39.0
Re: [PATCH v5 07/11] hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel()
Quoted 9 lines · Daniel Henrique Barboza
The
sifive_u, spike and virt machines are writing the 'bootargs' FDT node during their respectivecreate_fdt().Given that bootargs is written only when '-append' is used, and this option is only allowed with the '-kernel' option, which in turn is already being check before executing
riscv_load_kernel(), write 'bootargs' in the same code path asriscv_load_kernel().
Quoted 4 lines
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Bin Meng <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 109 lines
--- hw/riscv/sifive_u.c | 11 +++++------ hw/riscv/spike.c | 9 +++++---- hw/riscv/virt.c | 11 +++++------ 3 files changed, 15 insertions(+), 16 deletions(-)hw/riscv/sifive_u.c +5
-6@@ -117,7 +117,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,error_report ("load_device_tree() failed" );exit (1 ); } - goto update_bootargs; }else { fdt = ms->fdt =create_device_tree (&fdt_size);if (!fdt) {@@ -510,11 +509,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt,"/aliases" ,"serial0" , nodename);g_free (nodename); - -update_bootargs: -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); - } }static void sifive_u_machine_reset (void *opaque,int n,int level)@@ -611,6 +605,11 @@ static void sifive_u_machine_init(MachineState *machine)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode hw/riscv/spike.c +5
-4@@ -179,10 +179,6 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); - -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); - } }static bool spike_test_elf_image (char *filename)@@ -319,6 +315,11 @@ static void spike_board_init(MachineState *machine)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode hw/riscv/virt.c +5
-7@@ -1012,7 +1012,6 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,error_report ("load_device_tree() failed" );exit (1 ); } - goto update_bootargs; }else { mc->fdt =create_device_tree (&s->fdt_size);if (!mc->fdt) {@@ -1050,11 +1049,6 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,create_fdt_fw_cfg (s, memmap);create_fdt_pmu (s); -update_bootargs: -if (cmdline && *cmdline) { -qemu_fdt_setprop_string (mc->fdt,"/chosen" ,"bootargs" , cmdline); - } -/* Pass seed to RNG */ qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed));qemu_fdt_setprop (mc->fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed));@@ -1294,6 +1288,11 @@ static void virt_machine_done(Notifier *notifier, void *data)riscv_load_initrd (machine->initrd_filename, machine->ram_size, kernel_entry, machine->fdt); } + +if (machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode -- 2.39.0
PATCH v5 8/11 hw/riscv/boot.c: use MachineState in riscv_load_initrd()
In reply to Daniel Henrique Barboza'filename', 'mem_size' and 'fdt' from riscv_load_initrd() can all be retrieved by the MachineState object for all callers.
--- hw/riscv/boot.c | 6 ++++-- hw/riscv/microchip_pfsoc.c | 3 +-- hw/riscv/sifive_u.c | 3 +-- hw/riscv/spike.c | 3 +-- hw/riscv/virt.c | 3 +-- include/hw/riscv/boot.h | 3 +-- 6 files changed, 9 insertions(+), 12 deletions(-)
hw/riscv/boot.c +4 -2
@@ -208,9 +208,11 @@ target_ulong riscv_load_kernel(const char *kernel_filename,exit (1 ); } -void riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,void *fdt) +void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) { +const char *filename = machine->initrd_filename; +uint64_t mem_size = machine->ram_size; +void *fdt = machine->fdt;hwaddr start, end;ssize_t size;
hw/riscv/microchip_pfsoc.c +1 -2
@@ -633,8 +633,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {
hw/riscv/sifive_u.c +1 -2
@@ -602,8 +602,7 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {
hw/riscv/spike.c +1 -2
@@ -312,8 +312,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {
hw/riscv/virt.c +1 -2
@@ -1285,8 +1285,7 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {
include/hw/riscv/boot.h +1 -2
@@ -46,8 +46,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (const char *kernel_filename,target_ulong firmware_end_addr,symbol_fn_t sym_cb); -void riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,void *fdt); +void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr,
Signature · 1 line
2.39.0
Re: [PATCH v5 08/11] hw/riscv/boot.c: use MachineState in riscv_load_initrd()
Quoted 8 lines · Daniel Henrique Barboza
'filename', '
mem_size' and 'fdt' fromriscv_load_initrd()can all be retrieved by the MachineState object for all callers.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Bin Meng <[email protected]>
Alistair
Quoted 101 lines
--- hw/riscv/boot.c | 6 ++++-- hw/riscv/microchip_pfsoc.c | 3 +-- hw/riscv/sifive_u.c | 3 +-- hw/riscv/spike.c | 3 +-- hw/riscv/virt.c | 3 +-- include/hw/riscv/boot.h | 3 +-- 6 files changed, 9 insertions(+), 12 deletions(-)hw/riscv/boot.c +4
-2@@ -208,9 +208,11 @@ target_ulong riscv_load_kernel(const char *kernel_filename,exit (1 ); } -void riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,void *fdt) +void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) { +const char *filename = machine->initrd_filename; +uint64_t mem_size = machine->ram_size; +void *fdt = machine->fdt;hwaddr start, end;ssize_t size;hw/riscv/microchip_pfsoc.c +1
-2@@ -633,8 +633,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {hw/riscv/sifive_u.c +1
-2@@ -602,8 +602,7 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {hw/riscv/spike.c +1
-2@@ -312,8 +312,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {hw/riscv/virt.c +1
-2@@ -1285,8 +1285,7 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr, NULL);if (machine->initrd_filename) { -riscv_load_initrd (machine->initrd_filename, machine->ram_size, - kernel_entry, machine->fdt); +riscv_load_initrd (machine, kernel_entry); }if (machine->kernel_cmdline && *machine->kernel_cmdline) {include/hw/riscv/boot.h +1
-3@@ -46,8 +46,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (const char *kernel_filename,target_ulong firmware_end_addr,symbol_fn_t sym_cb); -void riscv_load_initrd (const char *filename,uint64_t mem_size, -uint64_t kernel_entry,void *fdt); +void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr, --2.39.0
PATCH v5 9/11 hw/riscv/boot.c: use MachineState in riscv_load_kernel()
In reply to Daniel Henrique BarbozaAll callers are using kernel_filename as machine->kernel_filename.
This will also simplify the changes in riscv_load_kernel() that we're going to do next.
--- hw/riscv/boot.c | 3 ++- hw/riscv/microchip_pfsoc.c | 3 +-- hw/riscv/opentitan.c | 3 +-- hw/riscv/sifive_e.c | 3 +-- hw/riscv/sifive_u.c | 3 +-- hw/riscv/spike.c | 3 +-- hw/riscv/virt.c | 3 +-- include/hw/riscv/boot.h | 2 +- 8 files changed, 9 insertions(+), 14 deletions(-)
hw/riscv/boot.c +2 -1
@@ -173,10 +173,11 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr,symbol_fn_t sym_cb) { +const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry;g_assert (kernel_filename !=NULL );
hw/riscv/microchip_pfsoc.c +1 -2
@@ -629,8 +629,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);
hw/riscv/opentitan.c +1 -2
@@ -101,8 +101,7 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename, - memmap[IBEX_DEV_RAM ].base,NULL ); +riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base,NULL ); } }
hw/riscv/sifive_e.c +1 -2
@@ -114,8 +114,7 @@ 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, - memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); +riscv_load_kernel (machine, memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }
hw/riscv/sifive_u.c +1 -2
@@ -598,8 +598,7 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);
hw/riscv/spike.c +1 -2
@@ -307,8 +307,7 @@ static void spike_board_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr, + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {
hw/riscv/virt.c +1 -2
@@ -1281,8 +1281,7 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);
include/hw/riscv/boot.h +1 -1
@@ -43,7 +43,7 @@ char *riscv_find_firmware(const char *firmware_filename,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 riscv_load_kernel (MachineState *machine,target_ulong firmware_end_addr,symbol_fn_t sym_cb);void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);
Signature · 1 line
2.39.0
Re: [PATCH v5 09/11] hw/riscv/boot.c: use MachineState in riscv_load_kernel()
Quoted 10 lines · Daniel Henrique Barboza
All callers are using
kernel_filenameasmachine->kernel_filename.This will also simplify the changes in
riscv_load_kernel()that we're going to do next.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Bin Meng <[email protected]>
Alistair
Quoted 129 lines
--- hw/riscv/boot.c | 3 ++- hw/riscv/microchip_pfsoc.c | 3 +-- hw/riscv/opentitan.c | 3 +-- hw/riscv/sifive_e.c | 3 +-- hw/riscv/sifive_u.c | 3 +-- hw/riscv/spike.c | 3 +-- hw/riscv/virt.c | 3 +-- include/hw/riscv/boot.h | 2 +- 8 files changed, 9 insertions(+), 14 deletions(-)hw/riscv/boot.c +2
-1@@ -173,10 +173,11 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (const char *kernel_filename, +target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr,symbol_fn_t sym_cb) { +const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry;g_assert (kernel_filename !=NULL );hw/riscv/microchip_pfsoc.c +1
-2@@ -629,8 +629,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);hw/riscv/opentitan.c +1
-2@@ -101,8 +101,7 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename, - memmap[IBEX_DEV_RAM ].base,NULL ); +riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base,NULL ); } }hw/riscv/sifive_e.c +1
-2@@ -114,8 +114,7 @@ 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, - memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); +riscv_load_kernel (machine, memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); } }hw/riscv/sifive_u.c +1
-2@@ -598,8 +598,7 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);hw/riscv/spike.c +1
-2@@ -307,8 +307,7 @@ static void spike_board_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr, + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, htif_symbol_callback);if (machine->initrd_filename) {hw/riscv/virt.c +1
-2@@ -1281,8 +1281,7 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine->kernel_filename, - kernel_start_addr,NULL ); + kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL );if (machine->initrd_filename) {riscv_load_initrd (machine, kernel_entry);include/hw/riscv/boot.h +1
-2@@ -43,7 +43,7 @@ char *riscv_find_firmware(const char *firmware_filename,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 riscv_load_kernel (MachineState *machine,target_ulong firmware_end_addr,symbol_fn_t sym_cb);void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry); --2.39.0
PATCH v5 10/11 hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
In reply to Daniel Henrique BarbozaThe microchip_icicle_kit, sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:
- execute load_kernel()
- load init_rd()
- write kernel_cmdline
Let's fold everything inside riscv_load_kernel() to avoid code repetition. To not change the behavior of boards that aren't calling riscv_load_init(), add an 'load_initrd' flag to riscv_load_kernel() and allow these boards to opt out from initrd loading.
--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)
hw/riscv/boot.c +19 -3
@@ -175,10 +175,12 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr, +bool load_initrd,symbol_fn_t sym_cb) {const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry; +void *fdt = machine->fdt;g_assert (kernel_filename !=NULL );
@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base; + goto out; }if (load_uimage_as (kernel_filename, &kernel_entry,NULL ,NULL ,NULL ,NULL ,NULL ) >0 ) { -return kernel_entry; + goto out; }if (load_image_targphys_as (kernel_filename, kernel_start_addr, current_machine->ram_size,NULL ) >0 ) { -return kernel_start_addr; + kernel_entry = kernel_start_addr; + goto out; }error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); + +out: +if (load_initrd && machine->initrd_filename) { +riscv_load_initrd (machine, kernel_entry); + } + +if (fdt && machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } + +return kernel_entry; }void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry)
hw/riscv/microchip_pfsoc.c +2 -10
@@ -629,16 +629,8 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" , -"bootargs" , machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL );/* Compute the fdt load address in dram */ fdt_load_addr = riscv_load_fdt(memmap[MICROCHIP_PFSOC_DRAM_LO].base,
hw/riscv/opentitan.c +1 -1
@@ -101,7 +101,7 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base,NULL ); +riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base, false,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, memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); +riscv_load_kernel (machine, memmap[SIFIVE_E_DEV_DTIM ].base, + false,NULL ); } }
hw/riscv/sifive_u.c +2 -10
@@ -598,16 +598,8 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
hw/riscv/spike.c +1 -10
@@ -308,16 +308,7 @@ static void spike_board_init(MachineState *machine) firmware_end_addr); kernel_entry =riscv_load_kernel (machine, kernel_start_addr, - htif_symbol_callback); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + true, htif_symbol_callback); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
hw/riscv/virt.c +2 -10
@@ -1281,16 +1281,8 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
include/hw/riscv/boot.h +1 -0
@@ -45,6 +45,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (MachineState *machine,target_ulong firmware_end_addr, +bool load_initrd,symbol_fn_t sym_cb);void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt);
Signature · 1 line
2.39.0
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 11 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and
typo: should be riscv_load_initrd()
Quoted 4 lines
allow these boards to opt out from initrd loading.
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Quoted 11 lines
--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)
Otherwise,
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 29 lines · Bin Meng
Quoted 10 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()andtypo: should be
riscv_load_initrd()Quoted 4 lines
allow these boards to opt out from initrd loading.
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>Quoted 11 lines
--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)
Quoted 2 lines
Otherwise,
Reviewed-by Bin Meng <[email protected]>
Thanks!
Alistair, let me know if you want me to send another version with the commit message typo fixed. I might as well take the change to rebase it with riscv-to-apply.next.
Daniel
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 32 lines · Daniel Henrique Barboza
Quoted 29 lines · Bin Meng
Quoted 10 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()andtypo: should be
riscv_load_initrd()Quoted 15 lines
allow these boards to opt out from initrd loading.
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>---
hw/riscv/boot.c | 22 +++++++++++++++++++---hw/riscv/microchip_pfsoc.c| 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 +8 files changed, 30 insertions(+), 45 deletions(-)
Quoted 8 lines
Quoted 2 lines
Otherwise,
Reviewed-by Bin Meng <[email protected]>Thanks!
Alistair, let me know if you want me to send another version with the commit message typo fixed. I might as well take the change to rebase it with riscv-to-apply.next.
While rebasing these patches on top of riscv-to-apply.next, the avocado tests I've introduced here started to fail both sifive_u tests:
tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_sifive_u: INTERRUPTED:
Test interrupted by SIGTERM\nRunner error occurred: ... (5.07 s)
(09/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_sifive_u: INTERRUPTED:
Test interrupted by SIGTERM\nRunner error occurred: ... (5.05 s)
I proposed a fix here:
https://lists.gnu.org/archive/html/qemu-devel/2023-01/msg02035.html
I can re-send this series after we get that problem figure out. Otherwise we're going to add 2 avocado tests that are failing right from the start hehe.
Thanks,
Daniel
Quoted 4 lines
Daniel
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 54 lines · Daniel Henrique Barboza
Quoted 32 lines · Daniel Henrique Barboza
Quoted 29 lines · Bin Meng
Quoted 10 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()andtypo: should be
riscv_load_initrd()Quoted 15 lines
allow these boards to opt out from initrd loading.
Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)Quoted 8 lines
Quoted 2 lines
Otherwise,
Reviewed-by Bin Meng <[email protected]>Thanks!
Alistair, let me know if you want me to send another version with the commit message typo fixed. I might as well take the change to rebase it with riscv-to-apply.next.
While rebasing these patches on top of riscv-to-apply.next, the avocado tests I've introduced here started to fail both
sifive_utests:tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_sifive_u: INTERRUPTED:
Test interrupted by SIGTERM\nRunner error occurred: ... (5.07 s)
(09/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_sifive_u: INTERRUPTED:
Test interrupted by SIGTERM\nRunner error occurred: ... (5.05 s)
Quoted 3 lines
I proposed a fix here:
https://lists.gnu.org/archive/html/qemu-devel/2023-01/msg02035.html
Thanks!
I generally push riscv-to-apply.next before running tests, so it's possible to break. I'm seeing similar failures.
Generally when I see failures from a series I just drop the series, but if you have a fix that's even better :)
Alistair
Quoted 15 lines
I can re-send this series after we get that problem figure out. Otherwise we're going to add 2 avocado tests that are failing right from the start hehe.
Thanks,
Daniel
Quoted 4 lines
Daniel
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
In reply to Daniel Henrique BarbozaQuoted 8 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdline
Quoted 7 lines
Let's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 201 lines
--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c +19
-3@@ -175,10 +175,12 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr, +bool load_initrd,symbol_fn_t sym_cb) {const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry; +void *fdt = machine->fdt;g_assert (kernel_filename !=NULL );@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base; + goto out; }if (load_uimage_as (kernel_filename, &kernel_entry,NULL ,NULL ,NULL ,NULL ,NULL ) >0 ) { -return kernel_entry; + goto out; }if (load_image_targphys_as (kernel_filename, kernel_start_addr, current_machine->ram_size,NULL ) >0 ) { -return kernel_start_addr; + kernel_entry = kernel_start_addr; + goto out; }error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); + +out: +if (load_initrd && machine->initrd_filename) { +riscv_load_initrd (machine, kernel_entry); + } + +if (fdt && machine->kernel_cmdline && *machine->kernel_cmdline) { +qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , + machine->kernel_cmdline); + } + +return kernel_entry; }void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry)hw/riscv/microchip_pfsoc.c +2
-10@@ -629,16 +629,8 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" , -"bootargs" , machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL );/* Compute the fdt load address in dram */ fdt_load_addr = riscv_load_fdt(memmap[MICROCHIP_PFSOC_DRAM_LO].base,hw/riscv/opentitan.c +1
-1@@ -101,7 +101,7 @@ static void opentitan_board_init(MachineState *machine) }if (machine->kernel_filename) { -riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base,NULL ); +riscv_load_kernel (machine, memmap[IBEX_DEV_RAM ].base, false,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, memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); +riscv_load_kernel (machine, memmap[SIFIVE_E_DEV_DTIM ].base, + false,NULL ); } }hw/riscv/sifive_u.c +2
-10@@ -598,16 +598,8 @@ static void sifive_u_machine_init(MachineState *machine) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc.u_cpus, firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode hw/riscv/spike.c +1
-10@@ -308,16 +308,7 @@ static void spike_board_init(MachineState *machine) firmware_end_addr); kernel_entry =riscv_load_kernel (machine, kernel_start_addr, - htif_symbol_callback); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + true, htif_symbol_callback); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode hw/riscv/virt.c +2
-10@@ -1281,16 +1281,8 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr); - kernel_entry =riscv_load_kernel (machine, kernel_start_addr,NULL ); - -if (machine->initrd_filename) { -riscv_load_initrd (machine, kernel_entry); - } - -if (machine->kernel_cmdline && *machine->kernel_cmdline) { -qemu_fdt_setprop_string (machine->fdt,"/chosen" ,"bootargs" , - machine->kernel_cmdline); - } + kernel_entry =riscv_load_kernel (machine, kernel_start_addr, + true,NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode include/hw/riscv/boot.h +1
-1@@ -45,6 +45,7 @@ target_ulong riscv_load_firmware(const char *firmware_filename, symbol_fn_t sym_cb);target_ulong riscv_load_kernel (MachineState *machine,target_ulong firmware_end_addr, +bool load_initrd,symbol_fn_t sym_cb);void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); --2.39.0
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
In reply to Daniel Henrique BarbozaQuoted 44 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c +2
-0@@ -175,10 +175,12 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr, +bool load_initrd,symbol_fn_t sym_cb) {const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry; +void *fdt = machine->fdt;g_assert (kernel_filename !=NULL );
hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;
This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of 0xffffffff80000000.
Previously the top bits would be lost as we return a target_ulong from this function, but with this change we pass the value 0xffffffff80000000 to riscv_load_initrd() which causes failures.
This diff fixes the failure for me
hw/riscv/boot.c +1 -1
@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
I'm going to drop this patch, do you mind looking into a proper fix?
Alistair
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 73 lines · Alistair Francis
Quoted 43 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c +2
-0@@ -175,10 +175,12 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr, +bool load_initrd,symbol_fn_t sym_cb) {const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry; +void *fdt = machine->fdt;g_assert (kernel_filename !=NULL );hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
Quoted 4 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
I'm going to drop this patch, do you mind looking into a proper fix?
Thanks for looking this up!
I 'll fix it and resend patches 10 and 11.
Daniel
Quoted 2 lines
Alistair
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
In reply to Alistair FrancisHi Alistair,
Quoted 46 lines · Alistair Francis
Quoted 43 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c +2
-0@@ -175,10 +175,12 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel (MachineState *machine,target_ulong kernel_start_addr, +bool load_initrd,symbol_fn_t sym_cb) {const char *kernel_filename = machine->kernel_filename;uint64_t kernel_load_base, kernel_entry; +void *fdt = machine->fdt;g_assert (kernel_filename !=NULL );
Quoted 9 lines
hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 6 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.
Shouldn't the bug be the 32-bit Xvisor image? How can a 32-bit image return an address of 0xffffffff80000000?
Quoted 21 lines
Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
Quoted 5 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
I'm going to drop this patch, do you mind looking into a proper fix?
Regards,
Bin
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
In reply to Alistair FrancisQuoted 58 lines · Alistair Francis
Quoted 27 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
Quoted 2 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
Ah, that is what should be done in load_elf_ram_sym()'s missing translate_fn() handler.
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 59 lines · Philippe Mathieu-Daudé
Quoted 58 lines · Alistair Francis
Quoted 27 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>---
hw/riscv/boot.c | 22 +++++++++++++++++++---hw/riscv/microchip_pfsoc.c| 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 +8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine, if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NULL, &kernel_load_base, NULL, NULL, 0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { - return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine, if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NULL, &kernel_load_base, NULL, NULL, 0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong) kernel_load_base; goto out; }
Quoted 5 lines
Quoted 2 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
Ah, that is what should be done in load_elf_ram_sym()'s missing
translate_fn()handler.
Interesting. I'll try it again and re-send.
Daniel
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 63 lines · Daniel Henrique Barboza
Quoted 59 lines · Philippe Mathieu-Daudé
Quoted 58 lines · Alistair Francis
Quoted 27 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
Ah, that is what should be done in load_elf_ram_sym()'s missing
translate_fn()handler.Interesting. I'll try it again and re-send.
If that fixes the problem, it should be a separate patch.
I still don't understand why 32-bit xvisor image has a 64-bit address encoded?
Regards,
Bin
Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()
Quoted 61 lines · Bin Meng
Quoted 59 lines · Daniel Henrique Barboza
Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 55 lines · Alistair Francis
Quoted 25 lines · Daniel Henrique Barboza
The
microchip_icicle_kit,sifive_u, spike and virt boards are now doing the same steps when '-kernel' is used:- execute
load_kernel()
- loadinit_rd()
- writekernel_cmdlineLet's fold everything inside
riscv_load_kernel()to avoid code repetition. To not change the behavior of boards that aren't callingriscv_load_init(), add an 'load_initrd' flag toriscv_load_kernel()and allow these boards to opt out from initrd loading.Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 22 +++++++++++++++++++--- hw/riscv/microchip_pfsoc.c | 12 ++---------- hw/riscv/opentitan.c | 2 +- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 12 ++---------- hw/riscv/spike.c | 11 +---------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 1 + 8 files changed, 30 insertions(+), 45 deletions(-)hw/riscv/boot.c target_ulong riscv_load_kernel(MachineState *machine, · line 197
Quoted 5 lines
hw/riscv/boot.c +1
-1@@ -192,21 +194,35 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { -return kernel_load_base; + kernel_entry = kernel_load_base;This breaks 32-bit Xvisor loading. It seems that for the 32-bit guest we get a value of
0xffffffff80000000.Previously the top bits would be lost as we return a
target_ulongfrom this function, but with this change we pass the value0xffffffff80000000toriscv_load_initrd()which causes failures.This diff fixes the failure for me
hw/riscv/boot.c +1
-1@@ -194,7 +194,7 @@ target_ulong riscv_load_kernel(MachineState *machine,if (load_elf_ram_sym (kernel_filename,NULL ,NULL ,NULL ,NULL , &kernel_load_base,NULL ,NULL ,0 ,EM_RISCV ,1 ,0 ,NULL , true, sym_cb) >0 ) { - kernel_entry = kernel_load_base; + kernel_entry = (target_ulong ) kernel_load_base; goto out; }
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
but I don't think that's the right fix. We should instead look at the CPU XLEN and drop the high bits if required.
Ah, that is what should be done in load_elf_ram_sym()'s missing
translate_fn()handler.Interesting. I'll try it again and re-send.
If that fixes the problem, it should be a separate patch.
Fair enough. I'll keep this patch as is and fix it in a separated patch.
Daniel
Quoted 5 lines
I still don't understand why 32-bit xvisor image has a 64-bit address encoded?
Regards,
Bin
PATCH v5 11/11 hw/riscv/boot.c: make riscv_load_initrd() static
In reply to Daniel Henrique BarbozaThe only remaining caller is riscv_load_kernel_and_initrd() which belongs to the same file.
--- hw/riscv/boot.c | 80 ++++++++++++++++++++--------------------- include/hw/riscv/boot.h | 1 - 2 files changed, 40 insertions(+), 41 deletions(-)
hw/riscv/boot.c +40 -40
@@ -173,6 +173,46 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } +static void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) +{ +const char *filename = machine->initrd_filename; +uint64_t mem_size = machine->ram_size; +void *fdt = machine->fdt; +hwaddr start, end; +ssize_t size; + +g_assert (filename !=NULL ); + +/* +* We want to put the initrd far enough into RAM that when the +* kernel is uncompressed it will not clobber the initrd. However +* on boards without much RAM we must ensure that we still leave +* enough room for a decent sized initrd, and on boards with large +* amounts of RAM we must avoid the initrd being so far up in RAM +* that it is outside lowmem and inaccessible to the kernel. +* So for boards with less than 256MB of RAM we put the initrd +* halfway into RAM, and for boards with 256MB of RAM or more we put +* the initrd at 128MB. +*/ + start = kernel_entry +MIN (mem_size /2 ,128 * MiB); + + size =load_ramdisk (filename, start, mem_size - start); +if (size ==-1 ) { + size =load_image_targphys (filename, start, mem_size - start); +if (size ==-1 ) { +error_report ("could not load ramdisk '%s'" , filename); +exit (1 ); + } + } + +/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ +if (fdt) { + end = start + size; +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); + } +} + target_ulong riscv_load_kernel(MachineState *machine, target_ulong kernel_start_addr, bool load_initrd,
@@ -225,46 +265,6 @@ out:return kernel_entry; } -void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) -{ -const char *filename = machine->initrd_filename; -uint64_t mem_size = machine->ram_size; -void *fdt = machine->fdt; -hwaddr start, end; -ssize_t size; - -g_assert (filename !=NULL ); - -/* -* We want to put the initrd far enough into RAM that when the -* kernel is uncompressed it will not clobber the initrd. However -* on boards without much RAM we must ensure that we still leave -* enough room for a decent sized initrd, and on boards with large -* amounts of RAM we must avoid the initrd being so far up in RAM -* that it is outside lowmem and inaccessible to the kernel. -* So for boards with less than 256MB of RAM we put the initrd -* halfway into RAM, and for boards with 256MB of RAM or more we put -* the initrd at 128MB. -*/ - start = kernel_entry +MIN (mem_size /2 ,128 * MiB); - - size =load_ramdisk (filename, start, mem_size - start); -if (size ==-1 ) { - size =load_image_targphys (filename, start, mem_size - start); -if (size ==-1 ) { -error_report ("could not load ramdisk '%s'" , filename); -exit (1 ); - } - } - -/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ -if (fdt) { - end = start + size; -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); - } -} -uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) {uint64_t temp, fdt_addr;
include/hw/riscv/boot.h +0 -1
@@ -47,7 +47,6 @@ target_ulong riscv_load_kernel(MachineState *machine,target_ulong firmware_end_addr, bool load_initrd, symbol_fn_t sym_cb); -void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr,
Signature · 1 line
2.39.0
Re: [PATCH v5 11/11] hw/riscv/boot.c: make riscv_load_initrd() static
Quoted 7 lines · Daniel Henrique Barboza
The only remaining caller is
riscv_load_kernel_and_initrd()which belongs to the same file.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Bin Meng <[email protected]>
Alistair
Quoted 119 lines
--- hw/riscv/boot.c | 80 ++++++++++++++++++++--------------------- include/hw/riscv/boot.h | 1 - 2 files changed, 40 insertions(+), 41 deletions(-)hw/riscv/boot.c +40
-40@@ -173,6 +173,46 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } +static void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) +{ +const char *filename = machine->initrd_filename; +uint64_t mem_size = machine->ram_size; +void *fdt = machine->fdt; +hwaddr start, end; +ssize_t size; + +g_assert (filename !=NULL ); + +/* +* We want to put the initrd far enough into RAM that when the +* kernel is uncompressed it will not clobber the initrd. However +* on boards without much RAM we must ensure that we still leave +* enough room for a decent sized initrd, and on boards with large +* amounts of RAM we must avoid the initrd being so far up in RAM +* that it is outside lowmem and inaccessible to the kernel. +* So for boards with less than 256MB of RAM we put the initrd +* halfway into RAM, and for boards with 256MB of RAM or more we put +* the initrd at 128MB. +*/ + start = kernel_entry +MIN (mem_size /2 ,128 * MiB); + + size =load_ramdisk (filename, start, mem_size - start); +if (size ==-1 ) { + size =load_image_targphys (filename, start, mem_size - start); +if (size ==-1 ) { +error_report ("could not load ramdisk '%s'" , filename); +exit (1 ); + } + } + +/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ +if (fdt) { + end = start + size; +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); + } +} + target_ulong riscv_load_kernel(MachineState *machine, target_ulong kernel_start_addr, bool load_initrd,@@ -225,46 +265,6 @@ out:return kernel_entry; } -void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry) -{ -const char *filename = machine->initrd_filename; -uint64_t mem_size = machine->ram_size; -void *fdt = machine->fdt; -hwaddr start, end; -ssize_t size; - -g_assert (filename !=NULL ); - -/* -* We want to put the initrd far enough into RAM that when the -* kernel is uncompressed it will not clobber the initrd. However -* on boards without much RAM we must ensure that we still leave -* enough room for a decent sized initrd, and on boards with large -* amounts of RAM we must avoid the initrd being so far up in RAM -* that it is outside lowmem and inaccessible to the kernel. -* So for boards with less than 256MB of RAM we put the initrd -* halfway into RAM, and for boards with 256MB of RAM or more we put -* the initrd at 128MB. -*/ - start = kernel_entry +MIN (mem_size /2 ,128 * MiB); - - size =load_ramdisk (filename, start, mem_size - start); -if (size ==-1 ) { - size =load_image_targphys (filename, start, mem_size - start); -if (size ==-1 ) { -error_report ("could not load ramdisk '%s'" , filename); -exit (1 ); - } - } - -/* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ -if (fdt) { - end = start + size; -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , start); -qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , end); - } -} -uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) {uint64_t temp, fdt_addr;include/hw/riscv/boot.h +0
-2@@ -47,7 +47,6 @@ target_ulong riscv_load_kernel(MachineState *machine,target_ulong firmware_end_addr, bool load_initrd, symbol_fn_t sym_cb); -void riscv_load_initrd (MachineState *machine,uint64_t kernel_entry);uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts, hwaddr saddr, --2.39.0
Alistair Francis
AppliedQuoted 56 lines · Daniel Henrique Barboza
Hi,
This new version is still rebased on top of [1]:
"[PATCH v2 00/12] hw/riscv: Improve Spike HTIF emulation fidelity"
from Bin Meng.
The change from v4 is on patch 9 where we added an extra flag in
riscv_load_kernel()to allow for boards that don't load initrd (e.g. opentitan andsifive_e) to opt out from loading it altogether.* Patch without reviews: 9
Changes from v4:
- patch 9:
- added a 'load_init' flag inriscv_load_kernel()to control whether the function should executeriscv_load_initrd()or not
v4 link: https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg04652.htmlChanges from v3:
- patch 1:
- fixed more instances of 'opensbi' and 'Opensbi' to 'OpenSBI'
- changed tests order
- patch 4 (new):
- added ag_assert(filename)guard inriscv_load_initrd()andriscv_load_kernel()
v3 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg04491.htmlChanges from v2:
- patch 1:
- reduced code repetition with aboot_opensbi()helper
- renamed 'opensbi' to 'OpenSBI' in the file header
- patch 9:
- renamedriscv_load_kernel()toriscv_load_kernel_and_initrd()
v2 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg04466.htmlChanges from v1:
- patches were rebased with [1]
- patches 13-15: removed
* will be re-sent in a follow-up series
- patches 4-5: removed since they're picked by Bin in [1]
- patch 1:
- added a 'skip' riscv32 spike test
v1 link: https://mail.gnu.org/archive/html/qemu-devel/2022-12/msg03860.htmlBased-on: <[email protected]>
Cc Alistair Francis <[email protected]>Cc Bin Meng <[email protected]>[1] https://patchwork.ozlabs.org/project/qemu-devel/list/?series=334352
Quoted 12 lines
Daniel Henrique Barboza (11):
tests/avocado: add RISC-V OpenSBI boot test hw/riscv/spike: use 'fdt' from MachineState hw/riscv/sifive_u: use 'fdt' from MachineStatehw/riscv/boot.c: exit early if filename is NULL in load functionshw/riscv/spike.c: load initrd right afterriscv_load_kernel()hw/riscv: write initrd 'chosen' FDT insideriscv_load_initrd()hw/riscv: write bootargs 'chosen' FDT afterriscv_load_kernel()hw/riscv/boot.c: use MachineState inriscv_load_initrd()hw/riscv/boot.c: use MachineState inriscv_load_kernel()hw/riscv/boot.c: consolidate all kernel init inriscv_load_kernel()hw/riscv/boot.c: makeriscv_load_initrd()static
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 19 lines
hw/riscv/boot.c | 91 +++++++++++++++++++++++----------- hw/riscv/microchip_pfsoc.c | 20 +------- hw/riscv/opentitan.c | 3 +- hw/riscv/sifive_e.c | 4 +- hw/riscv/sifive_u.c | 32 +++--------- hw/riscv/spike.c | 37 ++++---------- hw/riscv/virt.c | 21 +------- include/hw/riscv/boot.h | 5 +- include/hw/riscv/sifive_u.h | 3 -- include/hw/riscv/spike.h | 2 - tests/avocado/riscv_opensbi.py | 65 ++++++++++++++++++++++++ 11 files changed, 150 insertions(+), 133 deletions(-) create mode 100644 tests/avocado/riscv_opensbi.py--
2.39.0