summaryrefslogtreecommitdiff
path: root/src/arch/arm/stage2_mmu.cc
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2015-03-02 04:00:42 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2015-03-02 04:00:42 -0500
commitd64b34bef82e6ea8a2438d92224d8d093df47d59 (patch)
tree508d527a16f07d9f3d456143a594c01667a20b8d /src/arch/arm/stage2_mmu.cc
parentbd70db552112570e41838748f0d2a5168acd974a (diff)
downloadgem5-d64b34bef82e6ea8a2438d92224d8d093df47d59.tar.xz
arm: Share a port for the two table walker objects
This patch changes how the MMU and table walkers are created such that a single port is used to connect the MMU and the TLBs to the memory system. Previously two ports were needed as there are two table walker objects (stage one and stage two), and they both had a port. Now the port itself is moved to the Stage2MMU, and each TableWalker is simply using the port from the parent. By using the same port we also remove the need for having an additional crossbar joining the two ports before the walker cache or the L2. This simplifies the creation of the CPU cache topology in BaseCPU.py considerably. Moreover, for naming and symmetry reasons, the TLB walker port is connected through the stage-one table walker thus making the naming identical to x86. Along the same line, we use the stage-one table walker to generate the master id that is used by all TLB-related requests.
Diffstat (limited to 'src/arch/arm/stage2_mmu.cc')
-rwxr-xr-xsrc/arch/arm/stage2_mmu.cc43
1 files changed, 25 insertions, 18 deletions
diff --git a/src/arch/arm/stage2_mmu.cc b/src/arch/arm/stage2_mmu.cc
index 672fccdbe..b7f3d07ab 100755
--- a/src/arch/arm/stage2_mmu.cc
+++ b/src/arch/arm/stage2_mmu.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 ARM Limited
+ * Copyright (c) 2012-2013, 2015 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -37,29 +37,31 @@
* Authors: Thomas Grocutt
*/
-#include "arch/arm/faults.hh"
#include "arch/arm/stage2_mmu.hh"
+#include "arch/arm/faults.hh"
#include "arch/arm/system.hh"
+#include "arch/arm/table_walker.hh"
#include "arch/arm/tlb.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
-#include "debug/Checkpoint.hh"
-#include "debug/TLB.hh"
-#include "debug/TLBVerbose.hh"
using namespace ArmISA;
Stage2MMU::Stage2MMU(const Params *p)
- : SimObject(p), _stage1Tlb(p->tlb), _stage2Tlb(p->stage2_tlb)
+ : SimObject(p), _stage1Tlb(p->tlb), _stage2Tlb(p->stage2_tlb),
+ port(_stage1Tlb->getTableWalker(), p->sys),
+ masterId(p->sys->getMasterId(_stage1Tlb->getTableWalker()->name()))
{
- stage1Tlb()->setMMU(this);
- stage2Tlb()->setMMU(this);
+ // we use the stage-one table walker as the parent of the port,
+ // and to get our master id, this is done to keep things
+ // symmetrical with other ISAs in terms of naming and stats
+ stage1Tlb()->setMMU(this, masterId);
+ stage2Tlb()->setMMU(this, masterId);
}
Fault
Stage2MMU::readDataUntimed(ThreadContext *tc, Addr oVAddr, Addr descAddr,
- uint8_t *data, int numBytes, Request::Flags flags, int masterId,
- bool isFunctional)
+ uint8_t *data, int numBytes, Request::Flags flags, bool isFunctional)
{
Fault fault;
@@ -77,9 +79,9 @@ Stage2MMU::readDataUntimed(ThreadContext *tc, Addr oVAddr, Addr descAddr,
Packet pkt = Packet(&req, MemCmd::ReadReq);
pkt.dataStatic(data);
if (isFunctional) {
- stage1Tlb()->getWalkerPort().sendFunctional(&pkt);
+ port.sendFunctional(&pkt);
} else {
- stage1Tlb()->getWalkerPort().sendAtomic(&pkt);
+ port.sendAtomic(&pkt);
}
assert(!pkt.isError());
}
@@ -96,8 +98,8 @@ Stage2MMU::readDataUntimed(ThreadContext *tc, Addr oVAddr, Addr descAddr,
Fault
Stage2MMU::readDataTimed(ThreadContext *tc, Addr descAddr,
- Stage2Translation *translation, int numBytes, Request::Flags flags,
- int masterId)
+ Stage2Translation *translation, int numBytes,
+ Request::Flags flags)
{
Fault fault;
// translate to physical address using the second stage MMU
@@ -128,10 +130,9 @@ Stage2MMU::Stage2Translation::finish(const Fault &_fault, RequestPtr req,
}
if (_fault == NoFault && !req->getFlags().isSet(Request::NO_ACCESS)) {
- DmaPort& port = parent.stage1Tlb()->getWalkerPort();
- port.dmaAction(MemCmd::ReadReq, req->getPaddr(), numBytes,
- event, data, tc->getCpuPtr()->clockPeriod(),
- req->getFlags());
+ parent.getPort().dmaAction(MemCmd::ReadReq, req->getPaddr(), numBytes,
+ event, data, tc->getCpuPtr()->clockPeriod(),
+ req->getFlags());
} else {
// We can't do the DMA access as there's been a problem, so tell the
// event we're done
@@ -139,6 +140,12 @@ Stage2MMU::Stage2Translation::finish(const Fault &_fault, RequestPtr req,
}
}
+unsigned int
+Stage2MMU::drain(DrainManager *dm)
+{
+ return port.drain(dm);
+}
+
ArmISA::Stage2MMU *
ArmStage2MMUParams::create()
{