diff options
| -rw-r--r-- | configs/common/Caches.py | 1 | ||||
| -rw-r--r-- | configs/common/O3_ARM_v7a.py | 2 | ||||
| -rwxr-xr-x | src/arch/arm/stage2_mmu.hh | 34 | ||||
| -rw-r--r-- | src/arch/x86/pagetable_walker.hh | 8 |
4 files changed, 3 insertions, 42 deletions
diff --git a/configs/common/Caches.py b/configs/common/Caches.py index 9f7ac7a85..6687a967c 100644 --- a/configs/common/Caches.py +++ b/configs/common/Caches.py @@ -79,4 +79,5 @@ class PageTableWalkerCache(BaseCache): mshrs = 10 size = '1kB' tgts_per_mshr = 12 + forward_snoops = False is_top_level = True diff --git a/configs/common/O3_ARM_v7a.py b/configs/common/O3_ARM_v7a.py index 1bb2b4a5e..c291525ea 100644 --- a/configs/common/O3_ARM_v7a.py +++ b/configs/common/O3_ARM_v7a.py @@ -174,7 +174,7 @@ class O3_ARM_v7aWalkCache(BaseCache): assoc = 8 write_buffers = 16 is_top_level = True - + forward_snoops = False # L2 Cache class O3_ARM_v7aL2(BaseCache): diff --git a/src/arch/arm/stage2_mmu.hh b/src/arch/arm/stage2_mmu.hh index 41a10e623..132d1b7f5 100755 --- a/src/arch/arm/stage2_mmu.hh +++ b/src/arch/arm/stage2_mmu.hh @@ -57,40 +57,8 @@ class Stage2MMU : public SimObject protected: - /** - * A snooping DMA port that currently does nothing besides - * extending the DMA port to accept snoops without - * complaining. Currently we take no action on any snoops. - */ - class SnoopingDmaPort : public DmaPort - { - - protected: - - virtual void recvTimingSnoopReq(PacketPtr pkt) - { } - - virtual Tick recvAtomicSnoop(PacketPtr pkt) - { return 0; } - - virtual void recvFunctionalSnoop(PacketPtr pkt) - { } - - virtual bool isSnooping() const { return true; } - - public: - - /** - * A snooping DMA port merely calls the construtor of the DMA - * port. - */ - SnoopingDmaPort(MemObject *dev, System *s) : - DmaPort(dev, s) - { } - }; - /** Port to issue translation requests from */ - SnoopingDmaPort port; + DmaPort port; /** Request id for requests generated by this MMU */ MasterID masterId; diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh index 181d6fb6c..9be35e6cc 100644 --- a/src/arch/x86/pagetable_walker.hh +++ b/src/arch/x86/pagetable_walker.hh @@ -70,15 +70,7 @@ namespace X86ISA Walker *walker; bool recvTimingResp(PacketPtr pkt); - - /** - * Snooping a coherence request, do nothing. - */ - void recvTimingSnoopReq(PacketPtr pkt) { } - Tick recvAtomicSnoop(PacketPtr pkt) { return 0; } - void recvFunctionalSnoop(PacketPtr pkt) { } void recvReqRetry(); - bool isSnooping() const { return true; } }; friend class WalkerPort; |