Changeset 36124 in vbox

Timestamp:

Mar 1, 2011 4:44:58 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70289

Message:

PCI: code to perform host driver detach on Linux - not yet fully functional

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (1 diff)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/include/VBox/rawpci.h

@@ -375 +375 @@
 #define RAWPCIFACTORY_UUID_STR "c0268f49-e1e4-402b-b7e0-eb8d09659a9b"
 
+/**
+ * Flags passed to pfnPciDeviceConstructStart(), to notify driver
+ * about options to be used to open device.
+ */
+typedef enum PCIRAWDRIVERFLAGS
+{
+    /** If runtime shall  try to detach host driver. */
+    PCIRAWDRIVERRFLAG_DETACH_HOST_DRIVER   =  (1 << 0),
+    /** The usual 32-bit type blow up. */
+    PCIRAWDRIVERRFLAG_32BIT_HACK = 0x7fffffff
+} PCIRAWDRIVERFLAGS;
+
+
 RT_C_DECLS_END
 

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1727 +1727 @@
 
         int iIrq = aPciIrqs[ich9pciSlotGetPirq(uBus, uDevFn, iPin)];
-        Log(("Using pin %d and IRQ %d for device %02x:%02x.%d\n", 
+        Log(("Using pin %d and IRQ %d for device %02x:%02x.%d\n",
              iPin, iIrq, uBus, uDevFn>>3, uDevFn&7));
         ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_INTERRUPT_LINE, iIrq, 1);
@@ -2571 +2571 @@
     }
 
-    PCIDevSetCommand(pDev,
-                     PCIDevGetCommand(pDev)
-                     &
-                     ~(VBOX_PCI_COMMAND_IO |
-                       VBOX_PCI_COMMAND_MEMORY |
-                       VBOX_PCI_COMMAND_MASTER));
-
-    /* Bridge device reset handlers processed later */
-    if (!pciDevIsPci2PciBridge(pDev))
-    {
-        PCIDevSetByte(pDev, VBOX_PCI_CACHE_LINE_SIZE, 0x0);
-        PCIDevSetInterruptLine(pDev, 0x0);
+    if (pciDevIsPassthrough(pDev))
+    {
+        // implement reset handler
+        AssertFailed();
+    }
+    else
+    {
+        PCIDevSetCommand(pDev,
+                         PCIDevGetCommand(pDev)
+                         &
+                         ~(VBOX_PCI_COMMAND_IO |
+                           VBOX_PCI_COMMAND_MEMORY |
+                           VBOX_PCI_COMMAND_MASTER));
+        
+        /* Bridge device reset handlers processed later */
+        if (!pciDevIsPci2PciBridge(pDev))
+        {
+            PCIDevSetByte(pDev, VBOX_PCI_CACHE_LINE_SIZE, 0x0);
+            PCIDevSetInterruptLine(pDev, 0x0);
+        }
     }
 }

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -92 +92 @@
     /** The SUPDRV IDC handle (opaque struct). */
     SUPDRVIDCHANDLE SupDrvIDC;
+#ifdef RT_OS_LINUX
+    struct module    * pciStubModule;
+#endif
+
 } VBOXRAWPCIGLOBALS;
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -526 +526 @@
         InsertConfigString(pCfg,       "DeviceName",  aDevName);
 
+        InsertConfigInteger(pCfg,      "DetachHostDriver",  1);
         InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPciAddress.iBus);
         InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPciAddress.iDevice);