X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fpci.c;h=9260847450dc62555a65603b182ceebdb37d0b5d;hb=efa38e0d56b1b620b6f4e5c4f91abc483a3065e2;hp=e205d4f4116f8c54fef8549bcd0d638d736bf7e4;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index e205d4f4..92608474 100644
--- a/Kernel/drv/pci.c
+++ b/Kernel/drv/pci.c
@@ -34,6 +34,8 @@ typedef struct sPCIDevice
 
 // === PROTOTYPES ===
  int	PCI_Install(char **Arguments);
+ int	PCI_ScanBus(int ID);
+ 
 char	*PCI_ReadDirRoot(tVFS_Node *node, int pos);
 tVFS_Node	*PCI_FindDirRoot(tVFS_Node *node, char *filename);
 Uint64	PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer);
@@ -72,7 +74,8 @@ tDevFS_Driver	gPCI_DriverStruct = {
 	.FindDir = PCI_FindDirRoot
 	}
 };
- Uint32	*gaPCI_PortBitmap = NULL;
+Uint32	*gaPCI_PortBitmap = NULL;
+Uint32	gaPCI_BusBitmap[256/32];
  
 // === CODE ===
 /**
@@ -81,76 +84,31 @@ tDevFS_Driver	gPCI_DriverStruct = {
  */
 int PCI_Install(char **Arguments)
 {
-	 int	bus, dev, fcn, i;
-	 int	space = 0;
-	tPCIDevice	devInfo;
-	void	*tmpPtr = NULL;
+	 int	i;
+	void	*tmpPtr;
 	
 	// Build Portmap
 	gaPCI_PortBitmap = malloc( 1 << 13 );
+	if( !gaPCI_PortBitmap ) {
+		Log_Error("PCI", "Unable to allocate %i bytes for bitmap", 1 << 13);
+		return MODULE_ERR_MALLOC;
+	}
 	memset( gaPCI_PortBitmap, 0, 1 << 13 );
 	for( i = 0; i < MAX_RESERVED_PORT / 32; i ++ )
 		gaPCI_PortBitmap[i] = -1;
 	for( i = 0; i < MAX_RESERVED_PORT % 32; i ++ )
 		gaPCI_PortBitmap[MAX_RESERVED_PORT / 32] = 1 << i;
 	
-	// Scan Busses
-	for( bus = 0; bus < giPCI_BusCount; bus++ )
-	{
-		for( dev = 0; dev < 32; dev++ )	// 32 Devices per bus
-		{
-			for( fcn = 0; fcn < 8; fcn++ )	// Max 8 functions per device
-			{
-				// Check if the device/function exists
-				if(!PCI_EnumDevice(bus, dev, fcn, &devInfo))
-					continue;
-				
-				if(giPCI_DeviceCount == space)
-				{
-					space += SPACE_STEP;
-					tmpPtr = realloc(gPCI_Devices, space*sizeof(tPCIDevice));
-					if(tmpPtr == NULL)
-						break;
-					gPCI_Devices = tmpPtr;
-				}
-				if(devInfo.oc == PCI_OC_PCIBRIDGE)
-				{
-					#if LIST_DEVICES
-					Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",
-						bus, dev, fcn, devInfo.vendor, devInfo.device);
-					#endif
-					giPCI_BusCount++;
-				}
-				else
-				{
-					#if LIST_DEVICES
-					Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",
-						bus, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);
-					#endif
-				}
-				
-				devInfo.Node.Inode = giPCI_DeviceCount;
-				memcpy(&gPCI_Devices[giPCI_DeviceCount], &devInfo, sizeof(tPCIDevice));
-				giPCI_DeviceCount ++;
-				
-				// WTF is this for?
-				// Maybe bit 23 must be set for the device to be valid?
-				// - Actually, maybe 23 means that there are sub-functions
-				if(fcn == 0) {
-					if( !(devInfo.ConfigCache[3] & 0x800000) )
-						break;
-				}
-			}
-			if(tmpPtr != gPCI_Devices)
-				break;
-		}
-		if(tmpPtr != gPCI_Devices)
-			break;
-	}
-	
-	if(giPCI_DeviceCount == 0)
+	// Scan Bus
+	i = PCI_ScanBus(0);
+	if(i != MODULE_ERR_OK)	return i;
+		
+	if(giPCI_DeviceCount == 0) {
+		Log_Notice("PCI", "No devices were found");
 		return MODULE_ERR_NOTNEEDED;
+	}
 	
+	// Ensure the buffer is nice and tight
 	tmpPtr = realloc(gPCI_Devices, giPCI_DeviceCount*sizeof(tPCIDevice));
 	if(tmpPtr == NULL)
 		return MODULE_ERR_MALLOC;
@@ -165,6 +123,69 @@ int PCI_Install(char **Arguments)
 	return MODULE_ERR_OK;
 }
 
