X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fpci.c;h=e926f94f3fbcb342a9d353ed66644cf1301b0e1e;hb=01f3ca563b67a2d0f9171b2a301aff1dfebe1465;hp=702c9ccc51eb7ab1d3b3096983fd18c68953795d;hpb=4ebe00546574e97c5316881881f7f2562deea74b;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/pci.c b/KernelLand/Kernel/drv/pci.c
index 702c9ccc..e926f94f 100644
--- a/KernelLand/Kernel/drv/pci.c
+++ b/KernelLand/Kernel/drv/pci.c
@@ -1,6 +1,9 @@
 /*
- * AcessOS/AcessBasic v0.1
- * PCI Bus Driver
+ * Acess2 Kernel
+ * - By John Hodge (thePowersGang)
+ * 
+ * drv/pci.c
+ * - PCI Enumeration and Arbitration
  */
 #define DEBUG	0
 #include <acess.h>
@@ -9,9 +12,11 @@
 #include <fs_devfs.h>
 #include <drv_pci.h>
 #include <drv_pci_int.h>
+#include <virtual_pci.h>
 
 #define USE_PORT_BITMAP	0
 #define	LIST_DEVICES	1
+#define PCI_MAX_BUSSES	8
 
 // === STRUCTURES ===
 typedef struct sPCIDevice
@@ -34,14 +39,15 @@ typedef struct sPCIDevice
  int	PCI_ScanBus(int ID, int bFill);
  
  int	PCI_int_ReadDirRoot(tVFS_Node *node, int pos, char Dest[FILENAME_MAX]);
-tVFS_Node	*PCI_int_FindDirRoot(tVFS_Node *node, const char *filename);
+tVFS_Node	*PCI_int_FindDirRoot(tVFS_Node *node, const char *filename, Uint Flags);
 Uint32	PCI_int_GetBusAddr(Uint16 Bus, Uint16 Slot, Uint16 Fcn, Uint8 Offset);
-size_t	PCI_int_ReadDevice(tVFS_Node *node, off_t Offset, size_t Length, void *buffer);
+size_t	PCI_int_ReadDevice(tVFS_Node *node, off_t Offset, size_t Length, void *buffer, Uint Flags);
  int	PCI_int_EnumDevice(Uint16 bus, Uint16 dev, Uint16 fcn, tPCIDevice *info);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0100, PCI, PCI_Install, NULL, NULL);
  int	giPCI_BusCount = 1;
+Uint8	gaPCI_BusNumbers[PCI_MAX_BUSSES];
  int	giPCI_InodeHandle = -1;
  int	giPCI_DeviceCount = 0;
 tPCIDevice	*gPCI_Devices = NULL;
@@ -95,12 +101,18 @@ int PCI_Install(char **Arguments)
 	#endif	
 
 	// Scan Bus (Bus 0, Don't fill gPCI_Devices)
+	giPCI_DeviceCount = 0;
+	giPCI_BusCount = 1;
+	gaPCI_BusNumbers[0] = 0;
 	for( bus = 0; bus < giPCI_BusCount; bus ++ )
 	{
-		ret = PCI_ScanBus(bus, 0);
+		ret = PCI_ScanBus(gaPCI_BusNumbers[bus], 0);
 		if(ret != MODULE_ERR_OK)	return ret;
 	}
