Changeset 36257 in vbox

Timestamp:

Mar 11, 2011 9:37:58 AM (14 years ago)

Author:

vboxsync

Message:

more raw PCI code

Location:

trunk/src/VBox/HostDrivers/VBoxPci

Files:

• VBoxPci.c (modified) (16 diffs)
• VBoxPciInternal.h (modified) (4 diffs)

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

@@ -75 +75 @@
 }
 
+DECLINLINE(int) vboxPciDevLock(PVBOXRAWPCIINS pThis)
+{
+    int rc = RTSemFastMutexRequest(pThis->hFastMtx);
+    AssertRC(rc);
+    return rc;
+}
+
+DECLINLINE(void) vboxPciDevUnlock(PVBOXRAWPCIINS pThis)
+{
+    RTSemFastMutexRelease(pThis->hFastMtx);
+}
+
+DECLINLINE(int) vboxPciGlobalsLock(PVBOXRAWPCIGLOBALS pGlobals)
+{
+    int rc = RTSemFastMutexRequest(pGlobals->hFastMtx);
+    AssertRC(rc);
+    return rc;
+}
+
+DECLINLINE(void) vboxPciGlobalsUnlock(PVBOXRAWPCIGLOBALS pGlobals)
+{
+    RTSemFastMutexRelease(pGlobals->hFastMtx);
+}
+
+static PVBOXRAWPCIINS vboxPciFindInstanceLocked(PVBOXRAWPCIGLOBALS pGlobals, uint32_t iHostAddress)
+{
+    PVBOXRAWPCIINS pCur;
+    for (pCur = pGlobals->pInstanceHead; pCur != NULL; pCur = pCur->pNext)
+    {
+        if (iHostAddress == pCur->HostPciAddress)
+            return pCur;
+    }
+    return NULL;
+}
+
+static void vboxPciUnlinkInstanceLocked(PVBOXRAWPCIGLOBALS pGlobals, PVBOXRAWPCIINS pToUnlink)
+{
+    if (pGlobals->pInstanceHead == pToUnlink)
+        pGlobals->pInstanceHead = pToUnlink->pNext;
+    else
+    {
+        PVBOXRAWPCIINS pCur;
+        for (pCur = pGlobals->pInstanceHead; pCur != NULL; pCur = pCur->pNext)
+        {
+            if (pCur->pNext == pToUnlink)
+            {
+                pCur->pNext = pToUnlink->pNext;
+                break;
+            }
+        }
+    }
+    pToUnlink->pNext = NULL;
+}
+
+
 /**
  * @copydoc RAWPCIDEVPORT:: pfnRetain
@@ -80 +135 @@
 DECLHIDDEN(void) vboxPciDevRetain(PRAWPCIDEVPORT pPort)
 {
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
 }
 
@@ -87 +143 @@
 DECLHIDDEN(void) vboxPciDevRelease(PRAWPCIDEVPORT pPort)
 {
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    if (pThis->hFastMtx)
+    {
+        RTSemFastMutexDestroy(pThis->hFastMtx);
+        pThis->hFastMtx = NIL_RTSEMFASTMUTEX;
+    }
+
+    if (pThis->hSpinlock)
+    {
+        RTSpinlockDestroy(pThis->hSpinlock);
+        pThis->hSpinlock = NIL_RTSPINLOCK;
+    }
+
+    vboxPciGlobalsLock(pThis->pGlobals);
+    vboxPciUnlinkInstanceLocked(pThis->pGlobals, pThis);
+    vboxPciGlobalsUnlock(pThis->pGlobals);
 }
 
@@ -95 +168 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevInit(pThis, fFlags);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevInit(pThis, fFlags);
+
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -107 +185 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevDeinit(pThis, fFlags);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevDeinit(pThis, fFlags);
+
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -124 +207 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevGetRegionInfo(pThis, iRegion,
-                                       pRegionStart, pu64RegionSize,
-                                       pfPresent, pfFlags);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevGetRegionInfo(pThis, iRegion,
+                                   pRegionStart, pu64RegionSize,
+                                   pfPresent, pfFlags);
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -143 +230 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevMapRegion(pThis, iRegion, RegionStart, u64RegionSize, fFlags, pRegionBase);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevMapRegion(pThis, iRegion, RegionStart, u64RegionSize, fFlags, pRegionBase);
+
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -159 +251 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevUnmapRegion(pThis, iRegion, RegionStart, u64RegionSize, RegionBase);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevUnmapRegion(pThis, iRegion, RegionStart, u64RegionSize, RegionBase);
+
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -174 +271 @@
     int rc;
 
+    vboxPciDevLock(pThis);
+
     rc = vboxPciOsDevPciCfgRead(pThis, Register, pValue);
 
+    vboxPciDevUnlock(pThis);
+
     return rc;
 }
@@ -185 +286 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevPciCfgWrite(pThis, Register, pValue);
+    int rc;
+
+    vboxPciDevLock(pThis);
+
+    rc = vboxPciOsDevPciCfgWrite(pThis, Register, pValue);
+
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -195 +301 @@
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
     int rc;
+
+    vboxPciDevLock(pThis);
 
     pThis->pfnIrqHandler = pfnHandler;
@@ -206 +314 @@
     }
 
+    vboxPciDevUnlock(pThis);
+
     return rc;
 }
@@ -212 +322 @@
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
-
-    int rc = vboxPciOsDevUnregisterIrqHandler(pThis, iHostIrq);
+    int rc;
+
+    vboxPciDevLock(pThis);
+    rc = vboxPciOsDevUnregisterIrqHandler(pThis, iHostIrq);
+    if (RT_SUCCESS(rc))
+    {
+        pThis->pfnIrqHandler = NULL;
+        pThis->pIrqContext   = NULL;
+    }
+    vboxPciDevUnlock(pThis);
 
     return rc;
@@ -263 +381 @@
     if (RT_SUCCESS(rc))
     {
-        rc = pNew->DevPort.pfnInit(&pNew->DevPort, fFlags);
+        rc = RTSemFastMutexCreate(&pNew->hFastMtx);
         if (RT_SUCCESS(rc))
         {
-            *ppDevPort = &pNew->DevPort;
+            rc = pNew->DevPort.pfnInit(&pNew->DevPort, fFlags);
+            if (RT_SUCCESS(rc))
+            {
+                *ppDevPort = &pNew->DevPort;
+
+                pNew->pNext = pGlobals->pInstanceHead;
+                pGlobals->pInstanceHead = pNew;
+
+            }
+            else
+            {
+                RTSemFastMutexDestroy(pNew->hFastMtx);
+                RTSpinlockDestroy(pNew->hSpinlock);
+                RTMemFree(pNew);
+            }
+            return rc;
         }
-        else
-        {
-            RTSpinlockDestroy(pNew->hSpinlock);
-            RTMemFree(pNew);
-        }
-        return rc;
     }
 
@@ -292 +419 @@
     LogFlow(("vboxPciFactoryCreateAndConnect: PCI=%x fFlags=%#x\n", u32HostAddress, fFlags));
     Assert(pGlobals->cFactoryRefs > 0);
-    rc = RTSemFastMutexRequest(pGlobals->hFastMtx);
+    rc = vboxPciGlobalsLock(pGlobals);
     AssertRCReturn(rc, rc);
 
+    /* First search if there's no existing instance with same host device
+     * address - if so - we cannot continue.
+     */
+    if (vboxPciFindInstanceLocked(pGlobals, u32HostAddress) != NULL)
+    {
+        rc = VERR_RESOURCE_BUSY;
+        goto unlock;
+    }
+
     rc = vboxPciNewInstance(pGlobals, u32HostAddress, fFlags, ppDevPort);
 
