[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 06/11] hw/arm/virt-acpi-build: Advertise one or two
From: |
Eric Auger |
Subject: |
[Qemu-arm] [PATCH v2 06/11] hw/arm/virt-acpi-build: Advertise one or two GICR structures |
Date: |
Fri, 15 Jun 2018 16:28:25 +0200 |
Depending on the number of smp_cpus we now register one or two
GICR structures.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
v1(virt 3.0) -> v2
- Added Drew's R-b
---
hw/arm/virt-acpi-build.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 74f5744..eefd1d4 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -670,6 +670,7 @@ build_madt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
if (vms->gic_version == 3) {
AcpiMadtGenericTranslator *gic_its;
+ int nb_redist_regions = virt_gicv3_redist_region_count(vms);
AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data,
sizeof *gicr);
@@ -678,6 +679,14 @@ build_madt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base);
gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size);
+ if (nb_redist_regions == 2) {
+ gicr = acpi_data_push(table_data, sizeof(*gicr));
+ gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR;
+ gicr->length = sizeof(*gicr);
+ gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST2].base);
+ gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST2].size);
+ }
+
if (its_class_name() && !vmc->no_its) {
gic_its = acpi_data_push(table_data, sizeof *gic_its);
gic_its->type = ACPI_APIC_GENERIC_TRANSLATOR;
--
2.5.5
- [Qemu-arm] [PATCH v2 01/11] linux-headers: Update to 4.18-rc0, (continued)
[Qemu-arm] [PATCH v2 02/11] target/arm: Allow KVM device address overwriting, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 03/11] hw/intc/arm_gicv3: Introduce redist-region-count array property, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 04/11] hw/intc/arm_gicv3_kvm: Get prepared to handle multiple redist regions, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 06/11] hw/arm/virt-acpi-build: Advertise one or two GICR structures,
Eric Auger <=
[Qemu-arm] [PATCH v2 05/11] hw/arm/virt: GICv3 DT node with one or two redistributor regions, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 07/11] hw/arm/virt: Register two redistributor regions when necessary, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 08/11] hw/arm/virt: Add a new 256MB ECAM region, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 11/11] hw/arm/virt: Increase max_cpus to 512, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 09/11] hw/arm/virt: Add virt-3.0 machine type, Eric Auger, 2018/06/15
[Qemu-arm] [PATCH v2 10/11] hw/arm/virt: Use 256MB ECAM region by default, Eric Auger, 2018/06/15