hw/arm/virt-acpi-build: Present the GICR structure properly for GICv4
PATCH 1/1 hw/arm/virt-acpi-build: Present the GICR structure properly for GICv4
With the introduction of the new TCG GICv4, build_madt() is badly broken as we do not present any GIC Redistributor structure in MADT for GICv4 guests, so that they have no idea about where the Redistributor register frames are. This fixes a Linux guest crash at boot time with ACPI enabled and '-machine gic-version=4'.
While at it, let's convert the remaining hard coded gic_version into enumeration VIRT_GIC_VERSION_2 for consistency.
--- hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/arm/virt-acpi-build.c +2 -2
@@ -732,7 +732,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)uint32_t pmu_interrupt =arm_feature (&armcpu->env,ARM_FEATURE_PMU ) ?PPI (VIRTUAL_PMU_IRQ ) :0 ; -if (vms->gic_version ==2 ) { +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) { physical_base_address = memmap[VIRT_GIC_CPU ].base; gicv = memmap[VIRT_GIC_VCPU ].base; gich = memmap[VIRT_GIC_HYP ].base;
@@ -762,7 +762,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data, armcpu->mp_affinity,8 ); } -if (vms->gic_version ==3 ) { +if (vms->gic_version !=VIRT_GIC_VERSION_2 ) {build_append_gicr (table_data, memmap[VIRT_GIC_REDIST ].base, memmap[VIRT_GIC_REDIST ].size);if (virt_gicv3_redist_region_count (vms) ==2 ) {
Signature · 1 line
2.33.0
Peter Maydell
AppliedQuoted 11 lines · Zenghui Yu
With the introduction of the new TCG GICv4,
build_madt()is badly broken as we do not present any GIC Redistributor structure in MADT for GICv4 guests, so that they have no idea about where the Redistributor register frames are. This fixes a Linux guest crash at boot time with ACPI enabled and '-machine gic-version=4'.While at it, let's convert the remaining hard coded
gic_versioninto enumerationVIRT_GIC_VERSION_2for consistency.Signed-off-by Zenghui Yu <[email protected]>
Oops, I missed the ACPI side of things when I added GICv4 support :-(
Crash-on-boot seems like a bug worth fixing for rc3...
Applied to target-arm.next, thanks.
-- PMM