|
@@ -44,6 +44,7 @@
|
|
#include "hw/pci/pcie_host.h"
|
|
#include "hw/pci/pcie_host.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "sysemu/numa.h"
|
|
#include "sysemu/numa.h"
|
|
|
|
+#include "kvm_arm.h"
|
|
|
|
|
|
#define ARM_SPI_BASE 32
|
|
#define ARM_SPI_BASE 32
|
|
#define ACPI_POWER_BUTTON_DEVICE "PWRB"
|
|
#define ACPI_POWER_BUTTON_DEVICE "PWRB"
|
|
@@ -546,6 +547,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)
|
|
}
|
|
}
|
|
|
|
|
|
if (guest_info->gic_version == 3) {
|
|
if (guest_info->gic_version == 3) {
|
|
|
|
+ AcpiMadtGenericTranslator *gic_its;
|
|
AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data,
|
|
AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data,
|
|
sizeof *gicr);
|
|
sizeof *gicr);
|
|
|
|
|
|
@@ -553,6 +555,16 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)
|
|
gicr->length = sizeof(*gicr);
|
|
gicr->length = sizeof(*gicr);
|
|
gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base);
|
|
gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base);
|
|
gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size);
|
|
gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size);
|
|
|
|
+
|
|
|
|
+ if (!its_class_name()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ gic_its = acpi_data_push(table_data, sizeof *gic_its);
|
|
|
|
+ gic_its->type = ACPI_APIC_GENERIC_TRANSLATOR;
|
|
|
|
+ gic_its->length = sizeof(*gic_its);
|
|
|
|
+ gic_its->translation_id = 0;
|
|
|
|
+ gic_its->base_address = cpu_to_le64(memmap[VIRT_GIC_ITS].base);
|
|
} else {
|
|
} else {
|
|
gic_msi = acpi_data_push(table_data, sizeof *gic_msi);
|
|
gic_msi = acpi_data_push(table_data, sizeof *gic_msi);
|
|
gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME;
|
|
gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME;
|