derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEM: Add a snooping DMA port subclass for table walker

Browse Source 
This patch makes the (device) DmaPort non-snooping and removes the
recvSnoop constructor parameter and instead introduces a
SnoopingDmaPort subclass for the ARM table walker.

Functionality is unchanged, as are the stats, and the patch merely
clarifies that the normal DMA ports are not snooping (although they
may issue requests that are snooped by others, as done with PCI, PCIe,
AMBA4 ACE etc).

Currently this port is declared in the ARM table walker as it is not
used anywhere else. If other ports were to have similar behaviour it
could be moved in a future patch.
This commit is contained in:
Andreas Hansson
2012-05-23 09:14:12 -04:00
parent 31b4ac5cec
commit 5b36cf623c
4 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dev/io_device.cc
View File

@@ -120,13 +120,12 @@ BasicPioDevice::getAddrRanges()
}
DmaPort::DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff,
bool recv_snoops)
: MasterPort(dev->name() + "-dmaport", dev), device(dev), sys(s),
DmaPort::DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff)
: MasterPort(dev->name() + "-dma", dev), device(dev), sys(s),
masterId(s->getMasterId(dev->name())),
pendingCount(0), actionInProgress(0), drainEvent(NULL),
backoffTime(0), minBackoffDelay(min_backoff),
maxBackoffDelay(max_backoff), inRetry(false), recvSnoops(recv_snoops),
maxBackoffDelay(max_backoff), inRetry(false),
backoffEvent(this)
{ }

27
src/dev/io_device.hh
View File

@@ -143,34 +143,10 @@ class DmaPort : public MasterPort
* it is that it's sending. */
bool inRetry;
/** Port accesses a cache which requires snooping */
bool recvSnoops;
virtual bool recvTimingResp(PacketPtr pkt);
virtual void recvTimingSnoopReq(PacketPtr pkt)
{
if (!recvSnoops)
panic("%s was not expecting a snoop\n", name());
}
virtual Tick recvAtomicSnoop(PacketPtr pkt)
{
if (!recvSnoops)
panic("%s was not expecting a snoop\n", name());
return 0;
}
virtual void recvFunctionalSnoop(PacketPtr pkt)
{
if (!recvSnoops)
panic("%s was not expecting a snoop\n", name());
}
virtual void recvRetry() ;
virtual bool isSnooping() const { return recvSnoops; }
void queueDma(PacketPtr pkt, bool front = false);
void sendDma();
@@ -178,8 +154,7 @@ class DmaPort : public MasterPort
EventWrapper<DmaPort, &DmaPort::sendDma> backoffEvent;
public:
DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff,
bool recv_snoops = false);
DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff);
void dmaAction(Packet::Command cmd, Addr addr, int size, Event *event,
uint8_t *data, Tick delay, Request::Flags flag = 0);