From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Wed, 12 Aug 2020 12:16:21 +0000 (+0100)
Subject: arch-arm: Use isSecure variable for Stage2Lookup
X-Git-Tag: v20.1.0.0~308
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fbe6cf41996b882522baf8f76ae72384acc47fe;p=gem5.git

arch-arm: Use isSecure variable for Stage2Lookup

TLB entries are tagged with the security state of the cpu instead
of the security attribute of the physical address

Change-Id: I728ba1c841de1ec6c1ee03aee012b185c968d078
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32639
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index dc4296d77..e8bb71805 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -1655,7 +1655,7 @@ TLB::getResultTe(TlbEntry **te, const RequestPtr &req,
             fault = checkPermissions(s1Te, req, mode);
         if (stage2Req & (fault == NoFault)) {
             Stage2LookUp *s2Lookup = new Stage2LookUp(this, stage2Tlb, *s1Te,
-                req, translation, mode, timing, functional, !(s1Te->ns),
+                req, translation, mode, timing, functional, isSecure,
                 curTranType);
             fault = s2Lookup->getTe(tc, mergeTe);
             if (s2Lookup->isComplete()) {