-		
+	// TODO: PCIe
+	// - Add VPCI Devices
+	giPCI_DeviceCount += giVPCI_DeviceCount;
+	
 	if(giPCI_DeviceCount == 0) {
 		Log_Notice("PCI", "No devices were found");
 		return MODULE_ERR_NOTNEEDED;
@@ -123,7 +135,39 @@ int PCI_Install(char **Arguments)
 	// Rescan, filling the PCI device array
 	for( bus = 0; bus < giPCI_BusCount; bus ++ )
 	{
-		PCI_ScanBus(bus, 1);
+		PCI_ScanBus(gaPCI_BusNumbers[bus], 1);
+	}
+	// Insert VPCI Devices
+	for( int i = 0; i < giVPCI_DeviceCount; i ++ )
+	{
+		tPCIDevice	*devinfo = &gPCI_Devices[giPCI_DeviceCount];
+		
+		devinfo->bus = -1;
+		devinfo->slot = i;
+		devinfo->fcn = 0;
+		devinfo->vendor = gaVPCI_Devices[i].Vendor;
+		devinfo->device = gaVPCI_Devices[i].Device;
+		devinfo->revision = gaVPCI_Devices[i].Class & 0xFF;
+		devinfo->class = gaVPCI_Devices[i].Class >> 8;
+		snprintf(devinfo->Name, sizeof(devinfo->Name), "%02x.%02x:%x", 0xFF, i, 0);
+		
+		#if LIST_DEVICES
+		Log_Log("PCI", "Device %i,%i:%i %06x => 0x%04x:0x%04x Rev %i",
+			0xFF, i, 0, devinfo->class,
+			devinfo->vendor, devinfo->device, devinfo->revision);
+		#endif
+
+		for(int j = 0; j < 256/4; j ++ )
+			devinfo->ConfigCache[j] = VPCI_Read(&gaVPCI_Devices[i], j*4, 4);
+
+		memset(&devinfo->Node, 0, sizeof(devinfo->Node));
+		devinfo->Node.Inode = giPCI_DeviceCount;
+		devinfo->Node.Size = 256;
+		devinfo->Node.NumACLs = 1;
+		devinfo->Node.ACLs = &gVFS_ACL_EveryoneRO;
+		devinfo->Node.Type = &gPCI_DevNodeType;
+
+		giPCI_DeviceCount ++;
 	}
 	
 	// Complete Driver Structure
@@ -158,26 +202,12 @@ int PCI_ScanBus(int BusID, int bFill)
 			if(!PCI_int_EnumDevice(BusID, dev, fcn, &devInfo))
 				continue;
 			
-			if(devInfo.class == PCI_OC_PCIBRIDGE)
-			{
-				#if LIST_DEVICES
-				if( !bFill )
-					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(devInfo.???, bFill);
-				giPCI_BusCount ++;
-			}
-			else
-			{
-				#if LIST_DEVICES
-				if( !bFill )
-					Log_Log("PCI", "Device %i,%i:%i %06x => 0x%04x:0x%04x Rev %i",
-						BusID, dev, fcn, devInfo.class,
-						devInfo.vendor, devInfo.device, devInfo.revision);
-				#endif
-			}
+			#if LIST_DEVICES
+			if( !bFill )
+				Log_Log("PCI", "Device %i,%i:%i %06x => 0x%04x:0x%04x Rev %i",
+					BusID, dev, fcn, devInfo.class,
+					devInfo.vendor, devInfo.device, devInfo.revision);
+			#endif
 			
 			if( bFill ) {
 				devInfo.Node.Inode = giPCI_DeviceCount;
@@ -185,7 +215,28 @@ int PCI_ScanBus(int BusID, int bFill)
 			}
 			giPCI_DeviceCount ++;
 			
-			// If bit 23 of (soemthing) is set, there are sub-functions
+			switch( (devInfo.ConfigCache[3] >> 16) & 0x7F )
+			{
+			case 0x00:	// Normal device
+				break;
+			case 0x01:	// PCI-PCI Bridge
+				{
+				// TODO: Add to list of busses?
+				Uint8	sec = (devInfo.ConfigCache[6] & 0x0000FF00) >> 8;
+				#if LIST_DEVICES
+				if( !bFill ) {
+					Uint8	pri = (devInfo.ConfigCache[6] & 0x000000FF) >> 0;
+					Log_Log("PCI", "- PCI-PCI Bridge %02x=>%02x", pri, sec);
+				}
+				#endif
+				gaPCI_BusNumbers[giPCI_BusCount++] = sec;
+				}
+				break;
+			case 0x02:	// PCI-CardBus Bridge
+				break;
+			}
+
+			// If bit 8 of the Header Type register is set, there are sub-functions
 			if(fcn == 0 && !(devInfo.ConfigCache[3] & 0x00800000) )
 				break;
 		}
@@ -210,37 +261,16 @@ int PCI_int_ReadDirRoot(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 }
 /**
  */
