Changeset 20092 in vbox for trunk/src/VBox/Devices/PC/DevAPIC.cpp

Timestamp:

May 27, 2009 3:19:32 PM (16 years ago)

Author:

vboxsync

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

47839

Message:

DevAPIC,PDM: timer critsect.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (12 diffs)

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

@@ -59 +59 @@
 /** @def APIC_LOCK
  * Acquires the PDM lock. */
-#define APIC_LOCK(pThis, rc) \
+#define APIC_LOCK(pThis, rcBusy) \
     do { \
-        int rc2 = (pThis)->CTX_SUFF(pApicHlp)->pfnLock((pThis)->CTX_SUFF(pDevIns), rc); \
+        int rc2 = PDMCritSectEnter((pThis)->CTX_SUFF(pCritSect), (rcBusy)); \
         if (rc2 != VINF_SUCCESS) \
             return rc2; \
@@ -68 +68 @@
 /** @def APIC_LOCK_VOID
  * Acquires the PDM lock and does not expect failure (i.e. ring-3 only!). */
-#define APIC_LOCK_VOID(pThis, rc) \
+#define APIC_LOCK_VOID(pThis, rcBusy) \
     do { \
-        int rc2 = (pThis)->CTX_SUFF(pApicHlp)->pfnLock((pThis)->CTX_SUFF(pDevIns), rc); \
+        int rc2 = PDMCritSectEnter((pThis)->CTX_SUFF(pCritSect), (rcBusy)); \
         AssertLogRelRCReturnVoid(rc2); \
     } while (0)
@@ -77 +77 @@
  * Releases the PDM lock. */
 #define APIC_UNLOCK(pThis) \
-    (pThis)->CTX_SUFF(pApicHlp)->pfnUnlock((pThis)->CTX_SUFF(pDevIns))
+    PDMCritSectLeave((pThis)->CTX_SUFF(pCritSect))
 
 /** @def IOAPIC_LOCK
@@ -281 +281 @@
 {
     /** The device instance - R3 Ptr. */
-    PPDMDEVINSR3    pDevInsR3;
+    PPDMDEVINSR3            pDevInsR3;
     /** The APIC helpers - R3 Ptr. */
-    PCPDMAPICHLPR3  pApicHlpR3;
+    PCPDMAPICHLPR3          pApicHlpR3;
     /** LAPICs states - R3 Ptr */
-    RTR3PTR         pLapicsR3;
+    RTR3PTR                 pLapicsR3;
+    /** The critical section - R3 Ptr. */
+    R3PTRTYPE(PPDMCRITSECT) pCritSectR3;
 
     /** The device instance - R0 Ptr. */
-    PPDMDEVINSR0    pDevInsR0;
+    PPDMDEVINSR0            pDevInsR0;
     /** The APIC helpers - R0 Ptr. */
-    PCPDMAPICHLPR0  pApicHlpR0;
+    PCPDMAPICHLPR0          pApicHlpR0;
     /** LAPICs states - R0 Ptr */
-    RTR0PTR         pLapicsR0;
+    RTR0PTR                 pLapicsR0;
+    /** The critical section - R3 Ptr. */
+    R0PTRTYPE(PPDMCRITSECT) pCritSectR0;
 
     /** The device instance - RC Ptr. */
-    PPDMDEVINSRC    pDevInsRC;
+    PPDMDEVINSRC            pDevInsRC;
     /** The APIC helpers - RC Ptr. */
-    PCPDMAPICHLPRC  pApicHlpRC;
+    PCPDMAPICHLPRC          pApicHlpRC;
     /** LAPICs states - RC Ptr */
-    RTRCPTR         pLapicsRC;
+    RTRCPTR                 pLapicsRC;
+    /** The critical section - R3 Ptr. */
+    RCPTRTYPE(PPDMCRITSECT) pCritSectRC;
+    RTRCPTR                 Padding0;
 
     /** APIC specification version in this virtual hardware configuration. */
-    PDMAPICVERSION  enmVersion;
+    PDMAPICVERSION          enmVersion;
 
     /** Number of attempts made to optimize TPR accesses. */
-    uint32_t        ulTPRPatchAttempts;
+    uint32_t                cTPRPatchAttempts;
 
     /** Number of CPUs on the system (same as LAPIC count). */
-    uint32_t        cCpus;
+    uint32_t                cCpus;
 
 # ifdef VBOX_WITH_STATISTICS
@@ -1306 +1313 @@
     APICState *s = (APICState *)pvUser;
     Assert(s->pTimerR3 == pTimer);
-
-    APIC_LOCK_VOID(dev, VERR_INTERNAL_ERROR);
 # endif /* VBOX */
 
@@ -1315 +1320 @@
     }
     apic_timer_update(dev, s, s->next_time);
