Changeset 38721 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2011 7:04:13 AM (13 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: register a proper driver structure on Linux guests

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (10 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -52 +52 @@
 /** The device name for the device node open to everyone.. */
 #define DEVICE_NAME_USER        "vboxuser"
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-# define PCI_DEV_GET(v,d,p)     pci_get_device(v,d,p)
-# define PCI_DEV_PUT(x)         pci_dev_put(x)
-#else
-# define PCI_DEV_GET(v,d,p)     pci_find_device(v,d,p)
-# define PCI_DEV_PUT(x)         do {} while(0)
-#endif
+/** The name of the PCI driver */
+#define DRIVER_NAME             DEVICE_NAME
+
 
 /* 2.4.x compatibility macros that may or may not be defined. */
@@ -72 +66 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+static void vboxguestLinuxTermPci(struct pci_dev *pPciDev);
 static int  vboxguestLinuxModInit(void);
 static void vboxguestLinuxModExit(void);
@@ -94 +89 @@
 static VBOXGUESTDEVEXT          g_DevExt;
 /** The PCI device. */
-static struct pci_dev          *g_pPciDev;
+static struct pci_dev          *g_pPciDev = NULL;
 /** The base of the I/O port range. */
 static RTIOPORT                 g_IOPortBase;
@@ -244 +239 @@
  * @returns 0 on success, negated errno on failure.
  */
-static int __init vboxguestLinuxInitPci(void)
-{
-    struct pci_dev *pPciDev;
+static int vboxguestLinuxProbePci(struct pci_dev *pPciDev,
+                                  const struct pci_device_id *id)
+{
     int             rc;
 
-    pPciDev = PCI_DEV_GET(VMMDEV_VENDORID, VMMDEV_DEVICEID, NULL);
-    if (pPciDev)
-    {
-        rc = pci_enable_device(pPciDev);
-        if (rc >= 0)
+    NOREF(id);
+    AssertReturn(!g_pPciDev, -EINVAL);
+    rc = pci_enable_device(pPciDev);
+    if (rc >= 0)
+    {
+        /* I/O Ports are mandatory, the MMIO bit is not. */
+        g_IOPortBase = pci_resource_start(pPciDev, 0);
+        if (g_IOPortBase != 0)
         {
-            /* I/O Ports are mandatory, the MMIO bit is not. */
-            g_IOPortBase = pci_resource_start(pPciDev, 0);
-            if (g_IOPortBase != 0)
+            /*
+             * Map the register address space.
+             */
+            g_MMIOPhysAddr = pci_resource_start(pPciDev, 1);
+            g_cbMMIO       = pci_resource_len(pPciDev, 1);
+            if (request_mem_region(g_MMIOPhysAddr, g_cbMMIO, DEVICE_NAME) != NULL)
             {
-                /*
-                 * Map the register address space.
-                 */
-                g_MMIOPhysAddr = pci_resource_start(pPciDev, 1);
-                g_cbMMIO       = pci_resource_len(pPciDev, 1);
-                if (request_mem_region(g_MMIOPhysAddr, g_cbMMIO, DEVICE_NAME) != NULL)
+                g_pvMMIOBase = ioremap(g_MMIOPhysAddr, g_cbMMIO);
+                if (g_pvMMIOBase)
                 {
-                    g_pvMMIOBase = ioremap(g_MMIOPhysAddr, g_cbMMIO);
-                    if (g_pvMMIOBase)
-                    {
-                        /** @todo why aren't we requesting ownership of the I/O ports as well? */
-                        g_pPciDev = pPciDev;
-                        return 0;
-                    }
-
-                    /* failure cleanup path */
-                    LogRel((DEVICE_NAME ": ioremap failed; MMIO Addr=%RHp cb=%#x\n", g_MMIOPhysAddr, g_cbMMIO));
-                    rc = -ENOMEM;
-                    release_mem_region(g_MMIOPhysAddr, g_cbMMIO);
+                    /** @todo why aren't we requesting ownership of the I/O ports as well? */
+                    g_pPciDev = pPciDev;
+                    return 0;
                 }
-                else
-                {
-                    LogRel((DEVICE_NAME ": failed to obtain adapter memory\n"));
-                    rc = -EBUSY;
-                }
-                g_MMIOPhysAddr = NIL_RTHCPHYS;
-                g_cbMMIO       = 0;
-                g_IOPortBase   = 0;
+
+                /* failure cleanup path */
+                LogRel((DEVICE_NAME ": ioremap failed; MMIO Addr=%RHp cb=%#x\n", g_MMIOPhysAddr, g_cbMMIO));
+                rc = -ENOMEM;
+                release_mem_region(g_MMIOPhysAddr, g_cbMMIO);
             }
             else
             {
-                LogRel((DEVICE_NAME ": did not find expected hardware resources\n"));
-                rc = -ENXIO;
+                LogRel((DEVICE_NAME ": failed to obtain adapter memory\n"));
+                rc = -EBUSY;
             }
-            pci_disable_device(pPciDev);
+            g_MMIOPhysAddr = NIL_RTHCPHYS;
+            g_cbMMIO       = 0;
+            g_IOPortBase   = 0;
         }
         else
-            LogRel((DEVICE_NAME ": could not enable device: %d\n", rc));
-        PCI_DEV_PUT(pPciDev);
+        {
+            LogRel((DEVICE_NAME ": did not find expected hardware resources\n"));
+            rc = -ENXIO;
+        }
+        pci_disable_device(pPciDev);
     }
     else
-    {
-        printk(KERN_ERR DEVICE_NAME ": VirtualBox Guest PCI device not found.\n");
-        rc = -ENODEV;
-    }
+        LogRel((DEVICE_NAME ": could not enable device: %d\n", rc));
     return rc;
 }
@@ -311 +298 @@
  * Clean up the usage of the PCI device.
  */
-static void vboxguestLinuxTermPci(void)
-{
-    struct pci_dev *pPciDev = g_pPciDev;
+static void vboxguestLinuxTermPci(struct pci_dev *pPciDev)
+{
     g_pPciDev = NULL;
     if (pPciDev)
@@ -327 +313 @@
     }
 }
+
+
+/** Structure for registering the PCI driver. */
+static struct pci_driver  g_PciDriver =
+{
+    name:           DRIVER_NAME,
+    id_table:       g_VBoxGuestPciId,
+    probe:          vboxguestLinuxProbePci,
+    remove:         vboxguestLinuxTermPci
+};
 
 
@@ -453 +449 @@
     g_pInputDevice->open                  = vboxguestOpenInputDevice;
     g_pInputDevice->close                 = vboxguestCloseInputDevice;
-    /** @todo parent (PCI?) device in device model view. */
-    /* g_pInputDevice->dev.parent = */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 2)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+    g_pInputDevice->dev->dev              = &g_pPciDev->dev;
+# elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+    g_pInputDevice->cdev.dev              = &g_pPciDev->dev;
+# else
+    g_pInputDevice->dev.parent            = &g_pPciDev->dev;
+#endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
     {
@@ -613 +616 @@
      * Locate and initialize the PCI device.
      */
-    rc = vboxguestLinuxInitPci();
-    if (rc >= 0)
+    rc = pci_register_driver(&g_PciDriver);
+    if (rc >= 0 && g_pPciDev)
     {
         /*
@@ -691 +694 @@
             vboxguestLinuxTermISR();
         }
-        vboxguestLinuxTermPci();
+        pci_unregister_driver(&g_PciDriver);
+    }
+    else
+    {
+        LogRel((DEVICE_NAME ": PCI device registration failed (pci_register_device returned %d)\n", rc));
+        rc = -EINVAL;
     }
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
@@ -713 +721 @@
     VBoxGuestDeleteDevExt(&g_DevExt);
     vboxguestLinuxTermISR();
-    vboxguestLinuxTermPci();
+    pci_unregister_driver(&g_PciDriver);
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
     RTLogDestroy(RTLogSetDefaultInstance(NULL));