Changeset 36485 in vbox

Timestamp:

Apr 1, 2011 5:04:35 AM (14 years ago)

Author:

vboxsync

Message:

PCI: sync of interrupts rework

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (6 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (4 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (3 diffs)

trunk/include/VBox/rawpci.h

@@ -36 +36 @@
  */
 typedef uint32_t PCIRAWDEVHANDLE;
+
+/**
+ * Handle for the ISR.
+ */
+typedef uint32_t PCIRAWISRHANDLE;
 
 /**
@@ -98 +103 @@
 {
     /* in */
-    uint32_t PciAddress;
-    uint32_t fFlags;
+    uint32_t        PciAddress;
+    uint32_t        fFlags;
     /* out */
     PCIRAWDEVHANDLE Device;
@@ -339 +344 @@
  * Interrupt service routine callback.
  *
- * @param   pvContext       Opaque user data which to the handler.
+ * @param   pvContext       Opaque user data passed to the handler.
  * @param   iIrq            Interrupt number.
  */
@@ -448 +453 @@
      * @param   pfnHandler  Pointer to the handler.
      * @param   pIrqContext Context passed to the handler.
-     * @param   piHostIrq   Which host IRQ is used.
-     */
-    DECLR0CALLBACKMEMBER(int,  pfnRegisterIrqHandler,(PRAWPCIDEVPORT pPort,
-                                                      PFNRAWPCIISR   pfnHandler,
-                                                      void*          pIrqContext,
-                                                      int32_t        *piHostIrq));
+     * @param   phIsr       Handle for the ISR, .
+     */
+    DECLR0CALLBACKMEMBER(int,  pfnRegisterIrqHandler,(PRAWPCIDEVPORT    pPort,
+                                                      PFNRAWPCIISR      pfnHandler,
+                                                      void*             pIrqContext,
+                                                      PCIRAWISRHANDLE   *phIsr));
 
     /**
@@ -459 +464 @@
      *
      * @param   pPort       Pointer to this structure.
-     * @param   iHostIrq    Which host IRQ was used (retured by earlier pfnRegisterIrqHandler).
-     */
-    DECLR0CALLBACKMEMBER(int,  pfnUnregisterIrqHandler,(PRAWPCIDEVPORT pPort,
-                                                        int32_t        iHostIrq));
+     * @param   hIsr        Handle of ISR to unregister (retured by earlier pfnRegisterIrqHandler).
+     */
+    DECLR0CALLBACKMEMBER(int,  pfnUnregisterIrqHandler,(PRAWPCIDEVPORT  pPort,
+                                                        PCIRAWISRHANDLE hIsr));
 
     /**
@@ -479 +484 @@
 } RAWPCIDEVPORT;
 /** Version number for the RAWPCIDEVPORT::u32Version and RAWPCIIFPORT::u32VersionEnd fields. */
-#define RAWPCIDEVPORT_VERSION   UINT32_C(0xAFBDCC01)
+#define RAWPCIDEVPORT_VERSION   UINT32_C(0xAFBDCC02)
 
 /**

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -189 +189 @@
     int rc;
 
-    /* Bit racy, better check under lock. */
-    if (pThis->iHostIrq != -1)
-    {
-        pPort->pfnUnregisterIrqHandler(pPort, pThis->iHostIrq);
-        pThis->iHostIrq = -1;
-    }
-
-    vboxPciDevLock(pThis);
+    vboxPciDevLock(pThis);
+    
+    if (pThis->IrqHandler.pfnIrqHandler)
+    {
+        pPort->pfnUnregisterIrqHandler(pPort, pThis->IrqHandler.iHostIrq);
+        pThis->IrqHandler.iHostIrq = -1;
+        pThis->IrqHandler.pfnIrqHandler = NULL;
+    }
 
     rc = vboxPciOsDevDeinit(pThis, fFlags);
@@ -339 +339 @@
 }
 
-DECLHIDDEN(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, PFNRAWPCIISR pfnHandler, void* pIrqContext, int32_t *piHostIrq)
-{
-    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-    int rc;
-
-    vboxPciDevLock(pThis);
-
-    pThis->pfnIrqHandler = pfnHandler;
-    pThis->pIrqContext   = pIrqContext;
-    rc = vboxPciOsDevRegisterIrqHandler(pThis, pfnHandler, pIrqContext, piHostIrq);
-    if (RT_FAILURE(rc))
-    {
-        pThis->pfnIrqHandler = NULL;
-        pThis->pIrqContext   = NULL;
-        pThis->iHostIrq      = -1;
-        *piHostIrq = -1;
+DECLHIDDEN(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, PFNRAWPCIISR pfnHandler, void* pIrqContext, PCIRAWISRHANDLE *phIsr)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+    int     rc;
+    int32_t iHostIrq = 0;    
+
+    if (pfnHandler == NULL)
+        return VERR_INVALID_PARAMETER;
+
+    vboxPciDevLock(pThis);
+
+    if (pThis->IrqHandler.pfnIrqHandler)
+    {
+        rc = VERR_ALREADY_EXISTS;
     }
     else
-        pThis->iHostIrq      = *piHostIrq;
-
-    vboxPciDevUnlock(pThis);
-
-    return rc;
-}
-
-DECLHIDDEN(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, int32_t iHostIrq)
-{
-    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-    int rc;
-
-    vboxPciDevLock(pThis);
-
-    Assert(iHostIrq == pThis->iHostIrq);
-    rc = vboxPciOsDevUnregisterIrqHandler(pThis, iHostIrq);
+    {
+        rc = vboxPciOsDevRegisterIrqHandler(pThis, pfnHandler, pIrqContext, &iHostIrq);
+        if (RT_SUCCESS(rc))
+        {
+            *phIsr = 0xcafe0000;
+            pThis->IrqHandler.iHostIrq      = iHostIrq;
+            pThis->IrqHandler.pfnIrqHandler = pfnHandler;
+            pThis->IrqHandler.pIrqContext   = pIrqContext;
+        }
+    }
+        
+    vboxPciDevUnlock(pThis);
+
+    return rc;
+}
+
+DECLHIDDEN(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, PCIRAWISRHANDLE hIsr)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+    int rc;
+
+    if (hIsr != 0xcafe0000)
+        return VERR_INVALID_PARAMETER;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevUnregisterIrqHandler(pThis, pThis->IrqHandler.iHostIrq);
     if (RT_SUCCESS(rc))
     {
-        pThis->pfnIrqHandler = NULL;
-        pThis->pIrqContext   = NULL;
-        pThis->iHostIrq = -1;
+        pThis->IrqHandler.pfnIrqHandler = NULL;
+        pThis->IrqHandler.pIrqContext   = NULL;
+        pThis->IrqHandler.iHostIrq = -1;
     }
     vboxPciDevUnlock(pThis);
@@ -393 +402 @@
     rc = vboxPciOsDevPowerStateChange(pThis, aState);
 
-    if (aState == PCIRAW_POWER_ON)
-    {
-        /*
-         * Let virtual device know about VM caps.
-         */
-        *pu64Param = VBOX_DRV_VMDATA(pThis)->pPerVmData->fVmCaps;
-    }
-    else
-        pu64Param = 0;
+    switch (aState)
+    {
+        case PCIRAW_POWER_ON:
+            /*
+             * Let virtual device know about VM caps.
+             */
+            *pu64Param = VBOX_DRV_VMDATA(pThis)->pPerVmData->fVmCaps;
+            break;
+        default:
+            pu64Param = 0;
+            break;
+    }
 
 
@@ -434 +446 @@
     pNew->pNext                         = NULL;
     pNew->HostPciAddress                = u32HostAddress;
-    pNew->iHostIrq                      = -1;
     pNew->pVmCtx                        = pVmCtx;
 

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

@@ -27 +27 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-//# ifdef DEBUG_nike
-#  define VBOX_WITH_IOMMU
-//# endif
+# define VBOX_WITH_IOMMU
 #endif
 
@@ -45 +43 @@
 typedef struct VBOXRAWPCIDRVVM   *PVBOXRAWPCIDRVVM;
 typedef struct VBOXRAWPCIINS     *PVBOXRAWPCIINS;
+
+typedef struct VBOXRAWPCIISRDESC 
+{
+    /** Handler function. */
+    PFNRAWPCIISR       pfnIrqHandler;
+    /** Handler context. */
+    void              *pIrqContext;
+    /** Host IRQ. */
+    int32_t            iHostIrq;
+} VBOXRAWPCIISRDESC;
+typedef struct VBOXRAWPCIISRDESC     *PVBOXRAWPCIISRDESC;
 
 /**
@@ -77 +86 @@
     bool               fPad0;
 
-    /** Temporary: host IRQ we were given. Assumes single IRQ devices. */
-    int32_t            iHostIrq;
-
     /** Port, given to the outside world. */
     RAWPCIDEVPORT      DevPort;
 
-    uint32_t           cHandlersCount;
-    PFNRAWPCIISR       pfnIrqHandler;
-    void              *pIrqContext;
+    /** IRQ handler. */
+    VBOXRAWPCIISRDESC  IrqHandler;
 
+    /** Pointer to per-VM context in hypervisor data. */
     PRAWPCIPERVM       pVmCtx;
 } VBOXRAWPCIINS;