+/**
+ * \brief Scans a specific PCI Bus
+ */
+int PCI_ScanBus(int BusID)
+{
+	 int	dev, fcn;
+	tPCIDevice	devInfo;
+	void	*tmpPtr = NULL;
+	
+	if( gaPCI_BusBitmap[BusID/32] & (1 << (BusID%32)) )
+		return MODULE_ERR_OK;
+	
+	gaPCI_BusBitmap[BusID/32] |= (1 << (BusID%32));
+	
+	for( dev = 0; dev < 32; dev++ )	// 32 Devices per bus
+	{
+		for( fcn = 0; fcn < 8; fcn++ )	// Max 8 functions per device
+		{
+			// Check if the device/function exists
+			if(!PCI_EnumDevice(BusID, dev, fcn, &devInfo))
+				continue;
+			
+			// Allocate
+			tmpPtr = realloc(gPCI_Devices, (giPCI_DeviceCount+1)*sizeof(tPCIDevice));
+			if(tmpPtr == NULL)
+				return MODULE_ERR_MALLOC;
+			gPCI_Devices = tmpPtr;
+			
+			if(devInfo.oc == PCI_OC_PCIBRIDGE)
+			{
+				#if LIST_DEVICES
+				Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",
+					BusID, dev, fcn, devInfo.vendor, devInfo.device);
+				#endif
+				//TODO: Handle PCI-PCI Bridges
+				//PCI_ScanBus( );
+				giPCI_BusCount++;
+			}
+			else
+			{
+				#if LIST_DEVICES
+				Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",
+					BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);
+				#endif
+			}
+			
+			devInfo.Node.Inode = giPCI_DeviceCount;
+			memcpy(&gPCI_Devices[giPCI_DeviceCount], &devInfo, sizeof(tPCIDevice));
+			giPCI_DeviceCount ++;
+			
+			// WTF is this for?
+			// Maybe bit 23 must be set for the device to be valid?
+			// - Actually, maybe 23 means that there are sub-functions
+			if(fcn == 0) {
+				if( !(devInfo.ConfigCache[3] & 0x00800000) )
+					break;
+			}
+		}
+	}
+	
+	return MODULE_ERR_OK;
+}
+
 /**
  * \fn char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)
  * \brief Read from Root of PCI Driver
@@ -439,7 +460,6 @@ int	PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
 {
 	Uint16	vendor;
 	 int	i;
-	Uint32	addr;
 	
 	vendor = PCI_CfgReadWord(bus, slot, fcn, 0x0|0);
 	if(vendor == 0xFFFF)	// Invalid Device
@@ -454,16 +474,9 @@ int	PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
 	info->oc = PCI_CfgReadWord(bus, slot, fcn, 0x8|2);
 	
 	// Load Config Bytes
-	addr = 0x80000000 | ((Uint)bus<<16) | ((Uint)slot<<11) | ((Uint)fcn<<8);
 	for(i=0;i<256/4;i++)
 	{
-		#if 1
-		outd(0xCF8, addr);
-		info->ConfigCache[i] = ind(0xCFC);
-		addr += 4;
-		#else
 		info->ConfigCache[i] = PCI_CfgReadDWord(bus, slot, fcn, i*4);
-		#endif
 	}
 	
 	//#if LIST_DEVICES
@@ -508,7 +521,8 @@ Uint32 PCI_CfgReadDWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset)
 	outd(0xCF8, address);
 	
 	data = ind(0xCFC);
-	return (Uint32)data;
+	//Debug("PCI(0x%x) = 0x%08x", address, data);
+	return data;
 }
 void PCI_CfgWriteDWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset, Uint32 data)
 {
@@ -525,38 +539,17 @@ void PCI_CfgWriteDWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset, Uint3
 }
 Uint16 PCI_CfgReadWord(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset)
 {
-	Uint32	data;
-	
-	bus &= 0xFF;	// 8 Bits
-	dev &= 0x1F;	// 5 Bits
-	func &= 0x7;	// 3 Bits
-	offset &= 0xFF;	// 8 Bits
+	Uint32	data = PCI_CfgReadDWord(bus, dev, func, offset);
 	
-	//LogF("PCI_CfgReadWord: (bus=0x%x,dev=0x%x,func=%x,offset=0x%x)\n", bus, dev, func, offset);
+	data >>= (offset&2)*8;	// Allow Access to Upper Word
 	
-	outd(0xCF8,
-		0x80000000 | ((Uint)bus<<16) | ((Uint)dev<<11) | ((Uint)func<<8) | (offset&0xFC) );
-	
-	data = ind(0xCFC);
-	data >>= (offset&2)*8;	//Allow Access to Upper Word
-	//LogF("PCI_CfgReadWord: RETURN 0x%x\n", data&0xFFFF);
 	return (Uint16)data;
 }
 
 Uint8 PCI_CfgReadByte(Uint16 bus, Uint16 dev, Uint16 func, Uint16 offset)
 {
-	Uint32	address;
-	Uint32	data;
-	
-	bus &= 0xFF;	// 8 Bits
-	dev &= 0x1F;	// 4 Bits
-	func &= 0x7;	// 3 Bits
-	offset &= 0xFF;	// 8 Bits
+	Uint32	data = PCI_CfgReadDWord(bus, dev, func, offset);
 	
-	address = 0x80000000 | ((Uint)bus<<16) | ((Uint)dev<<11) | ((Uint)func<<8) | (offset&0xFC);
-	outd(0xCF8, address);
-	
-	data = ind(0xCFC);
 	data >>= (offset&3)*8;	//Allow Access to Upper Word
 	return (Uint8)data;
 }