summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-05-30 12:53:57 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2013-05-30 12:53:57 -0400
commit82397921a5e1ba4cd1e6b5a39f2b9407161d8818 (patch)
tree97d7495c01eaf278b25a5f119e62d9727287ab74
parentbf6291460d101a3051d7688b317800be6440208b (diff)
downloadgem5-82397921a5e1ba4cd1e6b5a39f2b9407161d8818.tar.xz
mem: Check for waiting state in bus draining
This patch fixes a bug in the bus where the bus transitions from busy to idle and still has a port that is waiting for a retry from a peer.
-rw-r--r--src/mem/bus.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 8546df565..41406e87a 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -259,7 +259,7 @@ BaseBus::Layer<PortClass>::releaseLayer()
// bus layer is now idle, so if someone is waiting we can retry
if (!waitingForLayer.empty()) {
retryWaiting();
- } else if (drainManager) {
+ } else if (waitingForPeer == NULL && drainManager) {
DPRINTF(Drain, "Bus done draining, signaling drain manager\n");
//If we weren't able to drain before, do it now.
drainManager->signalDrainDone();