From: Andreas Hansson <andreas.hansson@arm.com>
Date: Thu, 30 May 2013 16:53:57 +0000 (-0400)
Subject: mem: Check for waiting state in bus draining
X-Git-Tag: stable_2013_10_14~94
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82397921a5e1ba4cd1e6b5a39f2b9407161d8818;p=gem5.git

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.
---

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();