aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-24 12:59:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-02 13:17:45 +0100
commitd0e27874cf24ddc1ed7d48d2240658dbed5ef141 (patch)
tree4a32ce9ac2c4993b7226fd2cabe25203e632fecb
parentbc5070d55e747b2423c7e2ca9c9b46a20138fd15 (diff)
downloadqemu-arm-d0e27874cf24ddc1ed7d48d2240658dbed5ef141.tar.gz
target/arm: Mask virtual interrupts if HCR_EL2.TGE is set
If the "trap general exceptions" bit HCR_EL2.TGE is set, we must mask all virtual interrupts (as per DDI0487C.a D1.14.3). Implement this in arm_excp_unmasked(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180724115950.17316-2-peter.maydell@linaro.org
-rw-r--r--target/arm/cpu.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index e310ffc29d..efb2a8d3f3 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2261,13 +2261,15 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
break;
case EXCP_VFIQ:
- if (secure || !(env->cp15.hcr_el2 & HCR_FMO)) {
+ if (secure || !(env->cp15.hcr_el2 & HCR_FMO)
+ || (env->cp15.hcr_el2 & HCR_TGE)) {
/* VFIQs are only taken when hypervized and non-secure. */
return false;
}
return !(env->daif & PSTATE_F);
case EXCP_VIRQ:
- if (secure || !(env->cp15.hcr_el2 & HCR_IMO)) {
+ if (secure || !(env->cp15.hcr_el2 & HCR_IMO)
+ || (env->cp15.hcr_el2 & HCR_TGE)) {
/* VIRQs are only taken when hypervized and non-secure. */
return false;
}