| Message ID | 20221227064812.1903326-12-bmeng@tinylab.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/riscv: Improve Spike HTIF emulation fidelity | expand |
On 12/27/22 03:48, Bin Meng wrote: > Rename previous riscv_find_firmware() to riscv_find_bios(), and > introduce a new riscv_find_firmware() to implement the first half > part of the work done in riscv_find_and_load_firmware(). > > This new API is helpful for machine that wants to know the final > chosen firmware file name but does not want to load it. > > Signed-off-by: Bin Meng <bmeng@tinylab.org> > --- Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > > include/hw/riscv/boot.h | 2 ++ > hw/riscv/boot.c | 39 +++++++++++++++++++++++++-------------- > 2 files changed, 27 insertions(+), 14 deletions(-) > > diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h > index 60cf320c88..b273ab22f7 100644 > --- a/include/hw/riscv/boot.h > +++ b/include/hw/riscv/boot.h > @@ -38,6 +38,8 @@ target_ulong riscv_find_and_load_firmware(MachineState *machine, > hwaddr firmware_load_addr, > symbol_fn_t sym_cb); > const char *riscv_default_firmware_name(RISCVHartArrayState *harts); > +char *riscv_find_firmware(const char *firmware_filename, > + const char *default_machine_firmware); > target_ulong riscv_load_firmware(const char *firmware_filename, > hwaddr firmware_load_addr, > symbol_fn_t sym_cb); > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c > index e1a544b1d9..98b80af51b 100644 > --- a/hw/riscv/boot.c > +++ b/hw/riscv/boot.c > @@ -84,11 +84,11 @@ const char *riscv_default_firmware_name(RISCVHartArrayState *harts) > return RISCV64_BIOS_BIN; > } > > -static char *riscv_find_firmware(const char *firmware_filename) > +static char *riscv_find_bios(const char *bios_filename) > { > char *filename; > > - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware_filename); > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_filename); > if (filename == NULL) { > if (!qtest_enabled()) { > /* > @@ -97,8 +97,8 @@ static char *riscv_find_firmware(const char *firmware_filename) > * running QEMU test will complain hence let's suppress the error > * report for QEMU testing. > */ > - error_report("Unable to load the RISC-V firmware \"%s\"", > - firmware_filename); > + error_report("Unable to find the RISC-V BIOS \"%s\"", > + bios_filename); > exit(1); > } > } > @@ -106,25 +106,36 @@ static char *riscv_find_firmware(const char *firmware_filename) > return filename; > } > > -target_ulong riscv_find_and_load_firmware(MachineState *machine, > - const char *default_machine_firmware, > - hwaddr firmware_load_addr, > - symbol_fn_t sym_cb) > +char *riscv_find_firmware(const char *firmware_filename, > + const char *default_machine_firmware) > { > - char *firmware_filename = NULL; > - target_ulong firmware_end_addr = firmware_load_addr; > + char *filename = NULL; > > - if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) { > + if ((!firmware_filename) || (!strcmp(firmware_filename, "default"))) { > /* > * The user didn't specify -bios, or has specified "-bios default". > * That means we are going to load the OpenSBI binary included in > * the QEMU source. > */ > - firmware_filename = riscv_find_firmware(default_machine_firmware); > - } else if (strcmp(machine->firmware, "none")) { > - firmware_filename = riscv_find_firmware(machine->firmware); > + filename = riscv_find_bios(default_machine_firmware); > + } else if (strcmp(firmware_filename, "none")) { > + filename = riscv_find_bios(firmware_filename); > } > > + return filename; > +} > + > +target_ulong riscv_find_and_load_firmware(MachineState *machine, > + const char *default_machine_firmware, > + hwaddr firmware_load_addr, > + symbol_fn_t sym_cb) > +{ > + char *firmware_filename; > + target_ulong firmware_end_addr = firmware_load_addr; > + > + firmware_filename = riscv_find_firmware(machine->firmware, > + default_machine_firmware); > + > if (firmware_filename) { > /* If not "none" load the firmware */ > firmware_end_addr = riscv_load_firmware(firmware_filename,
On Tue, Dec 27, 2022 at 4:55 PM Bin Meng <bmeng@tinylab.org> wrote: > > Rename previous riscv_find_firmware() to riscv_find_bios(), and > introduce a new riscv_find_firmware() to implement the first half > part of the work done in riscv_find_and_load_firmware(). > > This new API is helpful for machine that wants to know the final > chosen firmware file name but does not want to load it. > > Signed-off-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > include/hw/riscv/boot.h | 2 ++ > hw/riscv/boot.c | 39 +++++++++++++++++++++++++-------------- > 2 files changed, 27 insertions(+), 14 deletions(-) > > diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h > index 60cf320c88..b273ab22f7 100644 > --- a/include/hw/riscv/boot.h > +++ b/include/hw/riscv/boot.h > @@ -38,6 +38,8 @@ target_ulong riscv_find_and_load_firmware(MachineState *machine, > hwaddr firmware_load_addr, > symbol_fn_t sym_cb); > const char *riscv_default_firmware_name(RISCVHartArrayState *harts); > +char *riscv_find_firmware(const char *firmware_filename, > + const char *default_machine_firmware); > target_ulong riscv_load_firmware(const char *firmware_filename, > hwaddr firmware_load_addr, > symbol_fn_t sym_cb); > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c > index e1a544b1d9..98b80af51b 100644 > --- a/hw/riscv/boot.c > +++ b/hw/riscv/boot.c > @@ -84,11 +84,11 @@ const char *riscv_default_firmware_name(RISCVHartArrayState *harts) > return RISCV64_BIOS_BIN; > } > > -static char *riscv_find_firmware(const char *firmware_filename) > +static char *riscv_find_bios(const char *bios_filename) > { > char *filename; > > - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware_filename); > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_filename); > if (filename == NULL) { > if (!qtest_enabled()) { > /* > @@ -97,8 +97,8 @@ static char *riscv_find_firmware(const char *firmware_filename) > * running QEMU test will complain hence let's suppress the error > * report for QEMU testing. > */ > - error_report("Unable to load the RISC-V firmware \"%s\"", > - firmware_filename); > + error_report("Unable to find the RISC-V BIOS \"%s\"", > + bios_filename); > exit(1); > } > } > @@ -106,25 +106,36 @@ static char *riscv_find_firmware(const char *firmware_filename) > return filename; > } > > -target_ulong riscv_find_and_load_firmware(MachineState *machine, > - const char *default_machine_firmware, > - hwaddr firmware_load_addr, > - symbol_fn_t sym_cb) > +char *riscv_find_firmware(const char *firmware_filename, > + const char *default_machine_firmware) > { > - char *firmware_filename = NULL; > - target_ulong firmware_end_addr = firmware_load_addr; > + char *filename = NULL; > > - if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) { > + if ((!firmware_filename) || (!strcmp(firmware_filename, "default"))) { > /* > * The user didn't specify -bios, or has specified "-bios default". > * That means we are going to load the OpenSBI binary included in > * the QEMU source. > */ > - firmware_filename = riscv_find_firmware(default_machine_firmware); > - } else if (strcmp(machine->firmware, "none")) { > - firmware_filename = riscv_find_firmware(machine->firmware); > + filename = riscv_find_bios(default_machine_firmware); > + } else if (strcmp(firmware_filename, "none")) { > + filename = riscv_find_bios(firmware_filename); > } > > + return filename; > +} > + > +target_ulong riscv_find_and_load_firmware(MachineState *machine, > + const char *default_machine_firmware, > + hwaddr firmware_load_addr, > + symbol_fn_t sym_cb) > +{ > + char *firmware_filename; > + target_ulong firmware_end_addr = firmware_load_addr; > + > + firmware_filename = riscv_find_firmware(machine->firmware, > + default_machine_firmware); > + > if (firmware_filename) { > /* If not "none" load the firmware */ > firmware_end_addr = riscv_load_firmware(firmware_filename, > -- > 2.34.1 > >
diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 60cf320c88..b273ab22f7 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -38,6 +38,8 @@ target_ulong riscv_find_and_load_firmware(MachineState *machine, hwaddr firmware_load_addr, symbol_fn_t sym_cb); const char *riscv_default_firmware_name(RISCVHartArrayState *harts); +char *riscv_find_firmware(const char *firmware_filename, + const char *default_machine_firmware); target_ulong riscv_load_firmware(const char *firmware_filename, hwaddr firmware_load_addr, symbol_fn_t sym_cb); diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index e1a544b1d9..98b80af51b 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -84,11 +84,11 @@ const char *riscv_default_firmware_name(RISCVHartArrayState *harts) return RISCV64_BIOS_BIN; } -static char *riscv_find_firmware(const char *firmware_filename) +static char *riscv_find_bios(const char *bios_filename) { char *filename; - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware_filename); + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_filename); if (filename == NULL) { if (!qtest_enabled()) { /* @@ -97,8 +97,8 @@ static char *riscv_find_firmware(const char *firmware_filename) * running QEMU test will complain hence let's suppress the error * report for QEMU testing. */ - error_report("Unable to load the RISC-V firmware \"%s\"", - firmware_filename); + error_report("Unable to find the RISC-V BIOS \"%s\"", + bios_filename); exit(1); } } @@ -106,25 +106,36 @@ static char *riscv_find_firmware(const char *firmware_filename) return filename; } -target_ulong riscv_find_and_load_firmware(MachineState *machine, - const char *default_machine_firmware, - hwaddr firmware_load_addr, - symbol_fn_t sym_cb) +char *riscv_find_firmware(const char *firmware_filename, + const char *default_machine_firmware) { - char *firmware_filename = NULL; - target_ulong firmware_end_addr = firmware_load_addr; + char *filename = NULL; - if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) { + if ((!firmware_filename) || (!strcmp(firmware_filename, "default"))) { /* * The user didn't specify -bios, or has specified "-bios default". * That means we are going to load the OpenSBI binary included in * the QEMU source. */ - firmware_filename = riscv_find_firmware(default_machine_firmware); - } else if (strcmp(machine->firmware, "none")) { - firmware_filename = riscv_find_firmware(machine->firmware); + filename = riscv_find_bios(default_machine_firmware); + } else if (strcmp(firmware_filename, "none")) { + filename = riscv_find_bios(firmware_filename); } + return filename; +} + +target_ulong riscv_find_and_load_firmware(MachineState *machine, + const char *default_machine_firmware, + hwaddr firmware_load_addr, + symbol_fn_t sym_cb) +{ + char *firmware_filename; + target_ulong firmware_end_addr = firmware_load_addr; + + firmware_filename = riscv_find_firmware(machine->firmware, + default_machine_firmware); + if (firmware_filename) { /* If not "none" load the firmware */ firmware_end_addr = riscv_load_firmware(firmware_filename,
Rename previous riscv_find_firmware() to riscv_find_bios(), and introduce a new riscv_find_firmware() to implement the first half part of the work done in riscv_find_and_load_firmware(). This new API is helpful for machine that wants to know the final chosen firmware file name but does not want to load it. Signed-off-by: Bin Meng <bmeng@tinylab.org> --- include/hw/riscv/boot.h | 2 ++ hw/riscv/boot.c | 39 +++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-)