summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-07-25 07:47:37 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2007-07-25 07:47:37 -0700
commitc1097d06f7b27f4dd6ecaa47d1685e015725b5f5 (patch)
treeb8b89da7efcf25cf6b0d2d12a934097355ad15e9
parentde52eebd3bbdeebadd5d7e7ce5f16dd68efb8301 (diff)
downloadgem5-c1097d06f7b27f4dd6ecaa47d1685e015725b5f5.tar.xz
Can't block on memInhibit packets
(now that bus no longer filters them for us). --HG-- extra : convert_revision : 34e7eaf5ee1e739f5557a2d417e569ed2ceb14b3
-rw-r--r--src/mem/cache/cache_impl.hh2
1 files changed, 1 insertions, 1 deletions
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;