| Message ID | 20221228133336.197467-8-dbarboza@ventanamicro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | irscv: OpenSBI boot test and cleanups | expand |
On 28/12/22 14:33, Daniel Henrique Barboza wrote: > 'filename', 'mem_size' and 'fdt' from riscv_load_initrd() can all be > retrieved by the MachineState object for all callers. > > Cc: Palmer Dabbelt <palmer@dabbelt.com> > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Bin Meng <bmeng@tinylab.org> > --- > 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(-) > > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c > index d3c71b3f0b..f7e806143a 100644 > --- a/hw/riscv/boot.c > +++ b/hw/riscv/boot.c > @@ -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? > + uint64_t mem_size = machine->ram_size; > + void *fdt = machine->fdt; > hwaddr start, end; > ssize_t size;
On 12/28/22 12:51, Philippe Mathieu-Daudé wrote: > On 28/12/22 14:33, Daniel Henrique Barboza wrote: >> 'filename', 'mem_size' and 'fdt' from riscv_load_initrd() can all be >> retrieved by the MachineState object for all callers. >> >> Cc: Palmer Dabbelt <palmer@dabbelt.com> >> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> Reviewed-by: Bin Meng <bmeng@tinylab.org> >> --- >> 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(-) >> >> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c >> index d3c71b3f0b..f7e806143a 100644 >> --- a/hw/riscv/boot.c >> +++ b/hw/riscv/boot.c >> @@ -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 > >> + uint64_t mem_size = machine->ram_size; >> + void *fdt = machine->fdt; >> hwaddr start, end; >> ssize_t size;
Daniel Henrique Barboza <dbarboza@ventanamicro.com> writes: > On 12/28/22 12:51, Philippe Mathieu-Daudé wrote: >> On 28/12/22 14:33, Daniel Henrique Barboza wrote: >>> 'filename', 'mem_size' and 'fdt' from riscv_load_initrd() can all be >>> retrieved by the MachineState object for all callers. >>> >>> Cc: Palmer Dabbelt <palmer@dabbelt.com> >>> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> >>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> Reviewed-by: Bin Meng <bmeng@tinylab.org> >>> --- >>> 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(-) >>> >>> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c >>> index d3c71b3f0b..f7e806143a 100644 >>> --- a/hw/riscv/boot.c >>> +++ b/hw/riscv/boot.c >>> @@ -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. If that is an API guarantee we should assert that is the case then as calling without machine->initrd_filename would be a bug. > > 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 > >> >>> + uint64_t mem_size = machine->ram_size; >>> + void *fdt = machine->fdt; >>> hwaddr start, end; >>> ssize_t size;
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index d3c71b3f0b..f7e806143a 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -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; diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 593a799549..1e9b0a420e 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -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) { diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3e6df87b5b..c40885ed5c 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -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) { diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 775f910a50..0c22978b12 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -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) { diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 6c946b6def..02f1369843 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -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) { diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index e37e1d1238..cfd72ecabf 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -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,