Changeset 54448 in vbox

Timestamp:

Feb 24, 2015 2:06:20 PM (10 years ago)

Author:

vboxsync

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

98551

Message:

SUPDrv: Register a power manage notification callback so we can cancel the invariant TSC frequency refinement timer.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrvGip.cpp (modified) (4 diffs)
• SUPDrvInternal.h (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -773 +773 @@
 
     /*
+     * If we got a power event, stop the refinement process.
+     */
+    if (pDevExt->fInvTscRefinePowerEvent)
+    {
+        int rc = RTTimerStop(pTimer); AssertRC(rc);
+        return;
+    }
+
+    /*
      * Try get close to the next clock tick as usual.
      *
@@ -846 +855 @@
             SUPR0Printf("vboxdrv: start: %u, %u, %#llx  stop: %u, %u, %#llx\n",
                         iStartCpuSet, iStartGipCpu, iStartTscDelta, iStopCpuSet, iStopGipCpu, iStopTscDelta);
-            int rc = RTTimerStop(pTimer);
-            AssertRC(rc);
+            int rc = RTTimerStop(pTimer); AssertRC(rc);
             return;
         }
@@ -882 +890 @@
 
 /**
+ * @callback_method_impl{FNRTPOWERNOTIFICATION}
+ */
+static DECLCALLBACK(void) supdrvGipPowerNotificationCallback(RTPOWEREVENT enmEvent, void *pvUser)
+{
+    PSUPDRVDEVEXT pDevExt = (PSUPDRVDEVEXT)pvUser;
+
+    /*
+     * If the TSC frequency refinement timer we need to cancel it so it doesn't screw
+     * up the frequency after a long suspend.
+     */
+    if (   enmEvent == RTPOWEREVENT_SUSPEND
+        || enmEvent == RTPOWEREVENT_RESUME)
+        ASMAtomicWriteBool(&pDevExt->fInvTscRefinePowerEvent, true);
+}
+
+
+/**
  * Start the TSC-frequency refinment timer for the invariant TSC GIP mode.
  *
@@ -896 +921 @@
     RTCCUINTREG uFlags;
     int         rc;
+
+    /*
+     * Register a power management callback.
+     */
+    pDevExt->fInvTscRefinePowerEvent = true;
+    rc = RTPowerNotificationRegister(supdrvGipPowerNotificationCallback, pDevExt);
+    AssertRC(rc); /* ignore */
 
     /*

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -708 +708 @@
     /** Pointer to the timer used to refine the TSC frequency. */
     PRTTIMER                        pInvarTscRefineTimer;
+    /** Stop the timer on the next tick because we saw a power event. */
+    bool volatile                   fInvTscRefinePowerEvent;
     /** @} */
 
     /** @name TSC-delta measurement.
      *  @{ */
+    /** Number of online/offline events, incremented each time a CPU goes online
+     *  or offline. */
+    uint32_t volatile               cMpOnOffEvents;
     /** TSC-delta measurement mutext.
      * At the moment, we don't want to have more than one measurement going on at
@@ -721 +726 @@
     RTSEMFASTMUTEX                  mtxTscDelta;
 #endif
-    /** Number of online/offline events, incremented each time a CPU goes online
-     *  or offline. */
-    uint32_t volatile               cMpOnOffEvents;
     /** The set of CPUs we need to take measurements for. */
     RTCPUSET                        TscDeltaCpuSet;