[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/16] hw/riscv/virt.c: skip 'mmu-type' FDT if satp mode not set
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH 02/16] hw/riscv/virt.c: skip 'mmu-type' FDT if satp mode not set |
Date: |
Tue, 30 May 2023 16:46:09 -0300 |
The absence of a satp mode in riscv_host_cpu_init() is causing the
following error:
$ sudo ./qemu/build/qemu-system-riscv64 -machine virt,accel=kvm \
-m 2G -smp 1 -nographic -snapshot \
-kernel ./guest_imgs/Image \
-initrd ./guest_imgs/rootfs_kvm_riscv64.img \
-append "earlycon=sbi root=/dev/ram rw" \
-cpu host
**
ERROR:../target/riscv/cpu.c:320:satp_mode_str: code should not be
reached
Bail out! ERROR:../target/riscv/cpu.c:320:satp_mode_str: code should
not be reached
Aborted
The error is triggered from create_fdt_socket_cpus() in hw/riscv/virt.c.
It's trying to get satp_mode_str for a NULL cpu->cfg.satp_mode.map.
For this KVM 'cpu' we would need to inherit the satp supported modes
from the RISC-V host. At this moment this is not possible because the
KVM driver does not support it. And even when it does we can't just let
this broken for every other older kernel.
Skip the 'mmu-type' FDT node if there's no satp_mode set.
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
hw/riscv/virt.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 4e3efbee16..8aa907e81f 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -243,13 +243,13 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int
socket,
s->soc[socket].hartid_base + cpu);
qemu_fdt_add_subnode(ms->fdt, cpu_name);
- satp_mode_max = satp_mode_max_from_map(
- s->soc[socket].harts[cpu].cfg.satp_mode.map);
- sv_name = g_strdup_printf("riscv,%s",
- satp_mode_str(satp_mode_max, is_32_bit));
- qemu_fdt_setprop_string(ms->fdt, cpu_name, "mmu-type", sv_name);
- g_free(sv_name);
-
+ if (cpu_ptr->cfg.satp_mode.supported != 0) {
+ satp_mode_max = satp_mode_max_from_map(cpu_ptr->cfg.satp_mode.map);
+ sv_name = g_strdup_printf("riscv,%s",
+ satp_mode_str(satp_mode_max, is_32_bit));
+ qemu_fdt_setprop_string(ms->fdt, cpu_name, "mmu-type", sv_name);
+ g_free(sv_name);
+ }
name = riscv_isa_string(cpu_ptr);
qemu_fdt_setprop_string(ms->fdt, cpu_name, "riscv,isa", name);
--
2.40.1
- [PATCH 00/16] target/riscv, KVM: fixes and enhancements, Daniel Henrique Barboza, 2023/05/30
- [PATCH 01/16] target/riscv: skip features setup for KVM CPUs, Daniel Henrique Barboza, 2023/05/30
- [PATCH 02/16] hw/riscv/virt.c: skip 'mmu-type' FDT if satp mode not set,
Daniel Henrique Barboza <=
- [PATCH 03/16] target/riscv/cpu.c: restrict 'mvendorid' value, Daniel Henrique Barboza, 2023/05/30
- [PATCH 04/16] target/riscv/cpu.c: restrict 'mimpid' value, Daniel Henrique Barboza, 2023/05/30
- [PATCH 05/16] target/riscv/cpu.c: restrict 'marchid' value, Daniel Henrique Barboza, 2023/05/30
- [PATCH 06/16] target/riscv: use KVM scratch CPUs to init KVM properties, Daniel Henrique Barboza, 2023/05/30
- [PATCH 07/16] target/riscv: read marchid/mimpid in kvm_riscv_init_machine_ids(), Daniel Henrique Barboza, 2023/05/30
- [PATCH 08/16] target/riscv: handle mvendorid/marchid/mimpid for KVM CPUs, Daniel Henrique Barboza, 2023/05/30
- [PATCH 09/16] linux-headers: Update to v6.4-rc1, Daniel Henrique Barboza, 2023/05/30
- [PATCH 11/16] target/riscv: add KVM specific MISA properties, Daniel Henrique Barboza, 2023/05/30
- [PATCH 12/16] target/riscv/kvm.c: update KVM MISA bits, Daniel Henrique Barboza, 2023/05/30
- [PATCH 10/16] target/riscv/kvm.c: init 'misa_ext_mask' with scratch CPU, Daniel Henrique Barboza, 2023/05/30