From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 25 Jul 2007 14:47:37 +0000 (-0700)
Subject: Can't block on memInhibit packets
X-Git-Tag: m5_2.0_beta4~195^2~33
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1097d06f7b27f4dd6ecaa47d1685e015725b5f5;p=gem5.git

Can't block on memInhibit packets
(now that bus no longer filters them for us).

--HG--
extra : convert_revision : 34e7eaf5ee1e739f5557a2d417e569ed2ceb14b3
---

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 412d10599..fa2f45632 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -1230,7 +1230,7 @@ bool
 Cache<TagStore>::CpuSidePort::recvTiming(PacketPtr pkt)
 {
     // illegal to block responses... can lead to deadlock
-    if (pkt->isRequest() && blocked) {
+    if (pkt->isRequest() && !pkt->memInhibitAsserted() && blocked) {
         DPRINTF(Cache,"Scheduling a retry while blocked\n");
         mustSendRetry = true;
         return false;