[PULL,06/21] target/arm: Make CNTPS_* UNDEF from Secure EL1 when Secure EL2 is enabled

Commit Message

Peter Maydell March 7, 2025, 3:06 p.m. UTC

When we added Secure EL2 support, we missed that this needs an update
to the access code for the EL3 physical timer registers.  These are
supposed to UNDEF from Secure EL1 when Secure EL2 is enabled.

(Note for stable backporting: for backports to branches where
CP_ACCESS_UNDEFINED is not defined, the old name to use instead
is CP_ACCESS_TRAP_UNCATEGORIZED.)

Cc: [e-mail]
Signed-off-by: Peter Maydell <[e-mail]>
Reviewed-by: Alex Bennée <[e-mail]>
Message-id: [e-mail]
---
 target/arm/helper.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 5729b313f84..5b6de446ace 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -2387,6 +2387,9 @@  static CPAccessResult gt_stimer_access(CPUARMState *env,
         if (!arm_is_secure(env)) {
             return CP_ACCESS_UNDEFINED;
         }
+        if (arm_is_el2_enabled(env)) {
+            return CP_ACCESS_UNDEFINED;
+        }
         if (!(env->cp15.scr_el3 & SCR_ST)) {
             return CP_ACCESS_TRAP_EL3;
         }