Changeset 26376 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Feb 9, 2010 2:25:28 PM (15 years ago)

Author:

vboxsync

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

57469

Message:

HPET: reworking locking per Knut suggestions

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -177 +177 @@
     /* main counter */
     uint64_t             u64HpetCounter;
+
+    /* Global device lock */
+    PDMCRITSECT          csLock;
 } HpetState;
 
@@ -199 +202 @@
 static const bool fHpetLocking = true;
 
-DECLINLINE(int) hpetLock(HpetState* pThis)
+DECLINLINE(int) hpetLock(HpetState* pThis, int rcBusy)
 {
     if (!fHpetLocking)
-        return 0;
-
-    return pThis->CTX_SUFF(pHpetHlp)->pfnLock(pThis->CTX_SUFF(pDevIns),
-                                              VERR_INTERNAL_ERROR);
+        return VINF_SUCCESS;
+
+    return PDMCritSectEnter(&pThis->csLock, rcBusy);
 }
 
@@ -213 +215 @@
         return;
 
-    pThis->CTX_SUFF(pHpetHlp)->pfnUnlock(pThis->CTX_SUFF(pDevIns));
+    PDMCritSectLeave(&pThis->csLock);
 }
 
@@ -706 +708 @@
     LogFlow(("hpetMMIORead: %llx (%x)\n", (uint64_t)GCPhysAddr, iIndex));
 
-    rc = hpetLock(pThis);
-    AssertLogRelRCReturn(rc, rc);
+    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_READ);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        return rc;
 
     switch (cb)
@@ -748 +751 @@
              (uint64_t)GCPhysAddr, iIndex, *(uint32_t*)pv));
 
-    rc = hpetLock(pThis);
-    AssertLogRelRCReturn(rc, rc);
+    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_WRITE);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        return rc;
 
     switch (cb)
@@ -921 +925 @@
         return;
 
-    rc = hpetLock(pThis);
+    /* Lock in R3 must either block or succeed */
+    rc = hpetLock(pThis, VERR_IGNORED);
+    
     AssertLogRelRCReturnVoid(rc);
 
@@ -1122 +1128 @@
         return rc;
     }
+
+    /*
+     * Initialize critical section.
+     */
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csLock, RT_SRC_POS, "HPET");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("HPET cannot initialize critical section"));
+
     /*
      * Register the MMIO range, PDM API requests page aligned