summaryrefslogtreecommitdiff
path: root/src/arch/arm
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2019-09-09 12:56:48 +0100
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2019-09-18 13:30:01 +0000
commit0e4c3437fdfb20e0f0d590e0d0abe32fc8393b3c (patch)
tree16b66c0a575eb0aa32251f657a30be5a06c2507c /src/arch/arm
parentf3fd7469677ab1f25533d82c36460a700831ceec (diff)
downloadgem5-0e4c3437fdfb20e0f0d590e0d0abe32fc8393b3c.tar.xz
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>
Diffstat (limited to 'src/arch/arm')
-rw-r--r--src/arch/arm/tlb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index a2737b946..1e8003c21 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -943,7 +943,7 @@ TLB::checkPermissions64(TlbEntry *te, const RequestPtr &req, Mode mode,
}
break;
case EL2:
- if (checkPAN(tc, ap, req, mode)) {
+ if (hcr.e2h && checkPAN(tc, ap, req, mode)) {
grant = false;
break;
}