Changeset 24749 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2009 12:32:14 AM (15 years ago)

Author:

vboxsync

Message:

DevAHCI: async suspend, reset and power off handling for the SATA part.

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (16 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -583 +583 @@
     PDMCRITSECT                     lock;
 
-    /** Semaphore that gets set when fSignalIdle is set. */
-    RTSEMEVENT                      hEvtIdle;
-#if HC_ARCH_BITS == 32
-    uint32_t                        Alignment7;
-#endif
-
     /** Bitmask of ports which asserted an interrupt. */
     uint32_t                        u32PortsInterrupted;
@@ -601 +595 @@
     /** If the new async interface is used if available. */
     bool                            fUseAsyncInterfaceIfAvailable;
-    /** Indicates that hEvtIdle should be signalled when a port is entering the
-     * idle state. */
+    /** Indicates that PDMDevHlpAsyncNotificationCompleted should be called when
+     * a port is entering the idle state. */
     bool volatile                   fSignalIdle;
     bool                            afAlignment8[1];
@@ -4928 +4922 @@
 
     if (pAhciPort->uActTasksActive == 0 && pAhciPort->pAhciR3->fSignalIdle)
-        RTSemEventSignal(pAhciPort->pAhciR3->hEvtIdle);
+        PDMDevHlpAsyncNotificationCompleted(pAhciPort->pDevInsR3);
     return rc;
 }
@@ -5387 +5381 @@
         ASMAtomicXchgBool(&pAhciPort->fAsyncIOThreadIdle, true);
         if (pAhci->fSignalIdle)
-            RTSemEventSignal(pAhci->hEvtIdle);
+            PDMDevHlpAsyncNotificationCompleted(pAhciPort->pDevInsR3);
 
         rc = RTSemEventWait(pAhciPort->AsyncIORequestSem, 1000);
@@ -5652 +5646 @@
 
     if (pAhci->fSignalIdle)
-        RTSemEventSignal(pAhci->hEvtIdle);
+        PDMDevHlpAsyncNotificationCompleted(pAhciPort->pDevInsR3);
 
     /* Free task state memory */
@@ -5785 +5779 @@
             ataControllerDestroy(&pAhci->aCts[i]);
 
-        RTSemEventDestroy(pAhci->hEvtIdle);
-        pAhci->hEvtIdle = NIL_RTSEMEVENT;
-
         PDMR3CritSectDelete(&pAhci->lock);
     }
@@ -5895 +5886 @@
 }
 
-static bool ahciWaitForAllAsyncIOIsFinished(PPDMDEVINS pDevIns, unsigned cMillies)
-{
-    PAHCI     pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-    uint64_t  u64Start;
-    PAHCIPort pAhciPort;
-    bool      fAllFinished;
-
-    ASMAtomicWriteBool(&pAhci->fSignalIdle, true);
-    u64Start = RTTimeMilliTS();
-    for (;;)
-    {
-        fAllFinished = true;
-        for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->ahciPort); i++)
-        {
-            pAhciPort = &pAhci->ahciPort[i];
-
-            if (pAhciPort->pDrvBase)
-            {
-                if (pAhciPort->fAsyncInterface)
-                    fAllFinished &= (pAhciPort->uActTasksActive == 0);
-                else
-                    fAllFinished &= ((pAhciPort->uActTasksActive == 0) && (pAhciPort->fAsyncIOThreadIdle));
-
-                if (!fAllFinished)
-                    break;
-            }
-        }
-        if (   fAllFinished
-            || RTTimeMilliTS() - u64Start >= cMillies)
-            break;
-
-        /* Wait for a port to signal idleness. */
-        int rc = RTSemEventWait(pAhci->hEvtIdle, 100 /*ms*/);
-        AssertMsg(RT_SUCCESS(rc) || rc == VERR_TIMEOUT, ("%Rrc\n", rc)); NOREF(rc);
-    }
-
-    ASMAtomicWriteBool(&pAhci->fSignalIdle, false);
-    return fAllFinished;
+/**
+ * Checks if all asynchronous I/O is finished.
+ *
+ * @returns true if quiesced, false if busy.
+ * @param   pDevIns         The device instance.
+ */
+static bool ahciR3AllAsyncIOIsFinished(PPDMDEVINS pDevIns)
+{
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+
+    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->ahciPort); i++)
+    {
+        PAHCIPort pThisPort = &pThis->ahciPort[i];
+        if (pThisPort->pDrvBase)
+        {
+            bool fFinished;
+            if (pThisPort->fAsyncInterface)
+                fFinished = (pThisPort->uActTasksActive == 0);
+            else
+                fFinished = ((pThisPort->uActTasksActive == 0) && (pThisPort->fAsyncIOThreadIdle));
+            if (!fFinished)
+               return false;
+        }
+    }
+    return true;
 }
 
@@ -5939 +5917 @@
     PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
 
-    if (!ahciWaitForAllAsyncIOIsFinished(pDevIns, 20000))
-        AssertMsgFailed(("One port is still active\n"));
+    Assert(ahciR3AllAsyncIOIsFinished(pDevIns));
 
     for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
@@ -5968 +5945 @@
 
     return VINF_SUCCESS;
