projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ktlim@zizzer:/bk/m5
[gem5.git]
/
dev
/
pciconfigall.cc
diff --git
a/dev/pciconfigall.cc
b/dev/pciconfigall.cc
index 7d86c3e1b88b8c52f9f914901d60dde92ae7996b..1175172c4f3e397169fdee33cc760b002317f92f 100644
(file)
--- a/
dev/pciconfigall.cc
+++ b/
dev/pciconfigall.cc
@@
-50,22
+50,22
@@
using namespace std;
PciConfigAll::PciConfigAll(const string &name,
Addr a, MemoryController *mmu,
PciConfigAll::PciConfigAll(const string &name,
Addr a, MemoryController *mmu,
- HierParams *hier, Bus *bus, Tick pio_latency)
+ HierParams *hier, Bus *
pio_
bus, Tick pio_latency)
: PioDevice(name, NULL), addr(a)
{
mmu->add_child(this, RangeSize(addr, size));
: PioDevice(name, NULL), addr(a)
{
mmu->add_child(this, RangeSize(addr, size));
- if (bus) {
- pioInterface = newPioInterface(name
, hier,
bus, this,
+ if (
pio_
bus) {
+ pioInterface = newPioInterface(name
+ ".pio", hier, pio_
bus, this,
&PciConfigAll::cacheAccess);
pioInterface->addAddrRange(RangeSize(addr, size));
&PciConfigAll::cacheAccess);
pioInterface->addAddrRange(RangeSize(addr, size));
- pioLatency = pio_latency * bus->clockRate;
+ pioLatency = pio_latency *
pio_
bus->clockRate;
}
// Make all the pointers to devices null
for(int x=0; x < MAX_PCI_DEV; x++)
for(int y=0; y < MAX_PCI_FUNC; y++)
}
// Make all the pointers to devices null
for(int x=0; x < MAX_PCI_DEV; x++)
for(int y=0; y < MAX_PCI_FUNC; y++)
- devices[x][y] = NULL;
+
devices[x][y] = NULL;
}
// If two interrupts share the same line largely bad things will happen.
}
// If two interrupts share the same line largely bad things will happen.
@@
-95,7
+95,7
@@
PciConfigAll::startup()
}
}
-Fault
+Fault
*
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
{
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
{
@@
-112,16
+112,16
@@
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
switch (req->size) {
// case sizeof(uint64_t):
// *(uint64_t*)data = 0xFFFFFFFFFFFFFFFF;
switch (req->size) {
// case sizeof(uint64_t):
// *(uint64_t*)data = 0xFFFFFFFFFFFFFFFF;
- // return No
_
Fault;
+ // return NoFault;
case sizeof(uint32_t):
*(uint32_t*)data = 0xFFFFFFFF;
case sizeof(uint32_t):
*(uint32_t*)data = 0xFFFFFFFF;
- return No
_
Fault;
+ return NoFault;
case sizeof(uint16_t):
*(uint16_t*)data = 0xFFFF;
case sizeof(uint16_t):
*(uint16_t*)data = 0xFFFF;
- return No
_
Fault;
+ return NoFault;
case sizeof(uint8_t):
*(uint8_t*)data = 0xFF;
case sizeof(uint8_t):
*(uint8_t*)data = 0xFF;
- return No
_
Fault;
+ return NoFault;
default:
panic("invalid access size(?) for PCI configspace!\n");
}
default:
panic("invalid access size(?) for PCI configspace!\n");
}
@@
-130,8
+130,8
@@
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
case sizeof(uint32_t):
case sizeof(uint16_t):
case sizeof(uint8_t):
case sizeof(uint32_t):
case sizeof(uint16_t):
case sizeof(uint8_t):
- devices[device][func]->
R
eadConfig(reg, req->size, data);
- return No
_
Fault;
+ devices[device][func]->
r
eadConfig(reg, req->size, data);
+ return NoFault;
default:
panic("invalid access size(?) for PCI configspace!\n");
}
default:
panic("invalid access size(?) for PCI configspace!\n");
}
@@
-140,10
+140,10
@@
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
DPRINTFN("PCI Configspace ERROR: read daddr=%#x size=%d\n",
daddr, req->size);
DPRINTFN("PCI Configspace ERROR: read daddr=%#x size=%d\n",
daddr, req->size);
- return No
_
Fault;
+ return NoFault;
}
}
-Fault
+Fault
*
PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
{
Addr daddr = (req->paddr - (addr & EV5::PAddrImplMask));
PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
{
Addr daddr = (req->paddr - (addr & EV5::PAddrImplMask));
@@
-152,36
+152,19
@@
PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
int func = (daddr >> 8) & 0x7;
int reg = daddr & 0xFF;
int func = (daddr >> 8) & 0x7;
int reg = daddr & 0xFF;
- union {
- uint8_t byte_value;
- uint16_t half_value;
- uint32_t word_value;
- };
-
if (devices[device][func] == NULL)
panic("Attempting to write to config space on non-existant device\n");
if (devices[device][func] == NULL)
panic("Attempting to write to config space on non-existant device\n");
- else {
- switch (req->size) {
- case sizeof(uint8_t):
- byte_value = *(uint8_t*)data;
- break;
- case sizeof(uint16_t):
- half_value = *(uint16_t*)data;
- break;
- case sizeof(uint32_t):
- word_value = *(uint32_t*)data;
- break;
- default:
- panic("invalid access size(?) for PCI configspace!\n");
- }
- }
+ else if (req->size != sizeof(uint8_t) &&
+ req->size != sizeof(uint16_t) &&
+ req->size != sizeof(uint32_t))
+ panic("invalid access size(?) for PCI configspace!\n");
DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
- req->vaddr, req->size,
word_value
);
+ req->vaddr, req->size,
*(uint32_t*)data
);
- devices[device][func]->
WriteConfig(reg, req->size, word_value
);
+ devices[device][func]->
writeConfig(reg, req->size, data
);
- return No
_
Fault;
+ return NoFault;
}
void
}
void
@@
-217,7
+200,7
@@
BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll)
SimObjectParam<MemoryController *> mmu;
Param<Addr> addr;
Param<Addr> mask;
SimObjectParam<MemoryController *> mmu;
Param<Addr> addr;
Param<Addr> mask;
- SimObjectParam<Bus*> io_bus;
+ SimObjectParam<Bus*>
p
io_bus;
Param<Tick> pio_latency;
SimObjectParam<HierParams *> hier;
Param<Tick> pio_latency;
SimObjectParam<HierParams *> hier;
@@
-228,7
+211,7
@@
BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigAll)
INIT_PARAM(mmu, "Memory Controller"),
INIT_PARAM(addr, "Device Address"),
INIT_PARAM(mask, "Address Mask"),
INIT_PARAM(mmu, "Memory Controller"),
INIT_PARAM(addr, "Device Address"),
INIT_PARAM(mask, "Address Mask"),
- INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL),
+ INIT_PARAM_DFLT(
p
io_bus, "The IO Bus to attach to", NULL),
INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
@@
-236,7
+219,7
@@
END_INIT_SIM_OBJECT_PARAMS(PciConfigAll)
CREATE_SIM_OBJECT(PciConfigAll)
{
CREATE_SIM_OBJECT(PciConfigAll)
{
- return new PciConfigAll(getInstanceName(), addr, mmu, hier, io_bus,
+ return new PciConfigAll(getInstanceName(), addr, mmu, hier,
p
io_bus,
pio_latency);
}
pio_latency);
}