motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv: acpi: only create RHCT MMU entry for supported types

Browse source 
Do not create the RHCT MMU type entry for RV32 CPUs, since it
only has definitions for SV39/SV48/SV57.  Likewise, check that
satp_mode_max_from_map() will actually return a valid value, skipping
the MMU type entry if all MMU types were disabled on the command line.

Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-02-18 12:00:14 +01:00
parent 7f2131c35c
commit 82c81c07e8
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/riscv/virt-acpi-build.c
View file

@ -288,6 +288,7 @@ static void build_rhct(GArray *table_data,
RISCVCPU *cpu = &s->soc[0].harts[0]; RISCVCPU *cpu = &s->soc[0].harts[0];
uint32_t mmu_offset = 0; uint32_t mmu_offset = 0;
uint8_t satp_mode_max; uint8_t satp_mode_max;
bool rv32 = riscv_cpu_is_32bit(cpu);
g_autofree char *isa = NULL; g_autofree char *isa = NULL;
AcpiTable table = { .sig = "RHCT", .rev = 1, .oem_id = s->oem_id, AcpiTable table = { .sig = "RHCT", .rev = 1, .oem_id = s->oem_id,
@ -307,7 +308,8 @@ static void build_rhct(GArray *table_data,
num_rhct_nodes++; num_rhct_nodes++;
} }
if (cpu->cfg.satp_mode.supported != 0) { if (!rv32 && cpu->cfg.satp_mode.supported != 0 &&
(cpu->cfg.satp_mode.map & ~(1 << VM_1_10_MBARE))) {
num_rhct_nodes++; num_rhct_nodes++;
} }
@ -367,7 +369,8 @@ static void build_rhct(GArray *table_data,
} }
/* MMU node structure */ /* MMU node structure */
if (cpu->cfg.satp_mode.supported != 0) { if (!rv32 && cpu->cfg.satp_mode.supported != 0 &&
(cpu->cfg.satp_mode.map & ~(1 << VM_1_10_MBARE))) {
satp_mode_max = satp_mode_max_from_map(cpu->cfg.satp_mode.map); satp_mode_max = satp_mode_max_from_map(cpu->cfg.satp_mode.map);
mmu_offset = table_data->len - table.table_offset; mmu_offset = table_data->len - table.table_offset;
build_append_int_noprefix(table_data, 2, 2); /* Type */ build_append_int_noprefix(table_data, 2, 2); /* Type */
@ -382,7 +385,7 @@ static void build_rhct(GArray *table_data,
} else if (satp_mode_max == VM_1_10_SV39) { } else if (satp_mode_max == VM_1_10_SV39) {
build_append_int_noprefix(table_data, 0, 1); /* Sv39 */ build_append_int_noprefix(table_data, 0, 1); /* Sv39 */
} else { } else {
assert(1); g_assert_not_reached();
} }
} }