OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/riscv: Add optional symbol callback ptr to riscv_load_firmware()

Browse Source 
This patch adds an optional function pointer, "sym_cb", to
riscv_load_firmware() which provides the possibility to access
the symbol table during kernel loading.

The pointer is ignored, if supplied with flat (non-elf) firmware image.

The Spike board requires it locate the HTIF symbols from firmware ELF
passed via "-bios" option.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200427080644.168461-2-anup.patel@wdc.com
Message-Id: <20200427080644.168461-2-anup.patel@wdc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Anup Patel 2020-04-27 13:36:42 +05:30 committed by Alistair Francis
parent 0b2f78e524
commit 02777ac303
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/riscv/boot.c
View File

@ -36,7 +36,8 @@
void riscv_find_and_load_firmware(MachineState *machine, void riscv_find_and_load_firmware(MachineState *machine,
const char *default_machine_firmware, const char *default_machine_firmware,
hwaddr firmware_load_addr) hwaddr firmware_load_addr,
symbol_fn_t sym_cb)
{ {
char *firmware_filename = NULL; char *firmware_filename = NULL;
@ -76,7 +77,7 @@ void riscv_find_and_load_firmware(MachineState *machine,
if (firmware_filename) { if (firmware_filename) {
/* If not "none" load the firmware */ /* If not "none" load the firmware */
riscv_load_firmware(firmware_filename, firmware_load_addr); riscv_load_firmware(firmware_filename, firmware_load_addr, sym_cb);
g_free(firmware_filename); g_free(firmware_filename);
} }
} }
@ -96,12 +97,14 @@ char *riscv_find_firmware(const char *firmware_filename)
} }
target_ulong riscv_load_firmware(const char *firmware_filename, target_ulong riscv_load_firmware(const char *firmware_filename,
hwaddr firmware_load_addr) hwaddr firmware_load_addr,
symbol_fn_t sym_cb)
{ {
uint64_t firmware_entry, firmware_start, firmware_end; uint64_t firmware_entry, firmware_start, firmware_end;
if (load_elf(firmware_filename, NULL, NULL, NULL, &firmware_entry, if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL,
&firmware_start, &firmware_end, NULL, 0, EM_RISCV, 1, 0) > 0) { &firmware_entry, &firmware_start, &firmware_end, NULL,
0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
return firmware_entry; return firmware_entry;
} }

2
hw/riscv/sifive_u.c
View File

@ -352,7 +352,7 @@ static void sifive_u_machine_init(MachineState *machine)
create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline);
riscv_find_and_load_firmware(machine, BIOS_FILENAME, riscv_find_and_load_firmware(machine, BIOS_FILENAME,
memmap[SIFIVE_U_DRAM].base); memmap[SIFIVE_U_DRAM].base, NULL);
if (machine->kernel_filename) { if (machine->kernel_filename) {
uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename, uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,

2
hw/riscv/virt.c
View File

@ -511,7 +511,7 @@ static void riscv_virt_board_init(MachineState *machine)
mask_rom); mask_rom);
riscv_find_and_load_firmware(machine, BIOS_FILENAME, riscv_find_and_load_firmware(machine, BIOS_FILENAME,
memmap[VIRT_DRAM].base); memmap[VIRT_DRAM].base, NULL);
if (machine->kernel_filename) { if (machine->kernel_filename) {
uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename, uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,

6
include/hw/riscv/boot.h
View File

@ -24,10 +24,12 @@
void riscv_find_and_load_firmware(MachineState *machine, void riscv_find_and_load_firmware(MachineState *machine,
const char *default_machine_firmware, const char *default_machine_firmware,
hwaddr firmware_load_addr); hwaddr firmware_load_addr,
symbol_fn_t sym_cb);
char *riscv_find_firmware(const char *firmware_filename); char *riscv_find_firmware(const char *firmware_filename);
target_ulong riscv_load_firmware(const char *firmware_filename, target_ulong riscv_load_firmware(const char *firmware_filename,
hwaddr firmware_load_addr); hwaddr firmware_load_addr,
symbol_fn_t sym_cb);
target_ulong riscv_load_kernel(const char *kernel_filename, target_ulong riscv_load_kernel(const char *kernel_filename,
symbol_fn_t sym_cb); symbol_fn_t sym_cb);
hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,