2c2
< * Copyright (c) 2011-2013 ARM Limited
---
> * Copyright (c) 2011-2013, 2015 ARM Limited
153,154c153,160
< // 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;
> }
155a162,167
> // 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;
>
165,166c177
< bool expects_response = pkt->needsResponse() &&
< !pkt->memInhibitAsserted();
---
> bool expects_response = pkt->needsResponse();