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-acpi-build.c: Add MMU node in RHCT 

MMU type information is available via MMU node in RHCT. Add this node in
RHCT.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-ID: <20231218150247.466427-10-sunilvl@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Sunil V L 2023-12-18 20:32:43 +05:30 committed by Alistair Francis
parent e810a5177c
commit a52aea263e
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/riscv/virt-acpi-build.c
View File

@ -152,6 +152,8 @@ static void build_rhct(GArray *table_data,
size_t len, aligned_len; size_t len, aligned_len;
uint32_t isa_offset, num_rhct_nodes, cmo_offset = 0; uint32_t isa_offset, num_rhct_nodes, cmo_offset = 0;
RISCVCPU *cpu = &s->soc[0].harts[0]; RISCVCPU *cpu = &s->soc[0].harts[0];
uint32_t mmu_offset = 0;
uint8_t satp_mode_max;
char *isa; char *isa;
AcpiTable table = { .sig = "RHCT", .rev = 1, .oem_id = s->oem_id, AcpiTable table = { .sig = "RHCT", .rev = 1, .oem_id = s->oem_id,
@ -171,6 +173,10 @@ static void build_rhct(GArray *table_data,
num_rhct_nodes++; num_rhct_nodes++;
} }
if (cpu->cfg.satp_mode.supported != 0) {
num_rhct_nodes++;
}
/* Number of RHCT nodes*/ /* Number of RHCT nodes*/
build_append_int_noprefix(table_data, num_rhct_nodes, 4); build_append_int_noprefix(table_data, num_rhct_nodes, 4);
@ -226,6 +232,26 @@ static void build_rhct(GArray *table_data,
} }
} }
/* MMU node structure */
if (cpu->cfg.satp_mode.supported != 0) {
satp_mode_max = satp_mode_max_from_map(cpu->cfg.satp_mode.map);
mmu_offset = table_data->len - table.table_offset;
build_append_int_noprefix(table_data, 2, 2); /* Type */
build_append_int_noprefix(table_data, 8, 2); /* Length */
build_append_int_noprefix(table_data, 0x1, 2); /* Revision */
build_append_int_noprefix(table_data, 0, 1); /* Reserved */
/* MMU Type */
if (satp_mode_max == VM_1_10_SV57) {
build_append_int_noprefix(table_data, 2, 1); /* Sv57 */
} else if (satp_mode_max == VM_1_10_SV48) {
build_append_int_noprefix(table_data, 1, 1); /* Sv48 */
} else if (satp_mode_max == VM_1_10_SV39) {
build_append_int_noprefix(table_data, 0, 1); /* Sv39 */
} else {
assert(1);
}
}
/* Hart Info Node */ /* Hart Info Node */
for (int i = 0; i < arch_ids->len; i++) { for (int i = 0; i < arch_ids->len; i++) {
len = 16; len = 16;
@ -238,17 +264,25 @@ static void build_rhct(GArray *table_data,
num_offsets++; num_offsets++;
} }
if (mmu_offset) {
len += 4;
num_offsets++;
}
build_append_int_noprefix(table_data, len, 2); build_append_int_noprefix(table_data, len, 2);
build_append_int_noprefix(table_data, 0x1, 2); /* Revision */ build_append_int_noprefix(table_data, 0x1, 2); /* Revision */
/* Number of offsets */ /* Number of offsets */
build_append_int_noprefix(table_data, num_offsets, 2); build_append_int_noprefix(table_data, num_offsets, 2);
build_append_int_noprefix(table_data, i, 4); /* ACPI Processor UID */ build_append_int_noprefix(table_data, i, 4); /* ACPI Processor UID */
/* Offsets */ /* Offsets */
build_append_int_noprefix(table_data, isa_offset, 4); build_append_int_noprefix(table_data, isa_offset, 4);
if (cmo_offset) { if (cmo_offset) {
build_append_int_noprefix(table_data, cmo_offset, 4); build_append_int_noprefix(table_data, cmo_offset, 4);
} }
if (mmu_offset) {
build_append_int_noprefix(table_data, mmu_offset, 4);
}
} }
acpi_table_end(linker, &table); acpi_table_end(linker, &table);