mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/riscv: spike: Remove compile time XLEN checks

Browse Source 
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>
Message-id: ac75037dd58061486de421a0fcd9ac8a92014607.1608142916.git.alistair.francis@wdc.com
This commit is contained in:
Alistair Francis 2020-12-16 10:22:43 -08:00
parent 9d01143063
commit bd62c13ea8
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/riscv/spike.c
View File

@ -43,17 +43,6 @@
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
/*
* Not like other RISC-V machines that use plain binary bios images,
* keeping ELF files here was intentional because BIN files don't work
* for the Spike machine as HTIF emulation depends on ELF parsing.
*/
#if defined(TARGET_RISCV32)
# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.elf"
#else
# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.elf"
#endif
static const struct MemmapEntry { static const struct MemmapEntry {
hwaddr base; hwaddr base;
hwaddr size; hwaddr size;
@ -64,7 +53,7 @@ static const struct MemmapEntry {
}; };
static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap, static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,
uint64_t mem_size, const char *cmdline) uint64_t mem_size, const char *cmdline, bool is_32_bit)
{ {
void *fdt; void *fdt;
uint64_t addr, size; uint64_t addr, size;
@ -115,11 +104,11 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,
cpu_name = g_strdup_printf("/cpus/cpu@%d", cpu_name = g_strdup_printf("/cpus/cpu@%d",
s->soc[socket].hartid_base + cpu); s->soc[socket].hartid_base + cpu);
qemu_fdt_add_subnode(fdt, cpu_name); qemu_fdt_add_subnode(fdt, cpu_name);
#if defined(TARGET_RISCV32) if (is_32_bit) {
qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv32"); qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv32");
#else } else {
qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv48"); qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,sv48");
#endif }
name = riscv_isa_string(&s->soc[socket].harts[cpu]); name = riscv_isa_string(&s->soc[socket].harts[cpu]);
qemu_fdt_setprop_string(fdt, cpu_name, "riscv,isa", name); qemu_fdt_setprop_string(fdt, cpu_name, "riscv,isa", name);
g_free(name); g_free(name);
@ -254,7 +243,8 @@ static void spike_board_init(MachineState *machine)
main_mem); main_mem);
/* create device tree */ /* create device tree */
create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline,
riscv_is_32_bit(machine));
/* boot rom */ /* boot rom */
memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom", memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom",
@ -262,9 +252,22 @@ static void spike_board_init(MachineState *machine)
memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base, memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base,
mask_rom); mask_rom);
firmware_end_addr = riscv_find_and_load_firmware(machine, BIOS_FILENAME, /*
* Not like other RISC-V machines that use plain binary bios images,
* keeping ELF files here was intentional because BIN files don't work
* for the Spike machine as HTIF emulation depends on ELF parsing.
*/
if (riscv_is_32_bit(machine)) {
firmware_end_addr = riscv_find_and_load_firmware(machine,
"opensbi-riscv32-generic-fw_dynamic.elf",
memmap[SPIKE_DRAM].base, memmap[SPIKE_DRAM].base,
htif_symbol_callback); htif_symbol_callback);
} else {
firmware_end_addr = riscv_find_and_load_firmware(machine,
"opensbi-riscv64-generic-fw_dynamic.elf",
memmap[SPIKE_DRAM].base,
htif_symbol_callback);
}
if (machine->kernel_filename) { if (machine->kernel_filename) {
kernel_start_addr = riscv_calc_kernel_start_addr(machine, kernel_start_addr = riscv_calc_kernel_start_addr(machine,