-tVFS_Node *PCI_int_FindDirRoot(tVFS_Node *node, const char *filename)
+tVFS_Node *PCI_int_FindDirRoot(tVFS_Node *node, const char *filename, Uint Flags)
 {
-	 int	bus,slot,fcn;
-	 int	i;
-	// Validate Filename (Pointer and length)
-	if(!filename || strlen(filename) != 7)
-		return NULL;
-	// Check for spacers
-	if(filename[2] != '.' || filename[5] != ':')
-		return NULL;
-	
-	// Get Information
-	if(filename[0] < '0' || filename[0] > '9')	return NULL;
-	bus = (filename[0] - '0')*10;
-	if(filename[1] < '0' || filename[1] > '9')	return NULL;
-	bus += filename[1] - '0';
-	if(filename[3] < '0' || filename[3] > '9')	return NULL;
-	slot = (filename[3] - '0')*10;
-	if(filename[4] < '0' || filename[4] > '9')	return NULL;
-	slot += filename[4] - '0';
-	if(filename[6] < '0' || filename[6] > '9')	return NULL;
-	fcn = filename[6] - '0';
-	
 	// Find Match
-	for(i=0;i<giPCI_DeviceCount;i++)
+	for( int i = 0; i < giPCI_DeviceCount; i ++ )
 	{
-		if(gPCI_Devices[i].bus != bus)		continue;
-		if(gPCI_Devices[i].slot != slot)	continue;
-		if(gPCI_Devices[i].fcn != fcn)	continue;
-		
-		return &gPCI_Devices[i].Node;
+		int cmp = strcmp(gPCI_Devices[i].Name, filename);
+		if( cmp > 0 )	// Sorted list
+			break;
+		if( cmp == 0 )
+			return &gPCI_Devices[i].Node;
 	}
 	
 	// Error Return
@@ -250,7 +280,7 @@ tVFS_Node *PCI_int_FindDirRoot(tVFS_Node *node, const char *filename)
 /**
  * \brief Read the PCI configuration space of a device
  */
-size_t PCI_int_ReadDevice(tVFS_Node *node, off_t pos, size_t length, void *buffer)
+size_t PCI_int_ReadDevice(tVFS_Node *node, off_t pos, size_t length, void *buffer, Uint Flags)
 {	
 	if( pos + length > 256 )	return 0;
 	
@@ -372,6 +402,11 @@ Uint32 PCI_ConfigRead(tPCIDev ID, int Offset, int Size)
 	if( Offset & (Size - 1) )	return 0;
 
 	dev = &gPCI_Devices[ID];
+	// Detect VPCI devices
+	if( dev->bus == -1 ) {
+		return VPCI_Read(&gaVPCI_Devices[dev->slot], Offset, Size);
+	}
+
 	addr = PCI_int_GetBusAddr(dev->bus, dev->slot, dev->fcn, Offset);
 
 	dword = PCI_CfgReadDWord(addr);
@@ -391,10 +426,18 @@ void PCI_ConfigWrite(tPCIDev ID, int Offset, int Size, Uint32 Value)
 	tPCIDevice	*dev;
 	Uint32	dword, addr;
 	 int	shift;
+
 	if( ID < 0 || ID >= giPCI_DeviceCount )	return ;
 	if( Offset < 0 || Offset > 256 )	return ;
-	
+
 	dev = &gPCI_Devices[ID];
+
+	// Detect VPCI devices
+	if( dev->bus == -1 ) {
+		VPCI_Write(&gaVPCI_Devices[dev->slot], Offset, Size, Value);
+		return ;
+	}
+
 	addr = PCI_int_GetBusAddr(dev->bus, dev->slot, dev->fcn, Offset);
 
 	if(Size != 4)
@@ -420,6 +463,17 @@ void PCI_ConfigWrite(tPCIDev ID, int Offset, int Size, Uint32 Value)
 	PCI_CfgWriteDWord(addr, dword);
 }
 
+Uint16 PCI_SetCommand(tPCIDev id, Uint16 SBits, Uint16 CBits)
+{
+	tPCIDevice	*dev = &gPCI_Devices[id];
+	dev->ConfigCache[1] &= ~CBits;
+	dev->ConfigCache[1] |= SBits;
+	Uint32 addr = PCI_int_GetBusAddr(dev->bus, dev->slot, dev->fcn, 1*4);
+	PCI_CfgWriteDWord(addr, dev->ConfigCache[1]);
+	dev->ConfigCache[1] = PCI_CfgReadDWord(addr);
+	return dev->ConfigCache[1];
+}
+
 /**
  * \brief Get the IRQ assigned to a device
  */
@@ -443,6 +497,57 @@ Uint32 PCI_GetBAR(tPCIDev id, int BARNum)
 	return gPCI_Devices[id].ConfigCache[4+BARNum];
 }
 
