72c72,78
< if (mshr->blkAddr == blk_addr && mshr->isSecure == is_secure) {
---
> // we ignore any MSHRs allocated for uncacheable accesses and
> // simply ignore them when matching, in the cache we never
> // check for matches when adding new uncacheable entries, and
> // we do not want normal cacheable accesses being added to an
> // MSHR serving an uncacheable access
> if (!mshr->isUncacheable() && mshr->blkAddr == blk_addr &&
> mshr->isSecure == is_secure) {
87c93,94
< if (mshr->blkAddr == blk_addr && mshr->isSecure == is_secure) {
---
> if (!mshr->isUncacheable() && mshr->blkAddr == blk_addr &&
> mshr->isSecure == is_secure) {