summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-07-01 15:16:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-13 14:13:36 -0700
commitb40aa8b047b89c63b2040d3628eacea6eafe8708 (patch)
treeecddc3e3a0531e78df7fdaccd6e8bb0a8d705b18
parent6300c8bfafe032187f3cbaa43dbf7d306650c5ed (diff)
downloadlinux-stable-b40aa8b047b89c63b2040d3628eacea6eafe8708.tar.gz
linux-stable-b40aa8b047b89c63b2040d3628eacea6eafe8708.tar.bz2
linux-stable-b40aa8b047b89c63b2040d3628eacea6eafe8708.zip
ARM64: dts: marvell: armada-37xx: Fix GIC maintenance interrupt
commit 95696d292e204073433ed2ef3ff4d3d8f42a8248 upstream. The GIC-500 integrated in the Armada-37xx SoCs is compliant with the GICv3 architecture, and thus provides a maintenance interrupt that is required for hypervisors to function correctly. With the interrupt provided in the DT, KVM now works as it should. Tested on an Espressobin system. Fixes: adbc3695d9e4 ("arm64: dts: add the Marvell Armada 3700 family and a development board") Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 49a5d8ccae27..68e6f88bdcfe 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -170,6 +170,7 @@
interrupt-controller;
reg = <0x1d00000 0x10000>, /* GICD */
<0x1d40000 0x40000>; /* GICR */
+ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
};