From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 15 Dec 2011 05:09:46 +0000 (-0500)
Subject: IO: Fix bug in DMA Device where receiving a snoop on DMA port would cause a panic.
X-Git-Tag: stable_2012_02_02
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94ce9712787c59720727890893ded8a533158e2d;p=gem5.git

IO: Fix bug in DMA Device where receiving a snoop on DMA port would cause a panic.

--HG--
extra : rebase_source : 8152d4fa7d7354c9f150a450ae0710e95141ba4b
---

diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index 5c13b5091..dab1f766e 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -142,13 +142,9 @@ DmaPort::recvTiming(PacketPtr pkt)
 
         pkt->reinitNacked();
         queueDma(pkt, true);
+    } else if (pkt->isRequest() && recvSnoops) {
+        return true; 
     } else if (pkt->senderState) {
-        if (recvSnoops) {
-            if (pkt->isRequest()) {
-                return true;
-            }
-        }
-
         DmaReqState *state;
         backoffTime >>= 2;