david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-arm: Correct condition for taking VIRQ and VFIQ

Browse Source 
The VIRQ and VFIQ exceptions are (as the comments say) only
taken if the CPU is in Non-secure state and the IMO/FMO bits
are set to enable virtualized interrupts. Correct the code
to actually implement this.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1414684132-23971-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2014-10-30 15:48:52 +00:00
parent b5c633c5bd
commit 9fae24f554
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-arm/cpu.h
View File

@ -1269,13 +1269,13 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx)
} }
return !(env->daif & PSTATE_I); return !(env->daif & PSTATE_I);
case EXCP_VFIQ: case EXCP_VFIQ:
if (!secure && !(env->cp15.hcr_el2 & HCR_FMO)) { if (secure || !(env->cp15.hcr_el2 & HCR_FMO)) {
/* VFIQs are only taken when hypervized and non-secure. */ /* VFIQs are only taken when hypervized and non-secure. */
return false; return false;
} }
return !(env->daif & PSTATE_F); return !(env->daif & PSTATE_F);
case EXCP_VIRQ: case EXCP_VIRQ:
if (!secure && !(env->cp15.hcr_el2 & HCR_IMO)) { if (secure || !(env->cp15.hcr_el2 & HCR_IMO)) {
/* VIRQs are only taken when hypervized and non-secure. */ /* VIRQs are only taken when hypervized and non-secure. */
return false; return false;
} }