commit 0e4c3437fdfb20e0f0d590e0d0abe32fc8393b3c
author Giacomo Travaglini <giacomo.travaglini@arm.com> Mon Sep 09 12:56:48 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Wed Sep 18 13:30:01 2019 +0000
tree 16b66c0a575eb0aa32251f657a30be5a06c2507c
parent f3fd7469677ab1f25533d82c36460a700831ceec

arch-arm: PSTATE.PAN affecting EL2 only when HCR_EL2.E2H=1

Change-Id: I6df0cdcbadca17f30d3de3bed887f75c739b00f0
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20979
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/arch/arm/tlb.cc

diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index a2737b9..1e8003c 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -943,7 +943,7 @@
             }
             break;
           case EL2:
-            if (checkPAN(tc, ap, req, mode)) {
+            if (hcr.e2h && checkPAN(tc, ap, req, mode)) {
                 grant = false;
                 break;
             }