hw/arm/virt-acpi-build: Fix SMMUv3 GSIV values
PATCH 1/1 hw/arm/virt-acpi-build: Fix SMMUv3 GSIV values
The GSIV numbers of the SPI based interrupts is not correct as ARM_SPI_BASE was not added to the irqmap[VIRT_SMMU] value. So this may collide with VIRTIO_MMIO irq window.
Signed-off-by Eric Auger <[email protected]>
--- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +1 -1
@@ -405,7 +405,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) its->identifiers[0 ] =0 ;/* MADT translation_id */ if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { -int irq = vms->irqmap[VIRT_SMMU ]; +int irq = vms->irqmap[VIRT_SMMU ] +ARM_SPI_BASE ;/* SMMUv3 node */ smmu_offset = iort_node_offset + node_size;
Signature · 1 line
2.20.1
Quoted 5 lines · Eric Auger
The GSIV numbers of the SPI based interrupts is not correct as
ARM_SPI_BASEwas not added to the irqmap[VIRT_SMMU] value. So this may collide withVIRTIO_MMIOirq window.Signed-off-by Eric Auger <[email protected]>
Reviewed-by Shannon Zhao <[email protected]>
Quoted 18 lines
--- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/arm/virt-acpi-build.c +1
-1@@ -405,7 +405,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) its->identifiers[0 ] =0 ;/* MADT translation_id */ if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { -int irq = vms->irqmap[VIRT_SMMU ]; +int irq = vms->irqmap[VIRT_SMMU ] +ARM_SPI_BASE ;/* SMMUv3 node */ smmu_offset = iort_node_offset + node_size;
Peter Maydell
AppliedQuoted 15 lines · Eric Auger
The GSIV numbers of the SPI based interrupts is not correct as
ARM_SPI_BASEwas not added to the irqmap[VIRT_SMMU] value. So this may collide withVIRTIO_MMIOirq window.Signed-off-by Eric Auger <[email protected]>--- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/arm/virt-acpi-build.c +0
-0
hw/arm/virt-acpi-build.c build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
Quoted 9 lines
hw/arm/virt-acpi-build.c +1
-2@@ -405,7 +405,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) its->identifiers[0 ] =0 ;/* MADT translation_id */ if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { -int irq = vms->irqmap[VIRT_SMMU ]; +int irq = vms->irqmap[VIRT_SMMU ] +ARM_SPI_BASE ;/* SMMUv3 node */ smmu_offset = iort_node_offset + node_size; --
Applied to target-arm.next, thanks.
-- PMM