+}
+
+/**
+ * Callback employed by ataSuspend and ataR3PowerOff.
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDevIns     The device instance.
+ */
+static DECLCALLBACK(bool) ahciR3IsAsyncSuspendOrPowerOffDone(PPDMDEVINS pDevIns)
+{
+    if (!ahciR3AllAsyncIOIsFinished(pDevIns))
+        return false;
+
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+    ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+    return true;
+}
+
+/**
+ * Common worker for ataSuspend and ataR3PowerOff.
+ */
+static void ahciR3SuspendOrPowerOff(PPDMDEVINS pDevIns)
+{
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+
+    ASMAtomicWriteBool(&pThis->fSignalIdle, true);
+    if (!ahciR3AllAsyncIOIsFinished(pDevIns))
+        PDMDevHlpSetAsyncNotification(pDevIns, ahciR3IsAsyncSuspendOrPowerOffDone);
+    else
+        ASMAtomicWriteBool(&pThis->fSignalIdle, false);
 }
 
@@ -5978 +5985 @@
 static DECLCALLBACK(void) ahciSuspend(PPDMDEVINS pDevIns)
 {
+    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
+    Log(("%s:\n", __FUNCTION__));
+
+    ahciR3SuspendOrPowerOff(pDevIns);
+
+    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
+        ataControllerSuspend(&pAhci->aCts[i]);
+}
+
+/**
+ * Resume notification.
+ *
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(void) ahciResume(PPDMDEVINS pDevIns)
+{
     PAHCI    pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
-    if (!ahciWaitForAllAsyncIOIsFinished(pDevIns, 20000))
-        AssertMsgFailed(("AHCI: One port is still active\n"));
 
     Log(("%s:\n", __FUNCTION__));
     for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-    {
-        ataControllerSuspend(&pAhci->aCts[i]);
-    }
-    return;
-}
-
-
-/**
- * Resume notification.
- *
- * @returns VBox status.
- * @param   pDevIns     The device instance data.
- */
-static DECLCALLBACK(void) ahciResume(PPDMDEVINS pDevIns)
-{
-    PAHCI    pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
-    Log(("%s:\n", __FUNCTION__));
-    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-    {
         ataControllerResume(&pAhci->aCts[i]);
-    }
     return;
 }
@@ -6400 +6399 @@
 
 /**
- * Reset notification.
+ * Common reset worker.
  *
- * @returns VBox status.
  * @param   pDevIns     The device instance data.
  */
-static DECLCALLBACK(void) ahciReset(PPDMDEVINS pDevIns)
+static int ahciR3ResetCommon(PPDMDEVINS pDevIns, bool fConstructor)
 {
     PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
-    if (!ahciWaitForAllAsyncIOIsFinished(pDevIns, 20000))
-        AssertMsgFailed(("AHCI: One port is still active\n"));
 
     ahciHBAReset(pAhci);
@@ -6420 +6415 @@
     for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
         ataControllerReset(&pAhci->aCts[i]);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Callback employed by ahciReset.
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDevIns     The device instance.
+ */
+static DECLCALLBACK(bool) ahciR3IsAsyncResetDone(PPDMDEVINS pDevIns)
+{
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+
+    if (!ahciR3AllAsyncIOIsFinished(pDevIns))
+        return false;
+    ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+
+    ahciR3ResetCommon(pDevIns, false /*fConstructor*/);
+    return true;
+}
+
+/**
+ * Reset notification.
+ *
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(void) ahciReset(PPDMDEVINS pDevIns)
+{
+    PAHCI pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+
+    ASMAtomicWriteBool(&pThis->fSignalIdle, true);
+    if (!ahciR3AllAsyncIOIsFinished(pDevIns))
+        PDMDevHlpSetAsyncNotification(pDevIns, ahciR3IsAsyncResetDone);
+    else
+    {
+        ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+        ahciR3ResetCommon(pDevIns, false /*fConstructor*/);
+    }
 }
 
@@ -6432 +6465 @@
     PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
 
-    if (!ahciWaitForAllAsyncIOIsFinished(pDevIns, 20000))
-        AssertMsgFailed(("AHCI: One port is still active\n"));
+    ahciR3SuspendOrPowerOff(pDevIns);
 
     for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
@@ -6522 +6554 @@
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->hEvtIdle  = NIL_RTSEMEVENT;
 
     PCIDevSetVendorId    (&pThis->dev, 0x8086); /* Intel */
@@ -6603 +6634 @@
         return rc;
     }
-
-    rc = RTSemEventCreate(&pThis->hEvtIdle);
-    AssertRCReturn(rc, rc);
 
     /* Create the timer for command completion coalescing feature. */
@@ -6950 +6978 @@
         return rc;
 
-    ahciReset(pDevIns);
-
-    return rc;
+    return ahciR3ResetCommon(pDevIns, true /*fConstructor*/);
 }
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -1236 +1236 @@
     GEN_CHECK_OFF(AHCI, aCts[1]);
     GEN_CHECK_OFF(AHCI, lock);
-    GEN_CHECK_OFF(AHCI, hEvtIdle);
     GEN_CHECK_OFF(AHCI, u32PortsInterrupted);
     GEN_CHECK_OFF(AHCI, fReset);