| From b39ae3dcb6288eac45429f4a319288124d576d41 Mon Sep 17 00:00:00 2001 |
| From: Marc Zyngier <maz@kernel.org> |
| Date: Thu, 23 Jan 2020 14:51:12 +0000 |
| Subject: [PATCH] arm64: dts: fast models: Fix FVP PCI interrupt-map property |
| |
| commit 3543d7ddd55fe12c37e8a9db846216c51846015b upstream. |
| |
| The interrupt map for the FVP's PCI node is missing the |
| parent-unit-address cells for each of the INTx entries, leading to the |
| kernel code failing to parse the entries correctly. |
| |
| Add the missing zero cells, which are pretty useless as far as the GIC |
| is concerned, but that the spec requires. This allows INTx to be usable |
| on the model, and VFIO to work correctly. |
| |
| Fixes: fa083b99eb28 ("arm64: dts: fast models: Add DTS fo Base RevC FVP") |
| Signed-off-by: Marc Zyngier <maz@kernel.org> |
| Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm64/boot/dts/arm/fvp-base-revc.dts b/arch/arm64/boot/dts/arm/fvp-base-revc.dts |
| index 687707020ec1..10a7b5550681 100644 |
| --- a/arch/arm64/boot/dts/arm/fvp-base-revc.dts |
| +++ b/arch/arm64/boot/dts/arm/fvp-base-revc.dts |
| @@ -161,10 +161,10 @@ |
| bus-range = <0x0 0x1>; |
| reg = <0x0 0x40000000 0x0 0x10000000>; |
| ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>; |
| - interrupt-map = <0 0 0 1 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, |
| - <0 0 0 2 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, |
| - <0 0 0 3 &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, |
| - <0 0 0 4 &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; |
| + interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 0 0 2 &gic 0 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 0 0 3 &gic 0 0 GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 0 0 4 &gic 0 0 GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; |
| interrupt-map-mask = <0x0 0x0 0x0 0x7>; |
| msi-map = <0x0 &its 0x0 0x10000>; |
| iommu-map = <0x0 &smmu 0x0 0x10000>; |
| -- |
| 2.7.4 |
| |
