From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Mon, 7 Jan 2013 18:05:32 +0000 (-0500)
Subject: cache: add note about where conflicts are handled
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a645d6e9bfc58fd93e4c706e8ee7103a3067942;p=gem5.git

cache: add note about where conflicts are handled
---

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index a7c9a4a55..fc01e2c06 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -520,7 +520,10 @@ Cache<TagStore>::timingAccess(PacketPtr pkt)
         MSHR *mshr = mshrQueue.findMatch(blk_addr);
 
         if (mshr) {
-            // MSHR hit
+            /// MSHR hit
+            /// @note writebacks will be checked in getNextMSHR()
+            /// for any conflicting requests to the same block
+
             //@todo remove hw_pf here
             assert(pkt->req->masterId() < system->maxMasters());
             mshr_hits[pkt->cmdToIndex()][pkt->req->masterId()]++;