Skip to content

Commit 8cae268

Browse files
committed
arm64: dts: ti: k3-am65: Fix gic-v3 compatible regs
Though GIC ARE option is disabled for no GIC-v2 compatibility, Cortex-A53 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/ddi0500/e/system-control/aarch64-register-descriptions/configuration-base-address-register--el1 [2] https://lore.kernel.org/all/[email protected]/ [3] https://developer.arm.com/documentation/ddi0500/e/generic-interrupt-controller-cpu-interface/gic-programmers-model/memory-map Cc: [email protected] # 5.10+ Fixes: ea47eed ("arm64: dts: ti: Add Support for AM654 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]
1 parent 223d9ac commit 8cae268

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
#interrupt-cells = <3>;
3636
interrupt-controller;
3737
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
38-
<0x00 0x01880000 0x00 0x90000>; /* GICR */
38+
<0x00 0x01880000 0x00 0x90000>, /* GICR */
39+
<0x00 0x6f000000 0x00 0x2000>, /* GICC */
40+
<0x00 0x6f010000 0x00 0x1000>, /* GICH */
41+
<0x00 0x6f020000 0x00 0x2000>; /* GICV */
3942
/*
4043
* vcpumntirq:
4144
* virtual CPU interface maintenance interrupt

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>,
8787
<0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>,
8888
<0x00 0x50000000 0x00 0x50000000 0x00 0x8000000>,
89+
<0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A53 PERIPHBASE */
8990
<0x00 0x70000000 0x00 0x70000000 0x00 0x200000>,
9091
<0x05 0x00000000 0x05 0x00000000 0x01 0x0000000>,
9192
<0x07 0x00000000 0x07 0x00000000 0x01 0x0000000>;

0 commit comments

Comments
 (0)