Commit 02777ac3 authored by Anup Patel's avatar Anup Patel Committed by Alistair Francis
Browse files

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



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: default avatarAnup Patel <anup.patel@wdc.com>
Reviewed-by: default avatarAlistair 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: default avatarAlistair Francis <alistair.francis@wdc.com>
parent 0b2f78e5

hw/riscv/boot.c

+8 −5
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ 


void riscv_find_and_load_firmware(MachineState *machine,

                                  const char *default_machine_firmware,

                                  hwaddr firmware_load_addr)

                                  hwaddr firmware_load_addr,

                                  symbol_fn_t sym_cb)

{

    char *firmware_filename = NULL;
@@ -76,7 +77,7 @@ void riscv_find_and_load_firmware(MachineState *machine, 


    if (firmware_filename) {

        /* 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);

    }

}
@@ -96,12 +97,14 @@ char *riscv_find_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;



    if (load_elf(firmware_filename, NULL, NULL, NULL, &firmware_entry,

                 &firmware_start, &firmware_end, NULL, 0, EM_RISCV, 1, 0) > 0) {

    if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL,

                         &firmware_entry, &firmware_start, &firmware_end, NULL,

                         0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {

        return firmware_entry;

    }

hw/riscv/sifive_u.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void sifive_u_machine_init(MachineState *machine) 
    create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline);



    riscv_find_and_load_firmware(machine, BIOS_FILENAME,

                                 memmap[SIFIVE_U_DRAM].base);

                                 memmap[SIFIVE_U_DRAM].base, NULL);



    if (machine->kernel_filename) {

        uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,

hw/riscv/virt.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void riscv_virt_board_init(MachineState *machine) 
                                mask_rom);



    riscv_find_and_load_firmware(machine, BIOS_FILENAME,

                                 memmap[VIRT_DRAM].base);

                                 memmap[VIRT_DRAM].base, NULL);



    if (machine->kernel_filename) {

        uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,

include/hw/riscv/boot.h

+4 −2
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ 


void riscv_find_and_load_firmware(MachineState *machine,

                                  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);

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,

                               symbol_fn_t sym_cb);

hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,