motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-11 16:00:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/riscv/tcg: restrict satp_mode changes in cpu_set_profile

Browse source 
We're changing 'mmu' to true regardless of whether the profile is
being enabled or not, and at the same time we're changing satp_mode to
profile->enabled.

This will promote a situation where we'll set mmu=on without a virtual
memory mode, which is a mistake.

Only touch 'mmu' and satp_mode if the profile is being enabled.

Suggested-by: Andrew Jones <ajones@ventanamicro.com>
Fixes: 55398025e7 ("target/riscv: add satp_mode profile support")
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Björn Töpel <bjorn@rivosinc.com>
Tested-by: Björn Töpel <bjorn@rivosinc.com>
Message-ID: <20250528184407.1451983-2-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Daniel Henrique Barboza 2025-05-28 15:44:05 -03:00 • committed by Alistair Francis
parent 148499b343
commit a429f9304d
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
target/riscv/tcg/tcg-cpu.c
View file

@ -1365,16 +1365,16 @@ static void cpu_set_profile(Object *obj, Visitor *v, const char *name,
if (profile->enabled) { if (profile->enabled) {
cpu->env.priv_ver = profile->priv_spec; cpu->env.priv_ver = profile->priv_spec;
}
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (profile->satp_mode != RISCV_PROFILE_ATTR_UNUSED) { if (profile->satp_mode != RISCV_PROFILE_ATTR_UNUSED) {
object_property_set_bool(obj, "mmu", true, NULL); object_property_set_bool(obj, "mmu", true, NULL);
const char *satp_prop = satp_mode_str(profile->satp_mode, const char *satp_prop = satp_mode_str(profile->satp_mode,
riscv_cpu_is_32bit(cpu)); riscv_cpu_is_32bit(cpu));
object_property_set_bool(obj, satp_prop, profile->enabled, NULL); object_property_set_bool(obj, satp_prop, true, NULL);
} }
#endif #endif
}
for (i = 0; misa_bits[i] != 0; i++) { for (i = 0; misa_bits[i] != 0; i++) {
uint32_t bit = misa_bits[i]; uint32_t bit = misa_bits[i];