projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inorder: squash on memory stall
[gem5.git]
/
src
/
dev
/
io_device.cc
diff --git
a/src/dev/io_device.cc
b/src/dev/io_device.cc
index 85d78ee8d25d4bec50d7d9e633aecc777f2275f8..cdba171a6017d21b9f9a255e9f511f4a65c47c1d 100644
(file)
--- a/
src/dev/io_device.cc
+++ b/
src/dev/io_device.cc
@@
-32,7
+32,6
@@
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "dev/io_device.hh"
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "dev/io_device.hh"
-#include "sim/builder.hh"
#include "sim/system.hh"
#include "sim/system.hh"
@@
-55,6
+54,10
@@
PioPort::getDeviceAddressRanges(AddrRangeList &resp, bool &snoop)
}
}
+PioDevice::PioDevice(const Params *p)
+ : MemObject(p), platform(p->platform), sys(p->system), pioPort(NULL)
+{}
+
PioDevice::~PioDevice()
{
if (pioPort)
PioDevice::~PioDevice()
{
if (pioPort)
@@
-82,6
+85,11
@@
PioDevice::drain(Event *de)
return count;
}
return count;
}
+BasicPioDevice::BasicPioDevice(const Params *p)
+ : PioDevice(p), pioAddr(p->pio_addr), pioSize(0),
+ pioDelay(p->pio_latency)
+{}
+
void
BasicPioDevice::addressRanges(AddrRangeList &range_list)
{
void
BasicPioDevice::addressRanges(AddrRangeList &range_list)
{
@@
-109,7
+117,7
@@
DmaPort::recvTiming(PacketPtr pkt)
else if (backoffTime < device->maxBackoffDelay)
backoffTime <<= 1;
else if (backoffTime < device->maxBackoffDelay)
backoffTime <<= 1;
-
backoffEvent.reschedule(
curTick + backoffTime, true);
+
reschedule(backoffEvent,
curTick + backoffTime, true);
DPRINTF(DMA, "Backoff time set to %d ticks\n", backoffTime);
DPRINTF(DMA, "Backoff time set to %d ticks\n", backoffTime);
@@
-130,7
+138,10
@@
DmaPort::recvTiming(PacketPtr pkt)
state->numBytes += pkt->req->getSize();
assert(state->totBytes >= state->numBytes);
if (state->totBytes == state->numBytes) {
state->numBytes += pkt->req->getSize();
assert(state->totBytes >= state->numBytes);
if (state->totBytes == state->numBytes) {
- state->completionEvent->process();
+ if (state->delay)
+ schedule(state->completionEvent, curTick + state->delay);
+ else
+ state->completionEvent->process();
delete state;
}
delete pkt->req;
delete state;
}
delete pkt->req;
@@
-147,7
+158,7
@@
DmaPort::recvTiming(PacketPtr pkt)
return true;
}
return true;
}
-DmaDevice::DmaDevice(Params *p)
+DmaDevice::DmaDevice(
const
Params *p)
: PioDevice(p), dmaPort(NULL), minBackoffDelay(p->min_backoff_delay),
maxBackoffDelay(p->max_backoff_delay)
{ }
: PioDevice(p), dmaPort(NULL), minBackoffDelay(p->min_backoff_delay),
maxBackoffDelay(p->max_backoff_delay)
{ }
@@
-179,9
+190,9
@@
void
DmaPort::recvRetry()
{
assert(transmitList.size());
DmaPort::recvRetry()
{
assert(transmitList.size());
- PacketPtr pkt = transmitList.front();
bool result = true;
do {
bool result = true;
do {
+ PacketPtr pkt = transmitList.front();
DPRINTF(DMA, "Retry on %s addr %#x\n",
pkt->cmdString(), pkt->getAddr());
result = sendTiming(pkt);
DPRINTF(DMA, "Retry on %s addr %#x\n",
pkt->cmdString(), pkt->getAddr());
result = sendTiming(pkt);
@@
-198,7
+209,7
@@
DmaPort::recvRetry()
if (transmitList.size() && backoffTime && !inRetry) {
DPRINTF(DMA, "Scheduling backoff for %d\n", curTick+backoffTime);
if (!backoffEvent.scheduled())
if (transmitList.size() && backoffTime && !inRetry) {
DPRINTF(DMA, "Scheduling backoff for %d\n", curTick+backoffTime);
if (!backoffEvent.scheduled())
-
backoffEvent.schedule(backoffTime+
curTick);
+
schedule(backoffEvent, backoffTime +
curTick);
}
DPRINTF(DMA, "TransmitList: %d, backoffTime: %d inRetry: %d es: %d\n",
transmitList.size(), backoffTime, inRetry,
}
DPRINTF(DMA, "TransmitList: %d, backoffTime: %d inRetry: %d es: %d\n",
transmitList.size(), backoffTime, inRetry,
@@
-208,13
+219,13
@@
DmaPort::recvRetry()
void
DmaPort::dmaAction(Packet::Command cmd, Addr addr, int size, Event *event,
void
DmaPort::dmaAction(Packet::Command cmd, Addr addr, int size, Event *event,
- uint8_t *data)
+ uint8_t *data
, Tick delay
)
{
assert(event);
assert(device->getState() == SimObject::Running);
{
assert(event);
assert(device->getState() == SimObject::Running);
- DmaReqState *reqState = new DmaReqState(event, this, size);
+ DmaReqState *reqState = new DmaReqState(event, this, size
, delay
);
DPRINTF(DMA, "Starting DMA for addr: %#x size: %d sched: %d\n", addr, size,
DPRINTF(DMA, "Starting DMA for addr: %#x size: %d sched: %d\n", addr, size,
@@
-260,8
+271,8
@@
DmaPort::sendDma()
assert(transmitList.size());
PacketPtr pkt = transmitList.front();
assert(transmitList.size());
PacketPtr pkt = transmitList.front();
-
System
::MemoryMode state = sys->getMemoryMode();
- if (state ==
System::T
iming) {
+
Enums
::MemoryMode state = sys->getMemoryMode();
+ if (state ==
Enums::t
iming) {
if (backoffEvent.scheduled() || inRetry) {
DPRINTF(DMA, "Can't send immediately, waiting for retry or backoff timer\n");
return;
if (backoffEvent.scheduled() || inRetry) {
DPRINTF(DMA, "Can't send immediately, waiting for retry or backoff timer\n");
return;
@@
-286,9
+297,9
@@
DmaPort::sendDma()
!backoffEvent.scheduled()) {
DPRINTF(DMA, "-- Scheduling backoff timer for %d\n",
backoffTime+curTick);
!backoffEvent.scheduled()) {
DPRINTF(DMA, "-- Scheduling backoff timer for %d\n",
backoffTime+curTick);
-
backoffEvent.schedule(backoffTime+
curTick);
+
schedule(backoffEvent, backoffTime +
curTick);
}
}
- } else if (state ==
System::A
tomic) {
+ } else if (state ==
Enums::a
tomic) {
transmitList.pop_front();
Tick lat;
transmitList.pop_front();
Tick lat;
@@
-306,7
+317,7
@@
DmaPort::sendDma()
if (state->totBytes == state->numBytes) {
assert(!state->completionEvent->scheduled());
if (state->totBytes == state->numBytes) {
assert(!state->completionEvent->scheduled());
- s
tate->completionEvent->schedule(curTick + lat
);
+ s
chedule(state->completionEvent, curTick + lat + state->delay
);
delete state;
delete pkt->req;
}
delete state;
delete pkt->req;
}
@@
-328,5
+339,3
@@
DmaDevice::~DmaDevice()
if (dmaPort)
delete dmaPort;
}
if (dmaPort)
delete dmaPort;
}
-
-