-
-# ifdef VBOX
-    APIC_UNLOCK(dev);
-# endif
 }
 #endif /* IN_RING3 */
@@ -2057 +2058 @@
 
             if (    index == 0x08 /* TPR */
-                &&  ++s->ulTPRPatchAttempts < APIC_MAX_PATCH_ATTEMPTS)
+                &&  ++s->cTPRPatchAttempts < APIC_MAX_PATCH_ATTEMPTS)
             {
 #ifdef IN_RC
@@ -2178 +2179 @@
 static DECLCALLBACK(void) apicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
-    dev->pDevInsRC  = PDMDEVINS_2_RCPTR(pDevIns);
-    dev->pApicHlpRC = dev->pApicHlpR3->pfnGetRCHelpers(pDevIns);
-    dev->pLapicsRC  = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), dev->pLapicsR3);
-    foreach_apic(dev, 0xffffffff,
+    APICDeviceInfo *pThis = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    pThis->pDevInsRC   = PDMDEVINS_2_RCPTR(pDevIns);
+    pThis->pApicHlpRC  = pThis->pApicHlpR3->pfnGetRCHelpers(pDevIns);
+    pThis->pLapicsRC   = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), pThis->pLapicsR3);
+    pThis->pCritSectRC = pThis->pApicHlpR3->pfnGetRCCritSect(pDevIns);
+    foreach_apic(pThis, 0xffffffff,
                  apic->pTimerRC = TMTimerRCPtr(apic->CTX_SUFF(pTimer)));
 }
@@ -2346 +2348 @@
         return rc;
     }
+    pThis->pCritSectR3 = pThis->pApicHlpR3->pfnGetR3CritSect(pDevIns);
 
     /*
@@ -2376 +2379 @@
 
     if (fGCEnabled) {
-        pThis->pApicHlpRC = pThis->pApicHlpR3->pfnGetRCHelpers(pDevIns);
+        pThis->pApicHlpRC  = pThis->pApicHlpR3->pfnGetRCHelpers(pDevIns);
+        pThis->pCritSectRC = pThis->pApicHlpR3->pfnGetRCCritSect(pDevIns);
 
         rc = PDMDevHlpMMIORegisterGC(pDevIns, LAPIC_BASE(pThis)->apicbase & ~0xfff, 0x1000, 0,
@@ -2385 +2389 @@
 
     if (fR0Enabled) {
-        pThis->pApicHlpR0 = pThis->pApicHlpR3->pfnGetR0Helpers(pDevIns);
+        pThis->pApicHlpR0  = pThis->pApicHlpR3->pfnGetR0Helpers(pDevIns);
+        pThis->pCritSectR0 = pThis->pApicHlpR3->pfnGetR0CritSect(pDevIns);
 
         rc = PDMDevHlpMMIORegisterR0(pDevIns, LAPIC_BASE(pThis)->apicbase & ~0xfff, 0x1000, 0,
@@ -2404 +2409 @@
         apic->pTimerR0 = TMTimerR0Ptr(apic->pTimerR3);
         apic->pTimerRC = TMTimerRCPtr(apic->pTimerR3);
-        /// @todo TMTimerSetCritSect(apic->pTimerR3, pThis->pApicHlpR3->pfnGetCritSect(..));
+        TMR3TimerSetCritSect(apic->pTimerR3, pThis->pCritSectR3);
         apic++;
     }