mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: ARM: Present GIC version in MADT table

Browse Source 
In ACPI 5.1 Errata, it adds GIC version in GIC distributor structure.
This is useful for guest kernel to identify which version GIC hardware
is. Update GIC distributor structure and present GIC version in MADT
table.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 1465960955-17388-1-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Shannon Zhao 2016-06-17 15:23:48 +01:00 committed by Peter Maydell
parent 1d3e65aa7a
commit f06765a94a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/arm/virt-acpi-build.c
View File

@ -523,6 +523,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)
gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR; gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR;
gicd->length = sizeof(*gicd); gicd->length = sizeof(*gicd);
gicd->base_address = memmap[VIRT_GIC_DIST].base; gicd->base_address = memmap[VIRT_GIC_DIST].base;
gicd->version = guest_info->gic_version;
for (i = 0; i < guest_info->smp_cpus; i++) { for (i = 0; i < guest_info->smp_cpus; i++) {
AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data, AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data,

4
include/hw/acpi/acpi-defs.h
View File

@ -367,7 +367,9 @@ struct AcpiMadtGenericDistributor {
uint32_t gic_id; uint32_t gic_id;
uint64_t base_address; uint64_t base_address;
uint32_t global_irq_base; uint32_t global_irq_base;
uint32_t reserved2; /* ACPI 5.1 Errata 1228 Present GIC version in MADT table */
uint8_t version;
uint8_t reserved2[3];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor; typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor;