| Message ID | 20200214072127.64330-3-anup.patel@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | RISC-V Spike machine improvements | expand |
On Thu, Feb 13, 2020 at 11:22 PM Anup Patel <anup.patel@wdc.com> wrote: > > This patch extends Spike machine support to allow loading OpenSBI > firmware (fw_jump.elf) separately using -bios option. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> Can you add something in the commit message adding that you also support adding an initrd with this patch? Otherwise: Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/spike.c | 24 +++++++++++++++++++++++- > 1 file changed, 23 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index 8823681783..060a86f922 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -45,6 +45,12 @@ > > #include <libfdt.h> > > +#if defined(TARGET_RISCV32) > +# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf" > +#else > +# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf" > +#endif > + > static const struct MemmapEntry { > hwaddr base; > hwaddr size; > @@ -183,8 +189,24 @@ static void spike_board_init(MachineState *machine) > memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base, > mask_rom); > > + riscv_find_and_load_firmware(machine, BIOS_FILENAME, > + memmap[SPIKE_DRAM].base, > + htif_symbol_callback); > + > if (machine->kernel_filename) { > - riscv_load_kernel(machine->kernel_filename, htif_symbol_callback); > + uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename, > + 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(s->fdt, "/chosen", > + "linux,initrd-start", start); > + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", > + end); > + } > } > > /* reset vector */ > -- > 2.17.1 > >
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 8823681783..060a86f922 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -45,6 +45,12 @@ #include <libfdt.h> +#if defined(TARGET_RISCV32) +# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf" +#else +# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf" +#endif + static const struct MemmapEntry { hwaddr base; hwaddr size; @@ -183,8 +189,24 @@ static void spike_board_init(MachineState *machine) memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base, mask_rom); + riscv_find_and_load_firmware(machine, BIOS_FILENAME, + memmap[SPIKE_DRAM].base, + htif_symbol_callback); + if (machine->kernel_filename) { - riscv_load_kernel(machine->kernel_filename, htif_symbol_callback); + uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename, + 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(s->fdt, "/chosen", + "linux,initrd-start", start); + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", + end); + } } /* reset vector */
This patch extends Spike machine support to allow loading OpenSBI firmware (fw_jump.elf) separately using -bios option. Signed-off-by: Anup Patel <anup.patel@wdc.com> --- hw/riscv/spike.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)