[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/23] target-arm: Define new arm_is_el3_or_mon() fu
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 03/23] target-arm: Define new arm_is_el3_or_mon() function |
Date: |
Mon, 9 May 2016 18:29:29 +0100 |
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 <address@hidden>
---
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)
{
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);
}
--
1.9.1
- Re: [Qemu-devel] [PATCH 06/23] hw/intc/arm_gicv3: Add state information, (continued)
- [Qemu-devel] [PATCH 08/23] hw/intc/arm_gicv3: Add vmstate descriptors, Peter Maydell, 2016/05/09
- [Qemu-devel] [PATCH 09/23] hw/intc/arm_gicv3: ARM GICv3 device framework, Peter Maydell, 2016/05/09
- [Qemu-devel] [PATCH 17/23] hw/intc/arm_gicv3: Implement CPU i/f SGI generation registers, Peter Maydell, 2016/05/09
- [Qemu-devel] [PATCH 03/23] target-arm: Define new arm_is_el3_or_mon() function,
Peter Maydell <=
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Shannon Zhao, 2016/05/11
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Peter Maydell, 2016/05/12
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Shannon Zhao, 2016/05/12
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Peter Maydell, 2016/05/12
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Shannon Zhao, 2016/05/12
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Peter Maydell, 2016/05/12
- Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Shannon Zhao, 2016/05/13
Re: [Qemu-devel] [PATCH 00/23] GICv3 emulation, Shannon Zhao, 2016/05/25