From aefae9d6f8768128b8797534f76b3e7b9e409af4 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 29 Jan 2019 13:22:11 +0000 Subject: arch-arm: Fix Virtual interrupts in AArch64 Checking if cpsr.mode is equal to MODE_HYP doesn't work for AArch64. This is because AArch64 is using different modes when in EL2, like EL2T and EL2H. This made Virtual Interrupts to be triggered even when executing in EL2 (hypervisor) whereas they should interrupt the scheduled VM only (Non-Secure EL0 and EL1). This patch is fixing this by using the generic currEL() helper for getting the exception level, which is working for both AArch32 and AArch64. Change-Id: I08640050ef06261f280ba1e63ca9f32c805af845 Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/16202 Maintainer: Andreas Sandberg --- src/arch/arm/interrupts.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/arm/interrupts.hh b/src/arch/arm/interrupts.hh index 77287e6dd..8d0cb49ea 100644 --- a/src/arch/arm/interrupts.hh +++ b/src/arch/arm/interrupts.hh @@ -142,7 +142,7 @@ class Interrupts : public SimObject CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); - bool isHypMode = cpsr.mode == MODE_HYP; + bool isHypMode = currEL(tc) == EL2; bool isSecure = inSecureState(tc); bool allowVIrq = !cpsr.i && hcr.imo && !isSecure && !isHypMode; bool allowVFiq = !cpsr.f && hcr.fmo && !isSecure && !isHypMode; @@ -232,7 +232,7 @@ class Interrupts : public SimObject // Calculate a few temp vars so we can work out if there's a pending // virtual interrupt, and if its allowed to happen // ARM ARM Issue C section B1.9.9, B1.9.11, and B1.9.13 - bool isHypMode = cpsr.mode == MODE_HYP; + bool isHypMode = currEL(tc) == EL2; bool isSecure = inSecureState(tc); bool allowVIrq = !cpsr.i && hcr.imo && !isSecure && !isHypMode; bool allowVFiq = !cpsr.f && hcr.fmo && !isSecure && !isHypMode; -- cgit v1.2.3