[PULL,05/33] target/arm: add arm_is_el2_enabled() helper

Commit Message

Peter Maydell Jan. 19, 2021, 3:10 p.m. UTC

From: Rémi Denis-Courmont <[e-mail]>

This checks if EL2 is enabled (meaning EL2 registers take effects) in
the current security context.

Signed-off-by: Rémi Denis-Courmont <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Peter Maydell <[e-mail]>
---
 target/arm/cpu.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Patch

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index f58aada4104..0bdda90914a 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2148,6 +2148,18 @@  static inline bool arm_is_secure(CPUARMState *env)
     return arm_is_secure_below_el3(env);
 }
 
+/*
+ * Return true if the current security state has AArch64 EL2 or AArch32 Hyp.
+ * This corresponds to the pseudocode EL2Enabled()
+ */
+static inline bool arm_is_el2_enabled(CPUARMState *env)
+{
+    if (arm_feature(env, ARM_FEATURE_EL2)) {
+        return !arm_is_secure_below_el3(env);
+    }
+    return false;
+}
+
 #else
 static inline bool arm_is_secure_below_el3(CPUARMState *env)
 {
@@ -2158,6 +2170,11 @@  static inline bool arm_is_secure(CPUARMState *env)
 {
     return false;
 }
+
+static inline bool arm_is_el2_enabled(CPUARMState *env)
+{
+    return false;
+}
 #endif
 
 /**