PCI: Move PCI Configuration data into devices now that we can inherit parameters.
--HG-- extra : convert_revision : bd2214b28fb46a9a9e9e204e0539be33acb548ad
This commit is contained in:
Ali Saidi
parent
773cb77656
commit
bba265ccd8
6 changed files with 105 additions and 158 deletions
|
|
@ -40,8 +40,7 @@ class CowIdeDisk(IdeDisk):
|
|||
|
||||
def makeLinuxAlphaSystem(mem_mode, mdesc = None):
|
||||
class BaseTsunami(Tsunami):
|
||||
ethernet = NSGigE(configdata=NSGigEPciData(),
|
||||
pci_bus=0, pci_dev=1, pci_func=0)
|
||||
ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
|
||||
ide = IdeController(disks=[Parent.disk0, Parent.disk2],
|
||||
pci_func=0, pci_dev=0, pci_bus=0)
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
from m5.SimObject import SimObject
|
||||
from m5.params import *
|
||||
from m5.proxy import *
|
||||
from Pci import PciDevice, PciConfigData
|
||||
from Pci import PciDevice
|
||||
|
||||
class EtherObject(SimObject):
|
||||
type = 'EtherObject'
|
||||
|
|
@ -79,8 +79,6 @@ class IGbE(EtherDevice):
|
|||
tx_desc_cache_size = Param.Int(64,
|
||||
"Number of enteries in the rx descriptor cache")
|
||||
clock = Param.Clock('500MHz', "Clock speed of the device")
|
||||
|
||||
class IGbEPciData(PciConfigData):
|
||||
VendorID = 0x8086
|
||||
DeviceID = 0x1075
|
||||
SubsystemID = 0x1008
|
||||
|
|
@ -125,7 +123,13 @@ class EtherDevBase(EtherDevice):
|
|||
tx_thread = Param.Bool(False, "dedicated kernel threads for receive")
|
||||
rss = Param.Bool(False, "Receive Side Scaling")
|
||||
|
||||
class NSGigEPciData(PciConfigData):
|
||||
class NSGigE(EtherDevBase):
|
||||
type = 'NSGigE'
|
||||
|
||||
dma_data_free = Param.Bool(False, "DMA of Data is free")
|
||||
dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
|
||||
dma_no_allocate = Param.Bool(True, "Should we allocate cache on read")
|
||||
|
||||
VendorID = 0x100B
|
||||
DeviceID = 0x0022
|
||||
Status = 0x0290
|
||||
|
|
@ -145,34 +149,7 @@ class NSGigEPciData(PciConfigData):
|
|||
BAR0Size = '256B'
|
||||
BAR1Size = '4kB'
|
||||
|
||||
class NSGigE(EtherDevBase):
|
||||
type = 'NSGigE'
|
||||
|
||||
dma_data_free = Param.Bool(False, "DMA of Data is free")
|
||||
dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
|
||||
dma_no_allocate = Param.Bool(True, "Should we allocate cache on read")
|
||||
|
||||
configdata = NSGigEPciData()
|
||||
|
||||
|
||||
class SinicPciData(PciConfigData):
|
||||
VendorID = 0x1291
|
||||
DeviceID = 0x1293
|
||||
Status = 0x0290
|
||||
SubClassCode = 0x00
|
||||
ClassCode = 0x02
|
||||
ProgIF = 0x00
|
||||
BAR0 = 0x00000000
|
||||
BAR1 = 0x00000000
|
||||
BAR2 = 0x00000000
|
||||
BAR3 = 0x00000000
|
||||
BAR4 = 0x00000000
|
||||
BAR5 = 0x00000000
|
||||
MaximumLatency = 0x34
|
||||
MinimumGrant = 0xb0
|
||||
InterruptLine = 0x1e
|
||||
InterruptPin = 0x01
|
||||
BAR0Size = '64kB'
|
||||
|
||||
class Sinic(EtherDevBase):
|
||||
type = 'Sinic'
|
||||
|
|
@ -191,5 +168,22 @@ class Sinic(EtherDevBase):
|
|||
delay_copy = Param.Bool(False, "Delayed copy transmit")
|
||||
virtual_addr = Param.Bool(False, "Virtual addressing")
|
||||
|
||||
configdata = SinicPciData()
|
||||
VendorID = 0x1291
|
||||
DeviceID = 0x1293
|
||||
Status = 0x0290
|
||||
SubClassCode = 0x00
|
||||
ClassCode = 0x02
|
||||
ProgIF = 0x00
|
||||
BAR0 = 0x00000000
|
||||
BAR1 = 0x00000000
|
||||
BAR2 = 0x00000000
|
||||
BAR3 = 0x00000000
|
||||
BAR4 = 0x00000000
|
||||
BAR5 = 0x00000000
|
||||
MaximumLatency = 0x34
|
||||
MinimumGrant = 0xb0
|
||||
InterruptLine = 0x1e
|
||||
InterruptPin = 0x01
|
||||
BAR0Size = '64kB'
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,11 +28,20 @@
|
|||
|
||||
from m5.SimObject import SimObject
|
||||
from m5.params import *
|
||||
from Pci import PciDevice, PciConfigData
|
||||
from Pci import PciDevice
|
||||
|
||||
class IdeID(Enum): vals = ['master', 'slave']
|
||||
|
||||
class IdeControllerPciData(PciConfigData):
|
||||
class IdeDisk(SimObject):
|
||||
type = 'IdeDisk'
|
||||
delay = Param.Latency('1us', "Fixed disk delay in microseconds")
|
||||
driveID = Param.IdeID('master', "Drive ID")
|
||||
image = Param.DiskImage("Disk image")
|
||||
|
||||
class IdeController(PciDevice):
|
||||
type = 'IdeController'
|
||||
disks = VectorParam.IdeDisk("IDE disks attached to this controller")
|
||||
|
||||
VendorID = 0x8086
|
||||
DeviceID = 0x7111
|
||||
Command = 0x0
|
||||
|
|
@ -55,14 +64,3 @@ class IdeControllerPciData(PciConfigData):
|
|||
BAR3Size = '4B'
|
||||
BAR4Size = '16B'
|
||||
|
||||
class IdeDisk(SimObject):
|
||||
type = 'IdeDisk'
|
||||
delay = Param.Latency('1us', "Fixed disk delay in microseconds")
|
||||
driveID = Param.IdeID('master', "Drive ID")
|
||||
image = Param.DiskImage("Disk image")
|
||||
|
||||
class IdeController(PciDevice):
|
||||
type = 'IdeController'
|
||||
disks = VectorParam.IdeDisk("IDE disks attached to this controller")
|
||||
|
||||
configdata =IdeControllerPciData()
|
||||
|
|
|
|||
|
|
@ -31,8 +31,23 @@ from m5.params import *
|
|||
from m5.proxy import *
|
||||
from Device import BasicPioDevice, DmaDevice, PioDevice
|
||||
|
||||
class PciConfigData(SimObject):
|
||||
type = 'PciConfigData'
|
||||
class PciConfigAll(PioDevice):
|
||||
type = 'PciConfigAll'
|
||||
pio_latency = Param.Tick(1, "Programmed IO latency in simticks")
|
||||
bus = Param.UInt8(0x00, "PCI bus to act as config space for")
|
||||
size = Param.MemorySize32('16MB', "Size of config space")
|
||||
|
||||
|
||||
class PciDevice(DmaDevice):
|
||||
type = 'PciDevice'
|
||||
abstract = True
|
||||
config = Port(Self.pio.peerObj.port, "PCI configuration space port")
|
||||
pci_bus = Param.Int("PCI bus")
|
||||
pci_dev = Param.Int("PCI device number")
|
||||
pci_func = Param.Int("PCI function code")
|
||||
pio_latency = Param.Latency('1ns', "Programmed IO latency in simticks")
|
||||
config_latency = Param.Latency('20ns', "Config read or write latency")
|
||||
|
||||
VendorID = Param.UInt16("Vendor ID")
|
||||
DeviceID = Param.UInt16("Device ID")
|
||||
Command = Param.UInt16(0, "Command")
|
||||
|
|
@ -68,20 +83,4 @@ class PciConfigData(SimObject):
|
|||
MaximumLatency = Param.UInt8(0x00, "Maximum Latency")
|
||||
MinimumGrant = Param.UInt8(0x00, "Minimum Grant")
|
||||
|
||||
class PciConfigAll(PioDevice):
|
||||
type = 'PciConfigAll'
|
||||
pio_latency = Param.Tick(1, "Programmed IO latency in simticks")
|
||||
bus = Param.UInt8(0x00, "PCI bus to act as config space for")
|
||||
size = Param.MemorySize32('16MB', "Size of config space")
|
||||
|
||||
|
||||
class PciDevice(DmaDevice):
|
||||
type = 'PciDevice'
|
||||
abstract = True
|
||||
config = Port(Self.pio.peerObj.port, "PCI configuration space port")
|
||||
pci_bus = Param.Int("PCI bus")
|
||||
pci_dev = Param.Int("PCI device number")
|
||||
pci_func = Param.Int("PCI function code")
|
||||
pio_latency = Param.Latency('1ns', "Programmed IO latency in simticks")
|
||||
configdata = Param.PciConfigData(Parent.any, "PCI Config data")
|
||||
config_latency = Param.Latency('20ns', "Config read or write latency")
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#include "dev/alpha/tsunamireg.h"
|
||||
#include "mem/packet.hh"
|
||||
#include "mem/packet_access.hh"
|
||||
#include "params/PciConfigData.hh"
|
||||
#include "sim/byteswap.hh"
|
||||
#include "sim/core.hh"
|
||||
|
||||
|
|
@ -82,21 +81,57 @@ PciDev::PciConfigPort::getDeviceAddressRanges(AddrRangeList &resp,
|
|||
|
||||
|
||||
PciDev::PciDev(const Params *p)
|
||||
: DmaDevice(p), plat(p->platform), configData(p->configdata),
|
||||
pioDelay(p->pio_latency), configDelay(p->config_latency),
|
||||
configPort(NULL)
|
||||
: DmaDevice(p), plat(p->platform), pioDelay(p->pio_latency),
|
||||
configDelay(p->config_latency), configPort(NULL)
|
||||
{
|
||||
// copy the config data from the PciConfigData object
|
||||
if (configData) {
|
||||
memcpy(config.data, configData->config.data, sizeof(config.data));
|
||||
memcpy(BARSize, configData->BARSize, sizeof(BARSize));
|
||||
} else
|
||||
panic("NULL pointer to configuration data");
|
||||
config.vendor = htole(p->VendorID);
|
||||
config.device = htole(p->DeviceID);
|
||||
config.command = htole(p->Command);
|
||||
config.status = htole(p->Status);
|
||||
config.revision = htole(p->Revision);
|
||||
config.progIF = htole(p->ProgIF);
|
||||
config.subClassCode = htole(p->SubClassCode);
|
||||
config.classCode = htole(p->ClassCode);
|
||||
config.cacheLineSize = htole(p->CacheLineSize);
|
||||
config.latencyTimer = htole(p->LatencyTimer);
|
||||
config.headerType = htole(p->HeaderType);
|
||||
config.bist = htole(p->BIST);
|
||||
|
||||
config.baseAddr[0] = htole(p->BAR0);
|
||||
config.baseAddr[1] = htole(p->BAR1);
|
||||
config.baseAddr[2] = htole(p->BAR2);
|
||||
config.baseAddr[3] = htole(p->BAR3);
|
||||
config.baseAddr[4] = htole(p->BAR4);
|
||||
config.baseAddr[5] = htole(p->BAR5);
|
||||
config.cardbusCIS = htole(p->CardbusCIS);
|
||||
config.subsystemVendorID = htole(p->SubsystemVendorID);
|
||||
config.subsystemID = htole(p->SubsystemID);
|
||||
config.expansionROM = htole(p->ExpansionROM);
|
||||
config.reserved0 = 0;
|
||||
config.reserved1 = 0;
|
||||
config.interruptLine = htole(p->InterruptLine);
|
||||
config.interruptPin = htole(p->InterruptPin);
|
||||
config.minimumGrant = htole(p->MinimumGrant);
|
||||
config.maximumLatency = htole(p->MaximumLatency);
|
||||
|
||||
BARSize[0] = p->BAR0Size;
|
||||
BARSize[1] = p->BAR1Size;
|
||||
BARSize[2] = p->BAR2Size;
|
||||
BARSize[3] = p->BAR3Size;
|
||||
BARSize[4] = p->BAR4Size;
|
||||
BARSize[5] = p->BAR5Size;
|
||||
|
||||
for (int i = 0; i < 6; ++i) {
|
||||
uint32_t barsize = BARSize[i];
|
||||
if (barsize != 0 && !isPowerOf2(barsize)) {
|
||||
fatal("BAR %d size %d is not a power of 2\n", i, BARSize[i]);
|
||||
}
|
||||
}
|
||||
|
||||
memset(BARAddrs, 0, sizeof(BARAddrs));
|
||||
|
||||
plat->registerPciDevice(0, p->pci_dev, p->pci_func,
|
||||
letoh(configData->config.interruptLine));
|
||||
letoh(config.interruptLine));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -304,53 +339,3 @@ PciDev::unserialize(Checkpoint *cp, const std::string §ion)
|
|||
|
||||
}
|
||||
|
||||
PciConfigData *
|
||||
PciConfigDataParams::create()
|
||||
{
|
||||
PciConfigData *data = new PciConfigData(name);
|
||||
|
||||
data->config.vendor = htole(VendorID);
|
||||
data->config.device = htole(DeviceID);
|
||||
data->config.command = htole(Command);
|
||||
data->config.status = htole(Status);
|
||||
data->config.revision = htole(Revision);
|
||||
data->config.progIF = htole(ProgIF);
|
||||
data->config.subClassCode = htole(SubClassCode);
|
||||
data->config.classCode = htole(ClassCode);
|
||||
data->config.cacheLineSize = htole(CacheLineSize);
|
||||
data->config.latencyTimer = htole(LatencyTimer);
|
||||
data->config.headerType = htole(HeaderType);
|
||||
data->config.bist = htole(BIST);
|
||||
|
||||
data->config.baseAddr[0] = htole(BAR0);
|
||||
data->config.baseAddr[1] = htole(BAR1);
|
||||
data->config.baseAddr[2] = htole(BAR2);
|
||||
data->config.baseAddr[3] = htole(BAR3);
|
||||
data->config.baseAddr[4] = htole(BAR4);
|
||||
data->config.baseAddr[5] = htole(BAR5);
|
||||
data->config.cardbusCIS = htole(CardbusCIS);
|
||||
data->config.subsystemVendorID = htole(SubsystemVendorID);
|
||||
data->config.subsystemID = htole(SubsystemID);
|
||||
data->config.expansionROM = htole(ExpansionROM);
|
||||
data->config.interruptLine = htole(InterruptLine);
|
||||
data->config.interruptPin = htole(InterruptPin);
|
||||
data->config.minimumGrant = htole(MinimumGrant);
|
||||
data->config.maximumLatency = htole(MaximumLatency);
|
||||
|
||||
data->BARSize[0] = BAR0Size;
|
||||
data->BARSize[1] = BAR1Size;
|
||||
data->BARSize[2] = BAR2Size;
|
||||
data->BARSize[3] = BAR3Size;
|
||||
data->BARSize[4] = BAR4Size;
|
||||
data->BARSize[5] = BAR5Size;
|
||||
|
||||
for (int i = 0; i < 6; ++i) {
|
||||
uint32_t barsize = data->BARSize[i];
|
||||
if (barsize != 0 && !isPowerOf2(barsize)) {
|
||||
fatal("%s: BAR %d size %d is not a power of 2\n",
|
||||
name, i, data->BARSize[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,30 +52,6 @@
|
|||
#define BAR_NUMBER(x) (((x) - PCI0_BASE_ADDR0) >> 0x2);
|
||||
|
||||
|
||||
/**
|
||||
* This class encapulates the first 64 bytes of a singles PCI
|
||||
* devices config space that in configured by the configuration file.
|
||||
*/
|
||||
class PciConfigData : public SimObject
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Constructor to initialize the devices config space to 0.
|
||||
*/
|
||||
PciConfigData(const std::string &name)
|
||||
: SimObject(name)
|
||||
{
|
||||
std::memset(config.data, 0, sizeof(config.data));
|
||||
std::memset(BARSize, 0, sizeof(BARSize));
|
||||
}
|
||||
|
||||
/** The first 64 bytes */
|
||||
PCIConfig config;
|
||||
|
||||
/** The size of the BARs */
|
||||
uint32_t BARSize[6];
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* PCI device, base implementation is only config space.
|
||||
|
|
@ -114,10 +90,7 @@ class PciDev : public DmaDevice
|
|||
}
|
||||
|
||||
protected:
|
||||
/** The current config space. Unlike the PciConfigData this is
|
||||
* updated during simulation while continues to reflect what was
|
||||
* in the config file.
|
||||
*/
|
||||
/** The current config space. */
|
||||
PCIConfig config;
|
||||
|
||||
/** The size of the BARs */
|
||||
|
|
@ -174,7 +147,6 @@ class PciDev : public DmaDevice
|
|||
|
||||
protected:
|
||||
Platform *plat;
|
||||
PciConfigData *configData;
|
||||
Tick pioDelay;
|
||||
Tick configDelay;
|
||||
PciConfigPort *configPort;
|
||||
|
|
@ -202,15 +174,15 @@ class PciDev : public DmaDevice
|
|||
|
||||
void
|
||||
intrPost()
|
||||
{ plat->postPciInt(letoh(configData->config.interruptLine)); }
|
||||
{ plat->postPciInt(letoh(config.interruptLine)); }
|
||||
|
||||
void
|
||||
intrClear()
|
||||
{ plat->clearPciInt(letoh(configData->config.interruptLine)); }
|
||||
{ plat->clearPciInt(letoh(config.interruptLine)); }
|
||||
|
||||
uint8_t
|
||||
interruptLine()
|
||||
{ return letoh(configData->config.interruptLine); }
|
||||
{ return letoh(config.interruptLine); }
|
||||
|
||||
/** return the address ranges that this device responds to.
|
||||
* @params range_list range list to populate with ranges
|
||||
|
|
|
|||
Loading…
Reference in a new issue