| Message ID | 1462814989-24360-4-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 2016年05月10日 01:29, Peter Maydell wrote: > The GICv3 system registers need to know if the CPU is AArch64 > in EL3 or AArch32 in Monitor mode. This happens to be the first > part of the check for arm_is_secure(), so factor it out into a > new arm_is_el3_or_mon() function that the GIC can also use. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > target-arm/cpu.h | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/target-arm/cpu.h b/target-arm/cpu.h > index 066ff67..6ffc13b 100644 > --- a/target-arm/cpu.h > +++ b/target-arm/cpu.h > @@ -960,8 +960,8 @@ static inline bool arm_is_secure_below_el3(CPUARMState *env) > } > } > > -/* Return true if the processor is in secure state */ > -static inline bool arm_is_secure(CPUARMState *env) > +/* Return true if the CPU is AArch64 EL3 or AArch32 Mon */ > +static bool arm_is_el3_or_mon(CPUARMState *env) inline? > { > if (arm_feature(env, ARM_FEATURE_EL3)) { > if (is_a64(env) && extract32(env->pstate, 2, 2) == 3) { > @@ -973,6 +973,15 @@ static inline bool arm_is_secure(CPUARMState *env) > return true; > } > } > + return false; > +} > + > +/* Return true if the processor is in secure state */ > +static inline bool arm_is_secure(CPUARMState *env) > +{ > + if (arm_is_el3_or_mon(env)) { > + return true; > + } > return arm_is_secure_below_el3(env); > } > > Thanks, -- Shannon
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 066ff67..6ffc13b 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -960,8 +960,8 @@ static inline bool arm_is_secure_below_el3(CPUARMState *env) } } -/* Return true if the processor is in secure state */ -static inline bool arm_is_secure(CPUARMState *env) +/* Return true if the CPU is AArch64 EL3 or AArch32 Mon */ +static bool arm_is_el3_or_mon(CPUARMState *env) { if (arm_feature(env, ARM_FEATURE_EL3)) { if (is_a64(env) && extract32(env->pstate, 2, 2) == 3) { @@ -973,6 +973,15 @@ static inline bool arm_is_secure(CPUARMState *env) return true; } } + return false; +} + +/* Return true if the processor is in secure state */ +static inline bool arm_is_secure(CPUARMState *env) +{ + if (arm_is_el3_or_mon(env)) { + return true; + } return arm_is_secure_below_el3(env); }
The GICv3 system registers need to know if the CPU is AArch64 in EL3 or AArch32 in Monitor mode. This happens to be the first part of the check for arm_is_secure(), so factor it out into a new arm_is_el3_or_mon() function that the GIC can also use. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target-arm/cpu.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- 1.9.1