Giacomo Travaglini has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/70471?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: arch-arm: VMPIDR_EL2 can be used in secure mode as well ...................................................................... arch-arm: VMPIDR_EL2 can be used in secure mode as well This was some old code still assuming EL2 is not implemented in secure mode. This is wrong since the introduction of FEAT_SEL2 in gem5 Change-Id: Ie7e112a83e64f33a98885e88504c2d6bc5070218 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Richard Cooper <richard.cooper@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70471 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- M src/arch/arm/utility.cc 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass Richard Cooper: Looks good to me, approved diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc index 6764569..05d1cab 100644 --- a/src/arch/arm/utility.cc +++ b/src/arch/arm/utility.cc @@ -139,8 +139,6 @@ { const ExceptionLevel current_el = currEL(tc); - const bool is_secure = isSecureBelowEL3(tc); - switch (current_el) { case EL0: // Note: in MsrMrs instruction we read the register value before @@ -150,7 +148,7 @@ warn_once("Trying to read MPIDR at EL0\n"); [[fallthrough]]; case EL1: - if (ArmSystem::haveEL(tc, EL2) && !is_secure) + if (EL2Enabled(tc)) return tc->readMiscReg(MISCREG_VMPIDR_EL2); else return getMPIDR(arm_sys, tc); -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/70471?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: Ie7e112a83e64f33a98885e88504c2d6bc5070218 Gerrit-Change-Number: 70471 Gerrit-PatchSet: 3 Gerrit-Owner: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Andreas Sandberg <andreas.sandberg@arm.com> Gerrit-Reviewer: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>