Skip to content

Commit 18864e8

Browse files
nmenongregkh
authored andcommitted
arm64: dts: ti: k3-j721e: Fix gic-v3 compatible regs
commit a06ed27 upstream. Though GIC ARE option is disabled for no GIC-v2 compatibility, Cortex-A72 is free to implement the CPU interface as long as it communicates with the GIC using the stream protocol. This requires that the SoC integration mark out the PERIPHBASE[1] as reserved area within the SoC. See longer discussion in [2] for further information. Update the GIC register map to indicate offsets from PERIPHBASE based on [3]. Without doing this, systems like kvm will not function with gic-v2 emulation. [1] https://developer.arm.com/documentation/100095/0002/system-control/aarch64-register-descriptions/configuration-base-address-register--el1 [2] https://lore.kernel.org/all/[email protected]/ [3] https://developer.arm.com/documentation/100095/0002/way1382452674438 Cc: [email protected] # 5.10+ Fixes: 2d87061 ("arm64: dts: ti: Add Support for J721E SoC") Reported-by: Marc Zyngier <[email protected]> Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e85fa9f commit 18864e8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@
108108
#interrupt-cells = <3>;
109109
interrupt-controller;
110110
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
111-
<0x00 0x01900000 0x00 0x100000>; /* GICR */
111+
<0x00 0x01900000 0x00 0x100000>, /* GICR */
112+
<0x00 0x6f000000 0x00 0x2000>, /* GICC */
113+
<0x00 0x6f010000 0x00 0x1000>, /* GICH */
114+
<0x00 0x6f020000 0x00 0x2000>; /* GICV */
112115

113116
/* vcpumntirq: virtual CPU interface maintenance interrupt */
114117
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/ti/k3-j721e.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
<0x00 0x0e000000 0x00 0x0e000000 0x00 0x01800000>, /* PCIe Core*/
137137
<0x00 0x10000000 0x00 0x10000000 0x00 0x10000000>, /* PCIe DAT */
138138
<0x00 0x64800000 0x00 0x64800000 0x00 0x00800000>, /* C71 */
139+
<0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */
139140
<0x44 0x00000000 0x44 0x00000000 0x00 0x08000000>, /* PCIe2 DAT */
140141
<0x44 0x10000000 0x44 0x10000000 0x00 0x08000000>, /* PCIe3 DAT */
141142
<0x4d 0x80800000 0x4d 0x80800000 0x00 0x00800000>, /* C66_0 */

0 commit comments

Comments
 (0)