Eden Avivi has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33496 )
Change subject: misc: Master/Slave terminology
......................................................................
misc: Master/Slave terminology
Changed SMMUMasterPort and SMMUSlavePort
Change-Id: I913d141d87207e0f416bc951e06ba7a4e778a839
---
M src/dev/arm/smmu_v3.hh
M src/dev/arm/smmu_v3_ports.cc
M src/dev/arm/smmu_v3_ports.hh
M src/dev/arm/smmu_v3_slaveifc.cc
M src/dev/arm/smmu_v3_slaveifc.hh
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/dev/arm/smmu_v3.hh b/src/dev/arm/smmu_v3.hh
index 8f35cdf..a1295a6 100644
--- a/src/dev/arm/smmu_v3.hh
+++ b/src/dev/arm/smmu_v3.hh
@@ -90,7 +90,7 @@
const System &system;
const MasterID masterId;
- SMMUMasterPort masterPort;
+ SMMURequestPort masterPort;
SMMUMasterTableWalkPort masterTableWalkPort;
SMMUControlPort controlPort;
diff --git a/src/dev/arm/smmu_v3_ports.cc b/src/dev/arm/smmu_v3_ports.cc
index e950f56..b6d5970 100644
--- a/src/dev/arm/smmu_v3_ports.cc
+++ b/src/dev/arm/smmu_v3_ports.cc
@@ -41,19 +41,19 @@
#include "dev/arm/smmu_v3.hh"
#include "dev/arm/smmu_v3_slaveifc.hh"
-SMMUMasterPort::SMMUMasterPort(const std::string &_name, SMMUv3 &_smmu) :
+SMMURequestPort::SMMURequestPort(const std::string &_name, SMMUv3 &_smmu) :
RequestPort(_name, &_smmu),
smmu(_smmu)
{}
bool
-SMMUMasterPort::recvTimingResp(PacketPtr pkt)
+SMMURequestPort::recvTimingResp(PacketPtr pkt)
{
return smmu.masterRecvTimingResp(pkt);
}
void
-SMMUMasterPort::recvReqRetry()
+SMMURequestPort::recvReqRetry()
{
return smmu.masterRecvReqRetry();
}
@@ -76,7 +76,7 @@
return smmu.masterTableWalkRecvReqRetry();
}
-SMMUSlavePort::SMMUSlavePort(const std::string &_name,
+SMMUResponsePort::SMMUResponsePort(const std::string &_name,
SMMUv3SlaveInterface &_ifc,
PortID _id)
:
@@ -86,20 +86,20 @@
{}
void
-SMMUSlavePort::recvFunctional(PacketPtr pkt)
+SMMUResponsePort::recvFunctional(PacketPtr pkt)
{
if (!respQueue.trySatisfyFunctional(pkt))
recvAtomic(pkt);
}
Tick
-SMMUSlavePort::recvAtomic(PacketPtr pkt)
+SMMUResponsePort::recvAtomic(PacketPtr pkt)
{
return ifc.recvAtomic(pkt);
}
bool
-SMMUSlavePort::recvTimingReq(PacketPtr pkt)
+SMMUResponsePort::recvTimingReq(PacketPtr pkt)
{
return ifc.recvTimingReq(pkt);
}
diff --git a/src/dev/arm/smmu_v3_ports.hh b/src/dev/arm/smmu_v3_ports.hh
index a8bf84e..15b37aa 100644
--- a/src/dev/arm/smmu_v3_ports.hh
+++ b/src/dev/arm/smmu_v3_ports.hh
@@ -44,7 +44,7 @@
class SMMUv3;
class SMMUv3SlaveInterface;
-class SMMUMasterPort : public RequestPort
+class SMMURequestPort : public RequestPort
{
protected:
SMMUv3 &smmu;
@@ -53,8 +53,8 @@
virtual void recvReqRetry();
public:
- SMMUMasterPort(const std::string &_name, SMMUv3 &_smmu);
- virtual ~SMMUMasterPort() {}
+ SMMURequestPort(const std::string &_name, SMMUv3 &_smmu);
+ virtual ~SMMURequestPort() {}
};
// Separate master port to send MMU initiated requests on
@@ -71,7 +71,7 @@
virtual ~SMMUMasterTableWalkPort() {}
};
-class SMMUSlavePort : public QueuedResponsePort
+class SMMUResponsePort : public QueuedResponsePort
{
protected:
SMMUv3SlaveInterface &ifc;
@@ -82,10 +82,10 @@
virtual bool recvTimingReq(PacketPtr pkt);
public:
- SMMUSlavePort(const std::string &_name,
+ SMMUResponsePort(const std::string &_name,
SMMUv3SlaveInterface &_ifc,
PortID _id = InvalidPortID);
- virtual ~SMMUSlavePort() {}
+ virtual ~SMMUResponsePort() {}
virtual AddrRangeList getAddrRanges() const
{ return AddrRangeList { AddrRange(0, UINT64_MAX) }; }
diff --git a/src/dev/arm/smmu_v3_slaveifc.cc
b/src/dev/arm/smmu_v3_slaveifc.cc
index 5b3dd98..5d57b5c 100644
--- a/src/dev/arm/smmu_v3_slaveifc.cc
+++ b/src/dev/arm/smmu_v3_slaveifc.cc
@@ -59,7 +59,7 @@
mainTLBSem(p->tlb_slots),
microTLBLat(p->utlb_lat),
mainTLBLat(p->tlb_lat),
- slavePort(new SMMUSlavePort(csprintf("%s.slave", name()), *this)),
+ slavePort(new SMMUResponsePort(csprintf("%s.slave", name()), *this)),
atsSlavePort(name() + ".atsSlave", *this),
atsMasterPort(name() + ".atsMaster", *this),
portWidth(p->port_width),
diff --git a/src/dev/arm/smmu_v3_slaveifc.hh
b/src/dev/arm/smmu_v3_slaveifc.hh
index e1f8ef2..4aa2608 100644
--- a/src/dev/arm/smmu_v3_slaveifc.hh
+++ b/src/dev/arm/smmu_v3_slaveifc.hh
@@ -50,7 +50,7 @@
class SMMUTranslationProcess;
class SMMUv3;
-class SMMUSlavePort;
+class SMMUResponsePort;
class SMMUv3SlaveInterface : public ClockedObject
{
@@ -72,7 +72,7 @@
const Cycles microTLBLat;
const Cycles mainTLBLat;
- SMMUSlavePort *slavePort;
+ SMMUResponsePort *slavePort;
SMMUATSSlavePort atsSlavePort;
SMMUATSMasterPort atsMasterPort;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33496
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I913d141d87207e0f416bc951e06ba7a4e778a839
Gerrit-Change-Number: 33496
Gerrit-PatchSet: 1
Gerrit-Owner: Eden Avivi <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