+/**
+ */
+Uint64 PCI_GetValidBAR(tPCIDev ID, int BARNum, tPCI_BARType Type)
+{
+	if( ID < 0 || ID >= giPCI_DeviceCount )
+		return 0;
+	if( BARNum < 0 || BARNum >= 6 )
+		return 0;
+	tPCIDevice	*dev = &gPCI_Devices[ID];
+	Uint32	bar_val = dev->ConfigCache[4+BARNum];
+	Uint64	ret = -1;
+	switch( Type )
+	{
+	case PCI_BARTYPE_IO:
+		if( !(bar_val & 1) )
+			return 0;
+		ret = bar_val & ~3;
+		break;
+
+	case PCI_BARTYPE_MEMNP:
+		if( bar_val & 8 )	return 0;
+		if(0)	
+	case PCI_BARTYPE_MEMP:
+		if( !(bar_val & 8) )	return 0;
+	case PCI_BARTYPE_MEM:
+		if( bar_val & 1 )	return 0;
+		if( (bar_val & 6) == 4 ) {
+			ASSERTCR(BARNum, <, 5, 0);
+			ret = (bar_val & ~0xF) | ((Uint64)dev->ConfigCache[4+BARNum+1] << 32);
+		}
+		else {
+			ret = bar_val & ~0xF;
+		}
+		break;
+	case PCI_BARTYPE_MEM32:
+		if( bar_val & 1 )	return 0;
+		if( (bar_val & 6) != 0 )	return 0;
+		ret = bar_val & ~0xF;
+		break;
+	case PCI_BARTYPE_MEM64:
+		if( bar_val & 1 )	return 0;
+		if( (bar_val & 6) != 4 )	return 0;
+		ASSERTCR(BARNum, <, 5, 0);
+		ret = (bar_val & ~0xF) | ((Uint64)dev->ConfigCache[4+BARNum+1] << 32);
+		break;
+	}
+	ASSERT(ret != -1);
+	ASSERT(ret);
+	return ret;
+}
+
 /**
  * \brief Get device information for a slot/function
  */
@@ -456,16 +561,18 @@ int PCI_int_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
 	vendor_dev = PCI_CfgReadDWord( addr );
 	if((vendor_dev & 0xFFFF) == 0xFFFF)	// Invalid Device
 		return 0;
+	
+	info->bus = bus;
+	info->slot = slot;
+	info->fcn = fcn;
 
+	// Read configuration
 	info->ConfigCache[0] = vendor_dev;
 	for( i = 1, addr += 4; i < 256/4; i ++, addr += 4 )
 	{
 		info->ConfigCache[i] = PCI_CfgReadDWord(addr);
 	}	
 
-	info->bus = bus;
-	info->slot = slot;
-	info->fcn = fcn;
 	info->vendor = vendor_dev & 0xFFFF;
 	info->device = vendor_dev >> 16;
 	tmp = info->ConfigCache[2];
@@ -479,14 +586,7 @@ int PCI_int_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
 //	#endif
 	
 	// Make node name
-	info->Name[0] = '0' + bus/10;
-	info->Name[1] = '0' + bus%10;
-	info->Name[2] = '.';
-	info->Name[3] = '0' + slot/10;
-	info->Name[4] = '0' + slot%10;
-	info->Name[5] = ':';
-	info->Name[6] = '0' + fcn;
-	info->Name[7] = '\0';
+	snprintf(info->Name, 8, "%02x.%02x:%x", bus, slot, fcn);
 	
 	// Create VFS Node
 	memset( &info->Node, 0, sizeof(tVFS_Node) );