From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 29 Jul 2007 20:24:48 +0000 (-0700)
Subject: bus: take out response prioritization (timing was messed up).
X-Git-Tag: m5_2.0_beta4~195^2~19
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a7d0c4b79450e05b87da4cfc48c2361758127c1;p=gem5.git

bus: take out response prioritization (timing was messed up).
Also make express snoops not occupy bus (since they're magic).

--HG--
extra : convert_revision : 75aa5211a59380026d1e3f122778425e48e2edcd
---

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 518c9dbfa..cb359734b 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -180,7 +180,7 @@ Bus::recvTiming(PacketPtr pkt)
 
     // If the bus is busy, or other devices are in line ahead of the current
     // one, put this device on the retry list.
-    if (!(pkt->isResponse() || pkt->isExpressSnoop()) &&
+    if (!pkt->isExpressSnoop() &&
         (tickNextIdle > curTick ||
          (retryList.size() && (!inRetry || src_port != retryList.front()))))
     {
@@ -189,7 +189,9 @@ Bus::recvTiming(PacketPtr pkt)
         return false;
     }
 
-    occupyBus(pkt);
+    if (!pkt->isExpressSnoop()) {
+        occupyBus(pkt);
+    }
 
     short dest = pkt->getDest();
     int dest_port_id;