From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 15 May 2015 17:40:01 +0000 (-0400)
Subject: arm: Identify table-walker requests
X-Git-Tag: stable_2015_09_03~39
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=99d3fa594565660d8d51fbda005e3c2213723fef;p=gem5.git

arm: Identify table-walker requests

This patch ensures all page-table walks are flagged as such.
---

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 91e7f601e..e92971b7d 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -525,9 +525,9 @@ TableWalker::processWalk()
         return f;
     }
 
-    Request::Flags flag = 0;
+    Request::Flags flag = Request::PT_WALK;
     if (currState->sctlr.c == 0) {
-        flag = Request::UNCACHEABLE;
+        flag.set(Request::UNCACHEABLE);
     }
 
     bool delayed;
@@ -553,7 +553,7 @@ TableWalker::processWalkLPAE()
 
     statWalkWaitTime.sample(curTick() - currState->startTime);
 
-    Request::Flags flag = 0;
+    Request::Flags flag = Request::PT_WALK;
     if (currState->isSecure)
         flag.set(Request::SECURE);
 
@@ -689,7 +689,7 @@ TableWalker::processWalkLPAE()
     }
 
     if (currState->sctlr.c == 0) {
-        flag = Request::UNCACHEABLE;
+        flag.set(Request::UNCACHEABLE);
     }
 
     if (currState->isSecure)
@@ -936,9 +936,9 @@ TableWalker::processWalkAArch64()
         return f;
     }
 
-    Request::Flags flag = 0;
+    Request::Flags flag = Request::PT_WALK;
     if (currState->sctlr.c == 0) {
-        flag = Request::UNCACHEABLE;
+        flag.set(Request::UNCACHEABLE);
     }
 
     currState->longDesc.lookupLevel = start_lookup_level;
@@ -1452,7 +1452,7 @@ TableWalker::doL1Descriptor()
                 return;
             }
 
-            Request::Flags flag = 0;
+            Request::Flags flag = Request::PT_WALK;
             if (currState->isSecure)
                 flag.set(Request::SECURE);
 
@@ -1633,7 +1633,7 @@ TableWalker::doLongDescriptor()
                 return;
             }
 
-            Request::Flags flag = 0;
+            Request::Flags flag = Request::PT_WALK;
             if (currState->secureLookup)
                 flag.set(Request::SECURE);