summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2015-11-06 03:26:09 -0500
committerAndreas Sandberg <andreas.sandberg@arm.com>2015-11-06 03:26:09 -0500
commit3747e178ed11ef0d73a50443bc9dc5498a91b1c9 (patch)
tree31bf648b6d100d7db1589d5014d8d2cd58922f21
parent6433a1074980b9a236eb7cef993ee3de5d684037 (diff)
downloadgem5-3747e178ed11ef0d73a50443bc9dc5498a91b1c9.tar.xz
mem: Check the XBar's port queues on functional snoops
The CoherentXBar currently doesn't check its queued slave ports when receiving a functional snoop. This caused data corruption in cases when a modified cache lines is forwarded between two caches. Add the required functional calls into the queued slave ports.
-rw-r--r--src/mem/coherent_xbar.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc
index cf438bc95..6a0136ea8 100644
--- a/src/mem/coherent_xbar.cc
+++ b/src/mem/coherent_xbar.cc
@@ -832,6 +832,14 @@ CoherentXBar::recvFunctionalSnoop(PacketPtr pkt, PortID master_port_id)
pkt->cmdString());
}
+ for (const auto& p : slavePorts) {
+ if (p->checkFunctional(pkt)) {
+ if (pkt->needsResponse())
+ pkt->makeResponse();
+ return;
+ }
+ }
+
// forward to all snoopers
forwardFunctional(pkt, InvalidPortID);
}