Update configuration for new default responder on bus
Update to devices to handle their own pci config space without pciconfigall
Remove most of pciconfigall, it now is a dumbdevice which gets it's address based on the bus it's supposed to respond for
Remove need for pci config space from platform, add registerPciDevice function to prevent more than one device from having same
bus:dev:func and interrupt
Remove pciconfigspace from pci devices, and py files
Add calcConfigAddr that returns address for config space based on bus/dev/function + offset
configs/test/fs.py:
Update configuration for new default responder on bus
src/dev/ide_ctrl.cc:
src/dev/ide_ctrl.hh:
src/dev/ns_gige.cc:
src/dev/ns_gige.hh:
src/dev/pcidev.cc:
src/dev/pcidev.hh:
Update to handle it's own pci config space without pciconfigall
src/dev/io_device.cc:
src/dev/io_device.hh:
change naming for pio port
break out recvTiming into two functions to reuse code
src/dev/pciconfigall.cc:
src/dev/pciconfigall.hh:
removing most of pciconfigall, it now is a dumbdevice which gets it's address based on the bus it's supposed to respond for
src/dev/pcireg.h:
add a max size for PCI config space (per PCI spec)
src/dev/platform.cc:
src/dev/platform.hh:
remove need for pci config space from platform, add registerPciDevice function to prevent more than one device from having same
bus:dev:func and interrupt
src/dev/sinic.cc:
remove pciconfigspace as it's no longer a needed parameter
src/dev/tsunami.cc:
src/dev/tsunami.hh:
src/dev/tsunami_pchip.cc:
src/dev/tsunami_pchip.hh:
add calcConfigAddr that returns address for config space based on bus/dev/function + offset (per PCI spec)
src/mem/bus.cc:
src/mem/bus.hh:
src/python/m5/objects/Bus.py:
add idea of default responder to bus
src/python/m5/objects/Pci.py:
add config port for pci devices
add latency, bus and size parameters for pci config all (min is 8MB, max is 256MB see pci spec)
--HG--
extra : convert_revision : 99db43b0a3a077f86611d6eaff6664a3885da7c9
269 lines
7.0 KiB
C++
269 lines
7.0 KiB
C++
/*
|
|
* Copyright (c) 2006 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Ali Saidi
|
|
* Nathan Binkert
|
|
*/
|
|
|
|
#include "base/trace.hh"
|
|
#include "dev/io_device.hh"
|
|
#include "sim/builder.hh"
|
|
|
|
|
|
PioPort::PioPort(PioDevice *dev, Platform *p, std::string pname)
|
|
: Port(dev->name() + pname), device(dev), platform(p)
|
|
{ }
|
|
|
|
|
|
Tick
|
|
PioPort::recvAtomic(Packet *pkt)
|
|
{
|
|
return device->recvAtomic(pkt);
|
|
}
|
|
|
|
void
|
|
PioPort::recvFunctional(Packet *pkt)
|
|
{
|
|
device->recvAtomic(pkt);
|
|
}
|
|
|
|
void
|
|
PioPort::getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop)
|
|
{
|
|
snoop.clear();
|
|
device->addressRanges(resp);
|
|
}
|
|
|
|
|
|
void
|
|
PioPort::recvRetry()
|
|
{
|
|
bool result = true;
|
|
while (result && transmitList.size()) {
|
|
result = Port::sendTiming(transmitList.front());
|
|
if (result)
|
|
transmitList.pop_front();
|
|
}
|
|
}
|
|
|
|
void
|
|
PioPort::SendEvent::process()
|
|
{
|
|
if (port->Port::sendTiming(packet))
|
|
return;
|
|
|
|
port->transmitList.push_back(packet);
|
|
}
|
|
|
|
void
|
|
PioPort::resendNacked(Packet *pkt) {
|
|
pkt->reinitNacked();
|
|
if (transmitList.size()) {
|
|
transmitList.push_front(pkt);
|
|
} else {
|
|
if (!Port::sendTiming(pkt))
|
|
transmitList.push_front(pkt);
|
|
}
|
|
};
|
|
|
|
|
|
bool
|
|
PioPort::recvTiming(Packet *pkt)
|
|
{
|
|
if (pkt->result == Packet::Nacked) {
|
|
resendNacked(pkt);
|
|
} else {
|
|
Tick latency = device->recvAtomic(pkt);
|
|
// turn packet around to go back to requester
|
|
pkt->makeTimingResponse();
|
|
sendTiming(pkt, latency);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
PioDevice::~PioDevice()
|
|
{
|
|
if (pioPort)
|
|
delete pioPort;
|
|
}
|
|
|
|
void
|
|
PioDevice::init()
|
|
{
|
|
if (!pioPort)
|
|
panic("Pio port not connected to anything!");
|
|
pioPort->sendStatusChange(Port::RangeChange);
|
|
}
|
|
|
|
void
|
|
BasicPioDevice::addressRanges(AddrRangeList &range_list)
|
|
{
|
|
assert(pioSize != 0);
|
|
range_list.clear();
|
|
range_list.push_back(RangeSize(pioAddr, pioSize));
|
|
}
|
|
|
|
|
|
DmaPort::DmaPort(DmaDevice *dev, Platform *p)
|
|
: Port(dev->name() + "-dmaport"), device(dev), platform(p), pendingCount(0)
|
|
{ }
|
|
|
|
bool
|
|
DmaPort::recvTiming(Packet *pkt)
|
|
{
|
|
|
|
|
|
if (pkt->result == Packet::Nacked) {
|
|
DPRINTF(DMA, "Received nacked Pkt %#x with State: %#x Addr: %#x\n",
|
|
pkt, pkt->senderState, pkt->getAddr());
|
|
pkt->reinitNacked();
|
|
sendDma(pkt, true);
|
|
} else if (pkt->senderState) {
|
|
DmaReqState *state;
|
|
DPRINTF(DMA, "Received response Pkt %#x with State: %#x Addr: %#x\n",
|
|
pkt, pkt->senderState, pkt->getAddr());
|
|
state = dynamic_cast<DmaReqState*>(pkt->senderState);
|
|
pendingCount--;
|
|
|
|
assert(pendingCount >= 0);
|
|
assert(state);
|
|
|
|
state->numBytes += pkt->req->getSize();
|
|
if (state->totBytes == state->numBytes) {
|
|
state->completionEvent->process();
|
|
delete state;
|
|
}
|
|
delete pkt->req;
|
|
delete pkt;
|
|
} else {
|
|
panic("Got packet without sender state... huh?\n");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
DmaDevice::DmaDevice(Params *p)
|
|
: PioDevice(p), dmaPort(NULL)
|
|
{ }
|
|
|
|
void
|
|
DmaPort::recvRetry()
|
|
{
|
|
Packet* pkt = transmitList.front();
|
|
bool result = true;
|
|
while (result && transmitList.size()) {
|
|
DPRINTF(DMA, "Retry on Packet %#x with senderState: %#x\n",
|
|
pkt, pkt->senderState);
|
|
result = sendTiming(pkt);
|
|
if (result) {
|
|
DPRINTF(DMA, "-- Done\n");
|
|
transmitList.pop_front();
|
|
} else {
|
|
DPRINTF(DMA, "-- Failed, queued\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
DmaPort::dmaAction(Packet::Command cmd, Addr addr, int size, Event *event,
|
|
uint8_t *data)
|
|
{
|
|
assert(event);
|
|
|
|
DmaReqState *reqState = new DmaReqState(event, this, size);
|
|
|
|
for (ChunkGenerator gen(addr, size, peerBlockSize());
|
|
!gen.done(); gen.next()) {
|
|
Request *req = new Request(gen.addr(), gen.size(), 0);
|
|
Packet *pkt = new Packet(req, cmd, Packet::Broadcast);
|
|
|
|
// Increment the data pointer on a write
|
|
if (data)
|
|
pkt->dataStatic(data + gen.complete());
|
|
|
|
pkt->senderState = reqState;
|
|
|
|
assert(pendingCount >= 0);
|
|
pendingCount++;
|
|
sendDma(pkt);
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
DmaPort::sendDma(Packet *pkt, bool front)
|
|
{
|
|
// some kind of selction between access methods
|
|
// more work is going to have to be done to make
|
|
// switching actually work
|
|
/* MemState state = device->platform->system->memState;
|
|
|
|
if (state == Timing) { */
|
|
DPRINTF(DMA, "Attempting to send Packet %#x with addr: %#x\n",
|
|
pkt, pkt->getAddr());
|
|
if (transmitList.size() || !sendTiming(pkt)) {
|
|
if (front)
|
|
transmitList.push_front(pkt);
|
|
else
|
|
transmitList.push_back(pkt);
|
|
DPRINTF(DMA, "-- Failed: queued\n");
|
|
} else {
|
|
DPRINTF(DMA, "-- Done\n");
|
|
}
|
|
/* } else if (state == Atomic) {
|
|
sendAtomic(pkt);
|
|
if (pkt->senderState) {
|
|
DmaReqState *state = dynamic_cast<DmaReqState*>(pkt->senderState);
|
|
assert(state);
|
|
state->completionEvent->schedule(curTick + (pkt->time -
|
|
pkt->req->getTime()) +1);
|
|
delete state;
|
|
}
|
|
pendingCount--;
|
|
assert(pendingCount >= 0);
|
|
delete pkt->req;
|
|
delete pkt;
|
|
|
|
} else if (state == Functional) {
|
|
sendFunctional(pkt);
|
|
// Is this correct???
|
|
completionEvent->schedule(pkt->req->responseTime - pkt->req->requestTime);
|
|
completionEvent == NULL;
|
|
} else
|
|
panic("Unknown memory command state.");
|
|
*/
|
|
}
|
|
|
|
DmaDevice::~DmaDevice()
|
|
{
|
|
if (dmaPort)
|
|
delete dmaPort;
|
|
}
|
|
|
|
|