ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/riscv: Return the end address of the loaded firmware 

Instead of returning the unused entry address from riscv_load_firmware()
instead return the end address. Also return the end address from
riscv_find_and_load_firmware().

This tells the caller if a firmware was loaded and how big it is. This
can be used to determine the load address of the next image (usually the
kernel).

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-id: 558cf67162342d65a23262248b040563716628b2.1602634524.git.alistair.francis@wdc.com
This commit is contained in:
Alistair Francis 2020-10-13 17:17:28 -07:00
parent 099be0358e
commit e66c531e13
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/riscv/boot.c
View File

@ -40,12 +40,13 @@
#define fw_dynamic_info_data(__val) cpu_to_le64(__val) #define fw_dynamic_info_data(__val) cpu_to_le64(__val)
#endif #endif
void riscv_find_and_load_firmware(MachineState *machine, target_ulong 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) symbol_fn_t sym_cb)
{ {
char *firmware_filename = NULL; char *firmware_filename = NULL;
target_ulong firmware_end_addr = firmware_load_addr;
if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) { if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) {
/* /*
@ -60,9 +61,12 @@ 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, sym_cb); firmware_end_addr = riscv_load_firmware(firmware_filename,
firmware_load_addr, sym_cb);
g_free(firmware_filename); g_free(firmware_filename);
} }
return firmware_end_addr;
} }
char *riscv_find_firmware(const char *firmware_filename) char *riscv_find_firmware(const char *firmware_filename)
@ -91,17 +95,19 @@ target_ulong riscv_load_firmware(const char *firmware_filename,
hwaddr firmware_load_addr, hwaddr firmware_load_addr,
symbol_fn_t sym_cb) symbol_fn_t sym_cb)
{ {
uint64_t firmware_entry; uint64_t firmware_entry, firmware_size, firmware_end;
if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL, if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL,
&firmware_entry, NULL, NULL, NULL, &firmware_entry, NULL, &firmware_end, NULL,
0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { 0, EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
return firmware_entry; return firmware_end;
} }
if (load_image_targphys_as(firmware_filename, firmware_load_addr, firmware_size = load_image_targphys_as(firmware_filename,
ram_size, NULL) > 0) { firmware_load_addr, ram_size, NULL);
return firmware_load_addr;
if (firmware_size > 0) {
return firmware_load_addr + firmware_size;
} }
error_report("could not load firmware '%s'", firmware_filename); error_report("could not load firmware '%s'", firmware_filename);

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

@ -23,7 +23,7 @@
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "hw/loader.h" #include "hw/loader.h"
void riscv_find_and_load_firmware(MachineState *machine, target_ulong 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); symbol_fn_t sym_cb);