-    RTSemFastMutexRelease(pGlobals->hFastMtx);
+unlock:
+    vboxPciGlobalsUnlock(pGlobals);
 
     return rc;
@@ -316 +453 @@
 static DECLHIDDEN(bool) vboxPciCanUnload(PVBOXRAWPCIGLOBALS pGlobals)
 {
-    int rc = RTSemFastMutexRequest(pGlobals->hFastMtx);
+    int rc = vboxPciGlobalsLock(pGlobals);
     bool fRc = !pGlobals->pInstanceHead
             && pGlobals->cFactoryRefs <= 0;
-    RTSemFastMutexRelease(pGlobals->hFastMtx);
+    vboxPciGlobalsUnlock(pGlobals);
     AssertRC(rc);
     return fRc;

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

@@ -27 +27 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-#define VBOX_WITH_IOMMU
+# ifdef DEBUG_nike
+#  define VBOX_WITH_IOMMU
+# endif
 #endif
 
@@ -55 +57 @@
     /** Pointer to the globals. */
     PVBOXRAWPCIGLOBALS pGlobals;
-    /** The spinlock protecting the state variables and host interface handle. */
+
+     /** Mutex protecting device access. */
+    RTSEMFASTMUTEX     hFastMtx;
+    /** The spinlock protecting the state variables and device access. */
     RTSPINLOCK         hSpinlock;
     /** Pointer to the next device in the list. */
@@ -68 +73 @@
     struct pci_dev  *  pPciDev;
 #endif
+    bool               fMsiUsed;
+    bool               fMsixUsed;
+    bool               fIommuUsed;
+    bool               fPad0;
 
     /** The session this interface is associated with. */
@@ -77 +86 @@
     RAWPCIDEVPORT      DevPort;
 
+    uint32_t           cHandlersCount;
     PFNRAWPCIISR       pfnIrqHandler;
     void              *pIrqContext;