diff options
Diffstat (limited to 'src/mem/bridge.cc')
| -rw-r--r-- | src/mem/bridge.cc | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc index ecaf6de04..855f39de3 100644 --- a/src/mem/bridge.cc +++ b/src/mem/bridge.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 ARM Limited + * Copyright (c) 2011-2013, 2015 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -150,8 +150,20 @@ Bridge::BridgeSlavePort::recvTimingReq(PacketPtr pkt) DPRINTF(Bridge, "recvTimingReq: %s addr 0x%x\n", pkt->cmdString(), pkt->getAddr()); - // we should not see a timing request if we are already in a retry - assert(!retryReq); + // sink inhibited packets without further action, also discard any + // packet that is not a read or a write + if (pkt->memInhibitAsserted() || + !(pkt->isWrite() || pkt->isRead())) { + assert(!pkt->needsResponse()); + pendingDelete.reset(pkt); + return true; + } + + // we should not get a new request after committing to retry the + // current one, but unfortunately the CPU violates this rule, so + // simply ignore it for now + if (retryReq) + return false; DPRINTF(Bridge, "Response queue size: %d outresp: %d\n", transmitList.size(), outstandingResponses); @@ -162,8 +174,7 @@ Bridge::BridgeSlavePort::recvTimingReq(PacketPtr pkt) retryReq = true; } else { // look at the response queue if we expect to see a response - bool expects_response = pkt->needsResponse() && - !pkt->memInhibitAsserted(); + bool expects_response = pkt->needsResponse(); if (expects_response) { if (respQueueFull()) { DPRINTF(Bridge, "Response queue full\n"); |