[3/3] arm-bsp/fvp-baser-aemv8r64: Use secure hypervisor physical timer in EL2

Message ID 20220622133620.1524265-3-peter.hoyes@arm.com
State New
Headers show
Series [1/3] arm/fvp-base-r-aem: Upgrade to version 11.18.16 | expand

Commit Message

Peter Hoyes June 22, 2022, 1:36 p.m. UTC
From: Jiamei Xie <jiamei.xie@arm.com>

Arm generic timer provides different timers for different exception
levels and different secure states. Because Armv8-R AArch64 has secure
state only, the valid timer for hypervisor in EL2 is secure hypervisor
physical timer. But for platform fvp-baser-aemv8r64, before FVP 11.18,
the secure hypervisor physical timer could not work well in EL2, so we
had been using Non-secure physical timer in EL2 for hypervisor as a
workaround.

Since secure hypervisor physical timer issue has been fixed from FVP
11.18, we can use this correct timer in EL2 for hypervisor now. So we
update the device tree timer node to use secure hypervisor physical
timer interrupt for hypervisor.

About the interrupt assignments of FVP, please refer to
https://developer.arm.com/documentation/100964/latest/Base-Platform/Base---interrupt-assignments

Issue-Id: SCM-4596
Signed-off-by: Jiamei Xie <jiamei.xie@arm.com>
Change-Id: I9d4b9f4e0ed14c6c1567269c83696ceb9ff84ac8
---
 .../linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts b/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts
index 1a4e501..6911a59 100644
--- a/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts
+++ b/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts
@@ -186,7 +186,7 @@ 
                 interrupts = <0x1 13 0xff08>,
                              <0x1 14 0xff08>,
                              <0x1 11 0xff08>,
-                             <0x1 10 0xff08>;
+                             <0x1  4 0xff08>;
                 clock-frequency = <100000000>;
         };