| Message ID | 1414684132-23971-3-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> --- Sent from my phone On Oct 30, 2014 9:18 PM, "Peter Maydell" <peter.maydell@linaro.org> wrote: > 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> > --- > target-arm/cpu.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target-arm/cpu.h b/target-arm/cpu.h > index 97eaf79..7f80090 100644 > --- a/target-arm/cpu.h > +++ b/target-arm/cpu.h > @@ -1269,13 +1269,13 @@ static inline bool arm_excp_unmasked(CPUState *cs, > unsigned int excp_idx) > } > return !(env->daif & PSTATE_I); > 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. */ > 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)) { > /* VIRQs are only taken when hypervized and non-secure. */ > return false; > } > -- > 1.9.1 > >
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 97eaf79..7f80090 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -1269,13 +1269,13 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx) } return !(env->daif & PSTATE_I); 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. */ 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)) { /* VIRQs are only taken when hypervized and non-secure. */ return false; }
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> --- target-arm/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)