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

hw/riscv: virt: Remove compile time XLEN checks 

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

32
hw/riscv/virt.c
View File

@ -43,12 +43,6 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci-host/gpex.h" #include "hw/pci-host/gpex.h"
#if defined(TARGET_RISCV32)
# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"
#else
# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin"
#endif
static const struct MemmapEntry { static const struct MemmapEntry {
hwaddr base; hwaddr base;
hwaddr size; hwaddr size;
@ -177,7 +171,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename,
} }
static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, static void create_fdt(RISCVVirtState *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;
int i, cpu, socket; int i, cpu, socket;
@ -240,11 +234,11 @@ static void create_fdt(RISCVVirtState *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);
@ -606,7 +600,8 @@ static void virt_machine_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_virt_board.mrom", memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",
@ -614,8 +609,15 @@ static void virt_machine_init(MachineState *machine)
memory_region_add_subregion(system_memory, memmap[VIRT_MROM].base, memory_region_add_subregion(system_memory, memmap[VIRT_MROM].base,
mask_rom); mask_rom);
firmware_end_addr = riscv_find_and_load_firmware(machine, BIOS_FILENAME, if (riscv_is_32_bit(machine)) {
start_addr, NULL); firmware_end_addr = riscv_find_and_load_firmware(machine,
"opensbi-riscv32-generic-fw_dynamic.bin",
start_addr, NULL);
} else {
firmware_end_addr = riscv_find_and_load_firmware(machine,
"opensbi-riscv64-generic-fw_dynamic.bin",
start_addr, NULL);
}
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,