irscv: OpenSBI boot test and cleanups
Subsystems (2)
v3 cover irscv: OpenSBI boot test and cleanups
Hi,
This new version is still rebased on top of [1]:
"[PATCH 00/12] hw/riscv: Improve Spike HTIF emulation fidelity"
from Bin Meng. All the changes made were proposed by Phil in the v2 review.
* Patches without reviews: 1, 9
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=334159
Daniel Henrique Barboza (10):
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/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: introduce riscv_load_kernel_and_initrd() hw/riscv/boot.c: make riscv_load_initrd() static
hw/riscv/boot.c | 88 +++++++++++++++++++++------------- 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 | 38 ++++----------- hw/riscv/virt.c | 21 +------- include/hw/riscv/boot.h | 8 ++-- include/hw/riscv/sifive_u.h | 3 -- include/hw/riscv/spike.h | 2 - tests/avocado/riscv_opensbi.py | 65 +++++++++++++++++++++++++ 11 files changed, 147 insertions(+), 137 deletions(-) create mode 100644 tests/avocado/riscv_opensbi.py
Signature · 1 line
2.38.1
PATCH v3 1/10 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:
(11/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') + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:spike + """ + 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_riscv32_sifive_u(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi() + + @skip("requires OpenSBI fix to work") + def test_riscv32_spike(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:spike + """ + self.boot_opensbi()
Signature · 1 line
2.38.1
Re: [PATCH v3 01/10] tests/avocado: add RISC-V opensbi boot test
Quoted 10 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
nits: OpenSBI
Quoted 2 lines
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
ditto
Quoted 55 lines
QEMU rom receives the fix, we're adding a 'skip' test:
(11/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=334159Cc Cleber Rosa <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- 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 +33
-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') + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64
tests/avocado/riscv_opensbi.py line 43
Quoted 10 lines
tests/avocado/riscv_opensbi.py new file +10
-0+ :avocado: tags=machine:spike + """ + self.boot_opensbi() + + def test_riscv64_sifive_u(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi()
nits: could we keep both 64-bit and 32-bit machines in the same order? e.g.: virt, sifive_u, spike
Quoted 13 lines
tests/avocado/riscv_opensbi.py new file +13
-0+ + def test_riscv32_virt(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv32_sifive_u(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:sifive_u + """
tests/avocado/riscv_opensbi.py
Quoted 10 lines
tests/avocado/riscv_opensbi.py new file +9
-1+ self.boot_opensbi() + + @skip("requires OpenSBI fix to work") + def test_riscv32_spike(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:spike + """ + self.boot_opensbi() --
Otherwise,
Re: [PATCH v3 01/10] tests/avocado: add RISC-V opensbi boot test
Quoted 76 lines · Bin Meng
Quoted 9 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
nits: OpenSBI
Quoted 2 lines
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
ditto
Quoted 59 lines
QEMU rom receives the fix, we're adding a 'skip' test:
(11/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=334159Cc Cleber Rosa <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- 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 +37
-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') + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:spike + """ + self.boot_opensbi() +
Quoted 8 lines
tests/avocado/riscv_opensbi.py line 43
Quoted 6 lines
tests/avocado/riscv_opensbi.py new file +6
-0+ def test_riscv64_sifive_u(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi()nits: could we keep both 64-bit and 32-bit machines in the same order? e.g.: virt,
sifive_u, spike
I've changed the order to be first the default machine (spike), then the other machines in alphabetic order.
I've also put the 32 and 64 bit tests for the same machine one after the other:
(06/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_spike: SKIP: requires OpenSBI fix to work (07/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_spike: PASS (0.04 s) (08/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_sifive_u: PASS (0.07 s) (09/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_sifive_u: PASS (0.07 s) (10/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_virt: PASS (0.05 s) (11/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_virt: PASS (0.05 s)
If that's ok I'll send v4 tomorrow.
Daniel
Quoted 27 lines
Quoted 14 lines
tests/avocado/riscv_opensbi.py new file +13
-0+ + def test_riscv32_virt(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv32_sifive_u(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:sifive_u + """tests/avocado/riscv_opensbi.py
Quoted 10 lines
tests/avocado/riscv_opensbi.py new file +9
-1+ self.boot_opensbi() + + @skip("requires OpenSBI fix to work") + def test_riscv32_spike(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:spike + """ + self.boot_opensbi() --Otherwise,
Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
Re: [PATCH v3 01/10] tests/avocado: add RISC-V opensbi boot test
Hi Daniel,
Quoted 103 lines · Daniel Henrique Barboza
Quoted 76 lines · Bin Meng
Quoted 9 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
nits: OpenSBI
Quoted 2 lines
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
ditto
Quoted 59 lines
QEMU rom receives the fix, we're adding a 'skip' test:
(11/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=334159Cc Cleber Rosa <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- 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 +37
-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') + + def test_riscv64_virt(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + """ + self.boot_opensbi() + + def test_riscv64_spike(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:spike + """ + self.boot_opensbi() +Quoted 8 lines
tests/avocado/riscv_opensbi.py line 43
Quoted 6 lines
tests/avocado/riscv_opensbi.py new file +6
-0+ def test_riscv64_sifive_u(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:sifive_u + """ + self.boot_opensbi()nits: could we keep both 64-bit and 32-bit machines in the same order? e.g.: virt,
sifive_u, spikeI've changed the order to be first the default machine (spike), then the other machines in alphabetic order.
I've also put the 32 and 64 bit tests for the same machine one after the other:
(06/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_spike: SKIP: requires OpenSBI fix to work (07/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_spike: PASS (0.04 s) (08/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_sifive_u: PASS (0.07 s) (09/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_sifive_u: PASS (0.07 s) (10/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv32_virt: PASS (0.05 s) (11/18) tests/avocado/riscv_opensbi.py:RiscvOpenSBI.test_riscv64_virt: PASS (0.05 s)
Quoted 2 lines
If that's ok I'll send v4 tomorrow.
Thanks, that looks good to me.
Regards,
Bin
PATCH v3 2/10 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 );
@@ -322,18 +323,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.38.1
PATCH v3 3/10 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.38.1
PATCH v3 4/10 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
@@ -297,6 +297,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],
@@ -305,6 +309,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
@@ -313,22 +328,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.38.1
PATCH v3 5/10 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
@@ -204,9 +204,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;/*
@@ -220,18 +221,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
@@ -311,14 +311,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.38.1
PATCH v3 6/10 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)
@@ -314,6 +310,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.38.1
PATCH v3 7/10 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
@@ -204,9 +204,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
@@ -307,8 +307,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.38.1
Re: [PATCH v3 07/10] hw/riscv/boot.c: use MachineState in riscv_load_initrd()
Quoted 21 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]>--- 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 +0
-0
hw/riscv/boot.c target_ulong riscv_load_kernel(const char *kernel_filename, · line 209
Quoted 8 lines
hw/riscv/boot.c +2
-2@@ -204,9 +204,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;
Do we want to check for missing -initrd here? Or simply return quietly if not provided?
Quoted 4 lines
hw/riscv/boot.c +2
-0+uint64_t mem_size = machine->ram_size; +void *fdt = machine->fdt;hwaddr start, end;ssize_t size;
Re: [PATCH v3 07/10] hw/riscv/boot.c: use MachineState in riscv_load_initrd()
Quoted 17 lines · Philippe Mathieu-Daudé
Quoted 16 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]>---
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(-)
Quoted 15 lines
hw/riscv/boot.c target_ulong riscv_load_kernel(const char *kernel_filename, · line 209
Quoted 12 lines
hw/riscv/boot.c +2
-1@@ -204,9 +204,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;Do we want to check for missing -initrd here? Or simply return quietly if not provided?
This function is always called after a "if (!machine->initrd_filename)", so we can be certain that -initrd will always be present if the function is called.
Perhaps one thing that we could do is to remove this check and fold it inside the function, right at the start, to make the function behavior independent of what the caller is doing. We could do that at patch 9/10 where we'll end up with a single caller instead of 4-5.
Daniel
Quoted 5 lines
Quoted 5 lines
hw/riscv/boot.c +2
-0+ uint64_t mem_size = machine->ram_size; + void *fdt = machine->fdt; hwaddr start, end; ssize_t size;
Re: [PATCH v3 07/10] hw/riscv/boot.c: use MachineState in riscv_load_initrd()
Quoted 34 lines · Daniel Henrique Barboza
Quoted 17 lines · Philippe Mathieu-Daudé
Quoted 16 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]>---
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(-)Quoted 15 lines
hw/riscv/boot.c target_ulong riscv_load_kernel(const char *kernel_filename, · line 209
Quoted 12 lines
hw/riscv/boot.c +2
-1@@ -204,9 +204,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;Do we want to check for missing -initrd here? Or simply return quietly if not provided?
Quoted 3 lines
This function is always called after a "if (!machine->initrd_filename)", so we can be certain that -initrd will always be present if the function is called.
If that is an API guarantee we should assert that is the case then as calling without machine->initrd_filename would be a bug.
Quoted 14 lines
Perhaps one thing that we could do is to remove this check and fold it inside the function, right at the start, to make the function behavior independent of what the caller is doing. We could do that at patch 9/10 where we'll end up with a single caller instead of 4-5.
Daniel
Quoted 5 lines
Quoted 5 lines
hw/riscv/boot.c +2
-0+ uint64_t mem_size = machine->ram_size; + void *fdt = machine->fdt; hwaddr start, end; ssize_t size;
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
PATCH v3 8/10 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
@@ -171,10 +171,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;/*
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
@@ -302,8 +302,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.38.1
PATCH v3 9/10 hw/riscv/boot.c: introduce riscv_load_kernel_and_initrd()
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 in the fdt
Let's fold everything inside riscv_load_kernel() to avoid code repetition. Every other board that uses riscv_load_kernel() will have this same behavior, including boards that doesn't have a valid FDT, so we need to take care to not do FDT operations without checking it first.
Since we're now doing way more than just loading the kernel, rename riscv_load_kernel() to riscv_load_kernel_and_initrd().
--- hw/riscv/boot.c | 27 +++++++++++++++++++++------ 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 | 14 +++----------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 6 +++--- 8 files changed, 36 insertions(+), 52 deletions(-)
hw/riscv/boot.c +21 -6
@@ -171,12 +171,13 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); } -target_ulong riscv_load_kernel (MachineState *machine, -target_ulong kernel_start_addr, -symbol_fn_t sym_cb) +target_ulong riscv_load_kernel_and_initrd (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; +void *fdt = machine->fdt;/* * NB: Use low address not ELF entry point to ensure that the fw_dynamic
@@ -188,21 +189,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 (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_and_initrd (machine, kernel_start_addr, +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_and_initrd (machine, memmap[IBEX_DEV_RAM ].base,NULL ); } }
hw/riscv/sifive_e.c +2 -1
@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine) memmap[SIFIVE_E_DEV_MROM].base, &address_space_memory);if (machine->kernel_filename) { -riscv_load_kernel (machine, memmap[SIFIVE_E_DEV_DTIM ].base,NULL ); +riscv_load_kernel_and_initrd (machine, memmap[SIFIVE_E_DEV_DTIM ].base, +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_and_initrd (machine, kernel_start_addr, +NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
hw/riscv/spike.c +3 -11
@@ -302,17 +302,9 @@ 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_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); - } + kernel_entry =riscv_load_kernel_and_initrd (machine, + kernel_start_addr, + 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_and_initrd (machine, kernel_start_addr, +NULL ); }else {/* * If dynamic firmware is used, it doesn't know where is the next mode
include/hw/riscv/boot.h +3 -3
@@ -43,9 +43,9 @@ 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 (MachineState *machine, -target_ulong firmware_end_addr, -symbol_fn_t sym_cb); +target_ulong riscv_load_kernel_and_initrd (MachineState *machine, +target_ulong firmware_end_addr, +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,
Signature · 1 line
2.38.1
Re: [PATCH v3 09/10] hw/riscv/boot.c: introduce riscv_load_kernel_and_initrd()
Quoted 35 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_cmdlinein the fdtLet's fold everything inside
riscv_load_kernel()to avoid code repetition. Every other board that usesriscv_load_kernel()will have this same behavior, including boards that doesn't have a valid FDT, so we need to take care to not do FDT operations without checking it first.Since we're now doing way more than just loading the kernel, rename
riscv_load_kernel()toriscv_load_kernel_and_initrd().Cc Palmer Dabbelt <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- hw/riscv/boot.c | 27 +++++++++++++++++++++------ 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 | 14 +++----------- hw/riscv/virt.c | 12 ++---------- include/hw/riscv/boot.h | 6 +++--- 8 files changed, 36 insertions(+), 52 deletions(-)hw/riscv/boot.c +0
-0@@ -171,12 +171,13 @@ target_ulong riscv_load_firmware(const char *firmware_filename,exit (1 ); }
hw/riscv/boot.c target_ulong riscv_load_firmware(const char *firmware_filename, · line 179
Quoted 10 lines
hw/riscv/boot.c +3
-3-target_ulong riscv_load_kernel (MachineState *machine, -target_ulong kernel_start_addr, -symbol_fn_t sym_cb) +target_ulong riscv_load_kernel_and_initrd (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;
I wonder if compilers/static analyzers might end complaining because kernel_entry being set is not obvious.
Anyhow,
Quoted 41 lines
hw/riscv/boot.c +18
-3+void *fdt = machine->fdt;/* * NB: Use low address not ELF entry point to ensure that the fw_dynamic @@ -188,21 +189,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 (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; }
PATCH v3 10/10 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 | 76 ++++++++++++++++++++--------------------- include/hw/riscv/boot.h | 1 - 2 files changed, 38 insertions(+), 39 deletions(-)
hw/riscv/boot.c +38 -38
@@ -171,6 +171,44 @@ 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; + +/* +* 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_and_initrd (MachineState *machine,target_ulong kernel_start_addr,symbol_fn_t sym_cb)
@@ -220,44 +258,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; - -/* -* 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
@@ -46,7 +46,6 @@ target_ulong riscv_load_firmware(const char *firmware_filename,target_ulong riscv_load_kernel_and_initrd (MachineState *machine,target_ulong firmware_end_addr,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.38.1