diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2015-05-05 03:22:29 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-05-05 03:22:29 -0400 |
| commit | 36f29496a019af4483430f17c4a6028b8dcfb2cf (patch) | |
| tree | 28da4a1a1f29340fa7c95896427bf9c15da582d0 /src/cpu/o3/cpu.cc | |
| parent | 554ddc7c074b0d9793a6c4972e1c449a57b94590 (diff) | |
| download | gem5-36f29496a019af4483430f17c4a6028b8dcfb2cf.tar.xz | |
mem: Snoop into caches on uncacheable accesses
This patch takes a last step in fixing issues related to uncacheable
accesses. We do not separate uncacheable memory from uncacheable
devices, and in cases where it is really memory, there are valid
scenarios where we need to snoop since we do not support cache
maintenance instructions (yet). On snooping an uncacheable access we
thus provide data if possible. In essence this makes uncacheable
accesses IO coherent.
The snoop filter is also queried to steer the snoops, but not updated
since the uncacheable accesses do not allocate a block.
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 715a530d7..34ef275a7 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -92,8 +92,9 @@ bool FullO3CPU<Impl>::IcachePort::recvTimingResp(PacketPtr pkt) { DPRINTF(O3CPU, "Fetch unit received timing\n"); - // We shouldn't ever get a block in ownership state - assert(!(pkt->memInhibitAsserted() && !pkt->sharedAsserted())); + // We shouldn't ever get a cacheable block in ownership state + assert(pkt->req->isUncacheable() || + !(pkt->memInhibitAsserted() && !pkt->sharedAsserted())); fetch->processCacheCompletion(pkt); return true; |