summaryrefslogtreecommitdiff
path: root/src/dev
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2011-12-15 00:09:46 -0500
committerAli Saidi <saidi@eecs.umich.edu>2011-12-15 00:09:46 -0500
commit94ce9712787c59720727890893ded8a533158e2d (patch)
tree07368889866d11ef9438126632498c09cc5ffd6a /src/dev
parent6ef9691035623ba6945e237a41f0dca04db637bb (diff)
downloadgem5-94ce9712787c59720727890893ded8a533158e2d.tar.xz
IO: Fix bug in DMA Device where receiving a snoop on DMA port would cause a panic.
--HG-- extra : rebase_source : 8152d4fa7d7354c9f150a450ae0710e95141ba4b
Diffstat (limited to 'src/dev')
-rw-r--r--src/dev/io_device.cc8
1 files changed, 2 insertions, 6 deletions
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;