diff options
| -rw-r--r-- | src/dev/pcidev.cc | 15 | ||||
| -rw-r--r-- | src/dev/pcidev.hh | 30 |
2 files changed, 32 insertions, 13 deletions
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc index e81e0d1ee..1cd018ea2 100644 --- a/src/dev/pcidev.cc +++ b/src/dev/pcidev.cc @@ -82,7 +82,8 @@ PciDev::PciConfigPort::recvFunctional(Packet *pkt) } void -PciDev::PciConfigPort::getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop) +PciDev::PciConfigPort::getDeviceAddressRanges(AddrRangeList &resp, + AddrRangeList &snoop) { snoop.clear(); resp.push_back(RangeSize(configAddr, PCI_CONFIG_SIZE+1)); @@ -157,21 +158,21 @@ PciDev::readConfig(Packet *pkt) case sizeof(uint8_t): pkt->set<uint8_t>(config.data[offset]); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x 1 bytes: data: %#x\n", + "readConfig: dev %#x func %#x reg %#x 1 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint8_t>()); break; case sizeof(uint16_t): pkt->set<uint16_t>(*(uint16_t*)&config.data[offset]); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x 2 bytes: data: %#x\n", + "readConfig: dev %#x func %#x reg %#x 2 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint16_t>()); break; case sizeof(uint32_t): pkt->set<uint32_t>(*(uint32_t*)&config.data[offset]); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x 4 bytes: data: %#x\n", + "readConfig: dev %#x func %#x reg %#x 4 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint32_t>()); break; @@ -221,7 +222,7 @@ PciDev::writeConfig(Packet *pkt) panic("writing to a read only register"); } DPRINTF(PCIDEV, - "write device: %#x function: %#x register: %#x 1 bytes: data: %#x\n", + "writeConfig: dev %#x func %#x reg %#x 1 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint8_t>()); break; @@ -238,7 +239,7 @@ PciDev::writeConfig(Packet *pkt) panic("writing to a read only register"); } DPRINTF(PCIDEV, - "write device: %#x function: %#x register: %#x 2 bytes: data: %#x\n", + "writeConfig: dev %#x func %#x reg %#x 2 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint16_t>()); break; @@ -305,7 +306,7 @@ PciDev::writeConfig(Packet *pkt) DPRINTF(PCIDEV, "Writing to a read only register"); } DPRINTF(PCIDEV, - "write device: %#x function: %#x register: %#x 4 bytes: data: %#x\n", + "writeConfig: dev %#x func %#x reg %#x 4 bytes: data = %#x\n", params()->deviceNum, params()->functionNum, offset, (uint32_t)pkt->get<uint32_t>()); break; diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh index 847fb07d0..ccc875d32 100644 --- a/src/dev/pcidev.hh +++ b/src/dev/pcidev.hh @@ -78,7 +78,7 @@ class PciConfigData : public SimObject /** - * PCI device, base implemnation is only config space. + * PCI device, base implementation is only config space. */ class PciDev : public DmaDevice { @@ -93,7 +93,8 @@ class PciDev : public DmaDevice virtual void recvFunctional(Packet *pkt) ; - virtual void getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop); + virtual void getDeviceAddressRanges(AddrRangeList &resp, + AddrRangeList &snoop); Platform *platform; @@ -107,7 +108,7 @@ class PciDev : public DmaDevice PciConfigPort(PciDev *dev, int busid, int devid, int funcid, Platform *p); - friend class PioPort::SendEvent; + friend class PioPort::SendEvent; }; public: @@ -151,6 +152,10 @@ class PciDev : public DmaDevice /** The current address mapping of the BARs */ Addr BARAddrs[6]; + /** + * Does the given address lie within the space mapped by the given + * base address register? + */ bool isBAR(Addr addr, int bar) const { @@ -158,6 +163,10 @@ class PciDev : public DmaDevice return BARAddrs[bar] <= addr && addr < BARAddrs[bar] + BARSize[bar]; } + /** + * Which base address register (if any) maps the given address? + * @return The BAR number (0-5 inclusive), or -1 if none. + */ int getBAR(Addr addr) { @@ -168,14 +177,23 @@ class PciDev : public DmaDevice return -1; } + /** + * Which base address register (if any) maps the given address? + * @param addr The address to check. + * @retval bar The BAR number (0-5 inclusive), + * only valid if return value is true. + * @retval offs The offset from the base address, + * only valid if return value is true. + * @return True iff address maps to a base address register's region. + */ bool - getBAR(Addr paddr, Addr &daddr, int &bar) + getBAR(Addr addr, int &bar, Addr &offs) { - int b = getBAR(paddr); + int b = getBAR(addr); if (b < 0) return false; - daddr = paddr - BARAddrs[b]; + offs = addr - BARAddrs[b]; bar = b; return true; } |