motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv/virt: virt-acpi-build.c: Add RINTC in MADT

Browse source 
Add Multiple APIC Description Table (MADT) with the
RINTC structure for each cpu.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Message-ID: <20230302091212.999767-6-sunilvl@ventanamicro.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Sunil V L 2023-03-02 14:42:09 +05:30 • committed by Palmer Dabbelt
parent 7da2fb240f
commit 6cc40ea211
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889
1 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/riscv/virt.h" #include "hw/riscv/virt.h"
#include "hw/riscv/numa.h"
#define ACPI_BUILD_TABLE_SIZE 0x20000 #define ACPI_BUILD_TABLE_SIZE 0x20000
@ -160,6 +161,36 @@ static void build_dsdt(GArray *table_data,
free_aml_allocator(); free_aml_allocator();
} }
/*
* ACPI spec, Revision 6.5+
* 5.2.12 Multiple APIC Description Table (MADT)
* REF: https://github.com/riscv-non-isa/riscv-acpi/issues/15
* https://drive.google.com/file/d/1R6k4MshhN3WTT-hwqAquu5nX6xSEqK2l/view
*/
static void build_madt(GArray *table_data,
BIOSLinker *linker,
RISCVVirtState *s)
{
MachineClass *mc = MACHINE_GET_CLASS(s);
MachineState *ms = MACHINE(s);
const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(ms);
AcpiTable table = { .sig = "APIC", .rev = 6, .oem_id = s->oem_id,
.oem_table_id = s->oem_table_id };
acpi_table_begin(&table, table_data);
/* Local Interrupt Controller Address */
build_append_int_noprefix(table_data, 0, 4);
build_append_int_noprefix(table_data, 0, 4); /* MADT Flags */
/* RISC-V Local INTC structures per HART */
for (int i = 0; i < arch_ids->len; i++) {
riscv_acpi_madt_add_rintc(i, arch_ids, table_data);
}
acpi_table_end(linker, &table);
}
static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *tables) static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *tables)
{ {
GArray *table_offsets; GArray *table_offsets;
@ -181,6 +212,9 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *tables)
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_fadt_rev6(tables_blob, tables->linker, s, dsdt); build_fadt_rev6(tables_blob, tables->linker, s, dsdt);
acpi_add_table(table_offsets, tables_blob);
build_madt(tables_blob, tables->linker, s);
/* XSDT is pointed to by RSDP */ /* XSDT is pointed to by RSDP */
xsdt = tables_blob->len; xsdt = tables_blob->len;
build_xsdt(tables_blob, tables->linker, table_offsets, s->oem_id, build_xsdt(tables_blob, tables->linker, table_offsets, s->oem_id,