\r
// === PROTOTYPES ===\r
int PCI_Install(char **Arguments);\r
+ int PCI_ScanBus(int ID, int bFill);\r
+ \r
char *PCI_ReadDirRoot(tVFS_Node *node, int pos);\r
-tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, char *filename);\r
+tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename);\r
Uint64 PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer);\r
\r
int PCI_CountDevices(Uint16 vendor, Uint16 device, Uint16 fcn);\r
.FindDir = PCI_FindDirRoot\r
}\r
};\r
- Uint32 *gaPCI_PortBitmap = NULL;\r
+Uint32 *gaPCI_PortBitmap = NULL;\r
+Uint32 gaPCI_BusBitmap[256/32];\r
\r
// === CODE ===\r
/**\r
- * \fn int PCI_Install()\r
* \brief Scan the PCI Bus for devices\r
+ * \param Arguments Boot-time parameters\r
*/\r
int PCI_Install(char **Arguments)\r
{\r
- int bus, dev, fcn, i;\r
- int space = 0;\r
- tPCIDevice devInfo;\r
- void *tmpPtr = NULL;\r
+ int i;\r
+ void *tmpPtr;\r
\r
// Build Portmap\r
gaPCI_PortBitmap = malloc( 1 << 13 );\r
+ if( !gaPCI_PortBitmap ) {\r
+ Log_Error("PCI", "Unable to allocate %i bytes for bitmap", 1 << 13);\r
+ return MODULE_ERR_MALLOC;\r
+ }\r
memset( gaPCI_PortBitmap, 0, 1 << 13 );\r
for( i = 0; i < MAX_RESERVED_PORT / 32; i ++ )\r
gaPCI_PortBitmap[i] = -1;\r
for( i = 0; i < MAX_RESERVED_PORT % 32; i ++ )\r
gaPCI_PortBitmap[MAX_RESERVED_PORT / 32] = 1 << i;\r
\r
- // Scan Busses\r
- for( bus = 0; bus < giPCI_BusCount; bus++ )\r
- {\r
- for( dev = 0; dev < 32; dev++ ) // 32 Devices per bus\r
- {\r
- for( fcn = 0; fcn < 8; fcn++ ) // Max 8 functions per device\r
- {\r
- // Check if the device/function exists\r
- if(!PCI_EnumDevice(bus, dev, fcn, &devInfo))\r
- continue;\r
- \r
- if(giPCI_DeviceCount == space)\r
- {\r
- space += SPACE_STEP;\r
- tmpPtr = realloc(gPCI_Devices, space*sizeof(tPCIDevice));\r
- if(tmpPtr == NULL)\r
- break;\r
- gPCI_Devices = tmpPtr;\r
- }\r
- if(devInfo.oc == PCI_OC_PCIBRIDGE)\r
- {\r
- #if LIST_DEVICES\r
- Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",\r
- bus, dev, fcn, devInfo.vendor, devInfo.device);\r
- #endif\r
- giPCI_BusCount++;\r
- }\r
- else\r
- {\r
- #if LIST_DEVICES\r
- Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",\r
- bus, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);\r
- #endif\r
- }\r
- \r
- devInfo.Node.Inode = giPCI_DeviceCount;\r
- memcpy(&gPCI_Devices[giPCI_DeviceCount], &devInfo, sizeof(tPCIDevice));\r
- giPCI_DeviceCount ++;\r
- \r
- // WTF is this for?\r
- // Maybe bit 23 must be set for the device to be valid?\r
- // - Actually, maybe 23 means that there are sub-functions\r
- if(fcn == 0) {\r
- if( !(devInfo.ConfigCache[3] & 0x800000) )\r
- break;\r
- }\r
- }\r
- if(tmpPtr != gPCI_Devices)\r
- break;\r
- }\r
- if(tmpPtr != gPCI_Devices)\r
- break;\r
- }\r
- \r
- if(giPCI_DeviceCount == 0)\r
+ // Scan Bus (Bus 0, Don't fill gPCI_Devices)\r
+ i = PCI_ScanBus(0, 0);\r
+ if(i != MODULE_ERR_OK) return i;\r
+ \r
+ if(giPCI_DeviceCount == 0) {\r
+ Log_Notice("PCI", "No devices were found");\r
return MODULE_ERR_NOTNEEDED;\r
+ }\r
\r
- tmpPtr = realloc(gPCI_Devices, giPCI_DeviceCount*sizeof(tPCIDevice));\r
- if(tmpPtr == NULL)\r
+ // Allocate device buffer\r
+ tmpPtr = malloc(giPCI_DeviceCount * sizeof(tPCIDevice));\r
+ if(tmpPtr == NULL) {\r
+ Log_Warning("PCI", "Malloc ERROR");\r
return MODULE_ERR_MALLOC;\r
+ }\r
gPCI_Devices = tmpPtr;\r
\r
+ Log_Log("PCI", "%i devices, filling structure", giPCI_DeviceCount);\r
+ \r
+ // Reset counts\r
+ giPCI_DeviceCount = 0;\r
+ giPCI_BusCount = 0;\r
+ memset(gaPCI_BusBitmap, 0, sizeof(gaPCI_BusBitmap));\r
+ // Rescan, filling the PCI device array\r
+ PCI_ScanBus(0, 1);\r
+ \r
// Complete Driver Structure\r
gPCI_DriverStruct.RootNode.Size = giPCI_DeviceCount;\r
\r
return MODULE_ERR_OK;\r
}\r
\r
+/**\r
+ * \brief Scans a specific PCI Bus\r
+ * \param BusID PCI Bus ID to scan\r
+ * \param bFill Fill the \a gPCI_Devices array?\r
+ */\r
+int PCI_ScanBus(int BusID, int bFill)\r
+{\r
+ int dev, fcn;\r
+ tPCIDevice devInfo;\r
+ \r
+ if( gaPCI_BusBitmap[BusID/32] & (1 << (BusID%32)) )\r
+ return MODULE_ERR_OK;\r
+ \r
+ gaPCI_BusBitmap[BusID/32] |= (1 << (BusID%32));\r
+ \r
+ for( dev = 0; dev < 32; dev++ ) // 32 Devices per bus\r
+ {\r
+ for( fcn = 0; fcn < 8; fcn++ ) // Max 8 functions per device\r
+ {\r
+ // Check if the device/function exists\r
+ if(!PCI_EnumDevice(BusID, dev, fcn, &devInfo))\r
+ continue;\r
+ \r
+ if(devInfo.oc == PCI_OC_PCIBRIDGE)\r
+ {\r
+ #if LIST_DEVICES\r
+ Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",\r
+ BusID, dev, fcn, devInfo.vendor, devInfo.device);\r
+ #endif\r
+ //TODO: Handle PCI-PCI Bridges\r
+ //PCI_ScanBus(devInfo.???, bFill);\r
+ giPCI_BusCount ++;\r
+ }\r
+ else\r
+ {\r
+ #if LIST_DEVICES\r
+ Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",\r
+ BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);\r
+ #endif\r
+ }\r
+ \r
+ if( bFill ) {\r
+ devInfo.Node.Inode = giPCI_DeviceCount;\r
+ memcpy(&gPCI_Devices[giPCI_DeviceCount], &devInfo, sizeof(tPCIDevice));\r
+ }\r
+ giPCI_DeviceCount ++;\r
+ \r
+ // WTF is this for?\r
+ // Maybe bit 23 must be set for the device to be valid?\r
+ // - Actually, maybe 23 means that there are sub-functions\r
+ if(fcn == 0) {\r
+ if( !(devInfo.ConfigCache[3] & 0x00800000) )\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ \r
+ return MODULE_ERR_OK;\r
+}\r
+\r
/**\r
* \fn char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)\r
* \brief Read from Root of PCI Driver\r
return strdup( gPCI_Devices[Pos].Name );\r
}\r
/**\r
- * \fn tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, char *filename)\r
+ * \fn tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename)\r
*/\r
-tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, char *filename)\r
+tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename)\r
{\r
int bus,slot,fcn;\r
int i;\r
{\r
Uint16 vendor;\r
int i;\r
- Uint32 addr;\r
\r
vendor = PCI_CfgReadWord(bus, slot, fcn, 0x0|0);\r
if(vendor == 0xFFFF) // Invalid Device\r
info->oc = PCI_CfgReadWord(bus, slot, fcn, 0x8|2);\r
\r
// Load Config Bytes\r
- addr = 0x80000000 | ((Uint)bus<<16) | ((Uint)slot<<11) | ((Uint)fcn<<8);\r
for(i=0;i<256/4;i++)\r
{\r
- #if 1\r
- outd(0xCF8, addr);\r
- info->ConfigCache[i] = ind(0xCFC);\r
- addr += 4;\r
- #else\r
info->ConfigCache[i] = PCI_CfgReadDWord(bus, slot, fcn, i*4);\r
- #endif\r
}\r
\r
//#if LIST_DEVICES\r
outd(0xCF8, address);\r
\r
data = ind(0xCFC);\r
- return (Uint32)data;\r
+ //Debug("PCI(0x%x) = 0x%08x", address, data);\r
+ return data;\r
}\r
void PCI_CfgWriteDWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset, Uint32 data)\r
{\r
}\r
Uint16 PCI_CfgReadWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset)\r
{\r
- Uint32 data;\r
+ Uint32 data = PCI_CfgReadDWord(bus, dev, func, offset);\r
\r
- bus &= 0xFF; // 8 Bits\r
- dev &= 0x1F; // 5 Bits\r
- func &= 0x7; // 3 Bits\r
- offset &= 0xFF; // 8 Bits\r
- \r
- //LogF("PCI_CfgReadWord: (bus=0x%x,dev=0x%x,func=%x,offset=0x%x)\n", bus, dev, func, offset);\r
- \r
- outd(0xCF8,\r
- 0x80000000 | ((Uint)bus<<16) | ((Uint)dev<<11) | ((Uint)func<<8) | (offset&0xFC) );\r
+ data >>= (offset&2)*8; // Allow Access to Upper Word\r
\r
- data = ind(0xCFC);\r
- data >>= (offset&2)*8; //Allow Access to Upper Word\r
- //LogF("PCI_CfgReadWord: RETURN 0x%x\n", data&0xFFFF);\r
return (Uint16)data;\r
}\r
\r
Uint8 PCI_CfgReadByte(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset)\r
{\r
- Uint32 address;\r
- Uint32 data;\r
+ Uint32 data = PCI_CfgReadDWord(bus, dev, func, offset);\r
\r
- bus &= 0xFF; // 8 Bits\r
- dev &= 0x1F; // 4 Bits\r
- func &= 0x7; // 3 Bits\r
- offset &= 0xFF; // 8 Bits\r
- \r
- address = 0x80000000 | ((Uint)bus<<16) | ((Uint)dev<<11) | ((Uint)func<<8) | (offset&0xFC);\r
- outd(0xCF8, address);\r
- \r
- data = ind(0xCFC);\r
data >>= (offset&3)*8; //Allow Access to Upper Word\r
return (Uint8)data;\r
}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au