|
From: | Daniel Henrique Barboza |
Subject: | Re: [PATCH v5 10/11] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel() |
Date: | Tue, 10 Jan 2023 17:20:40 -0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 |
On 1/10/23 08:43, Daniel Henrique Barboza wrote:
On 1/8/23 00:33, Bin Meng wrote:On Mon, Jan 2, 2023 at 7:55 PM Daniel Henrique Barboza <dbarboza@ventanamicro.com> wrote:The 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() andtypo: should be riscv_load_initrd()allow these boards to opt out from initrd loading. Cc: Palmer Dabbelt <palmer@dabbelt.com> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- 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, Reviewed-by: Bin Meng <bmeng@tinylab.org>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
Daniel
[Prev in Thread] | Current Thread | [Next in Thread] |