Changeset 24772 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 18, 2009 7:10:17 PM (15 years ago)

Author:

vboxsync

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

54982

Message:

DevAHCI,ATAController: Async hanlding of reset, suspend and power off.

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (4 diffs)
• ATAController.h (modified) (5 diffs)
• DevAHCI.cpp (modified) (6 diffs)

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

@@ -3862 +3862 @@
     if (    pCtl->fSignalIdle
         &&  ataAsyncIOIsIdle(pCtl, false /*fStrict*/))
+    {
+        PDMDevHlpAsyncNotificationCompleted(pCtl->pDevInsR3);
         RTThreadUserSignal(pCtl->AsyncIOThread);
+    }
 
     rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex); AssertRC(rc);
@@ -4333 +4336 @@
 
     /* Signal the ultimate idleness. */
+    if (pCtl->fSignalIdle)
+        PDMDevHlpAsyncNotificationCompleted(pCtl->pDevInsR3);
     RTThreadUserSignal(ThreadSelf);
 
@@ -5172 +5177 @@
 #endif
 
-/**
- * Suspend notification.
- *
- * @returns VBox status.
- * @param   pDevIns     The device instance data.
- */
-void ataControllerSuspend(PAHCIATACONTROLLER pCtl)
-{
-    Log(("%s:\n", __FUNCTION__));
-    if (!ataWaitForAllAsyncIOIsIdle(pCtl, 20000))
-        AssertMsgFailed(("Async I/O didn't stop in 20 seconds!\n"));
-    return;
-}
-
 
 /**
@@ -5209 +5200 @@
 
 /**
- * Power Off notification.
+ * Tests if the controller is idle, leaving the PDM notifications on if busy.
  *
- * @returns VBox status.
- * @param   pCtl     The controller instance.
+ * @returns true if idle, false if idle.
+ * @param   pCtl the controller instance.
  */
-void ataControllerPowerOff(PAHCIATACONTROLLER pCtl)
-{
-    Log(("%s:\n", __FUNCTION__));
-    if (!ataWaitForAllAsyncIOIsIdle(pCtl, 20000))
-        AssertMsgFailed(("Async I/O didn't stop in 20 seconds!\n"));
-    return;
-}
-
-/**
- * Prepare state save and load operation.
- *
- * @returns VBox status code.
- * @param   pDevIns         Device instance of the device which registered the data unit.
- * @param   pSSM            SSM operation handle.
- */
-static int ataSaveLoadPrep(PAHCIATACONTROLLER pCtl)
-{
-    /* sanity - the suspend notification will wait on the async stuff. */
-    Assert(ataAsyncIOIsIdle(pCtl, false));
-    if (!ataAsyncIOIsIdle(pCtl, false))
-        return VERR_SSM_IDE_ASYNC_TIMEOUT;
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Prepare state save operation.
- *
- * @returns VBox status code.
- * @param   pCtl    The controller instance.
- * @param   pSSM    SSM operation handle.
- */
-DECLCALLBACK(int) ataControllerSavePrep(PAHCIATACONTROLLER pCtl, PSSMHANDLE pSSM)
-{
-    return ataSaveLoadPrep(pCtl);
-}
-
-/**
- * Prepare state load operation.
- *
- * @returns VBox status code.
- * @param   pCtl    The controller instance.
- * @param   pSSM    SSM operation handle.
- */
-DECLCALLBACK(int) ataControllerLoadPrep(PAHCIATACONTROLLER pCtl, PSSMHANDLE pSSM)
-{
-    return ataSaveLoadPrep(pCtl);
+bool ataControllerIsIdle(PAHCIATACONTROLLER pCtl)
+{
+    ASMAtomicWriteBool(&pCtl->fSignalIdle, true);
+    if (ataAsyncIOIsIdle(pCtl, false /*fStrict*/))
+    {
+        ASMAtomicWriteBool(&pCtl->fSignalIdle, false);
+        return true;
+    }
+    return false;
 }
 

trunk/src/VBox/Devices/Storage/ATAController.h

@@ -366 +366 @@
     /** The position at which to get a new request for the AIO thread. */
     uint8_t             AsyncIOReqTail;
-    /** Whether to call RTThreadUserSignal when idle.
-     * Before setting this, call RTThreadUserReset. */
+    /** Whether to call RTThreadUserSignal and PDMDevHlpAsyncNotificationCompleted
+     * when idle.  Before setting this, call RTThreadUserReset. */
     bool volatile       fSignalIdle;
     uint8_t             Alignment3[1]; /**< Explicit padding of the 1 byte gap. */
@@ -435 +435 @@
 
 /**
- * Power off a controller.
- *
- * @returns nothing.
+ * Tests if the controller is idle, leaving the PDM notifications on if busy.
+ *
+ * @returns true if idle, false if idle.
  * @param   pCtl the controller instance.
  */
-void ataControllerPowerOff(PAHCIATACONTROLLER pCtl);
+bool ataControllerIsIdle(PAHCIATACONTROLLER pCtl);
 
 /**
@@ -449 +449 @@
  */
 void ataControllerReset(PAHCIATACONTROLLER pCtl);
-
-/**
- * Suspend operation of an controller.
- *
- * @returns nothing
- * @param   pCtl The controller instance.
- */
-void ataControllerSuspend(PAHCIATACONTROLLER pCtl);
 
 /**
@@ -486 +478 @@
 
 /**
- * Prepare state save operation.
+ * Excute state load operation.
  *
  * @returns VBox status code.
@@ -492 +484 @@
  * @param   pSSM    SSM operation handle.
  */
-int ataControllerSavePrep(PAHCIATACONTROLLER pCtl, PSSMHANDLE pSSM);
-
-/**
- * Excute state load operation.
- *
- * @returns VBox status code.
- * @param   pCtl    The controller instance.
- * @param   pSSM    SSM operation handle.
- */
 int ataControllerLoadExec(PAHCIATACONTROLLER pCtl, PSSMHANDLE pSSM);
-
-/**
- * Prepare state load operation.
- *
- * @returns VBox status code.
- * @param   pCtl    The controller instance.
- * @param   pSSM    SSM operation handle.
- */
-int ataControllerLoadPrep(PAHCIATACONTROLLER pCtl, PSSMHANDLE pSSM);
 
 #endif /* IN_RING3 */

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

@@ -5703 +5703 @@
 
 /**
- * Checks if all asynchronous I/O is finished.
+ * Checks if all asynchronous I/O is finished, both AHCI and IDE.
  *
  * Used by ahciR3Reset, ahciR3Suspend and ahciR3PowerOff. ahciR3SavePrep makes
@@ -5729 +5729 @@
         }
     }
+
+    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
+        if (!ataControllerIsIdle(&pThis->aCts[i]))
+            return false;
+
     return true;
 }
@@ -5739 +5744 @@
 static DECLCALLBACK(int) ahciR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
     Assert(ahciR3AllAsyncIOIsFinished(pDevIns));
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-    {
-        int rc;
-
-        rc = ataControllerSavePrep(&pAhci->aCts[i], pSSM);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
-
     return VINF_SUCCESS;
 }
@@ -5760 +5753 @@
 static DECLCALLBACK(int) ahciR3LoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-    {
-        int rc;
-
-        rc = ataControllerLoadPrep(&pAhci->aCts[i], pSSM);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
-
+    Assert(ahciR3AllAsyncIOIsFinished(pDevIns));
     return VINF_SUCCESS;
 }
@@ -6268 +6251 @@
  * Suspend notification.
  *
- * @returns VBox status.
  * @param   pDevIns     The device instance data.
  */
 static DECLCALLBACK(void) ahciR3Suspend(PPDMDEVINS pDevIns)
 {
-    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-    Log(("%s:\n", __FUNCTION__));
-
+    Log(("ahciR3Suspend\n"));
     ahciR3SuspendOrPowerOff(pDevIns);
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-        ataControllerSuspend(&pAhci->aCts[i]);
 }
 
@@ -6475 +6452 @@
  * Poweroff notification.
  *
- * @returns nothing
  * @param   pDevIns Pointer to the device instance
  */
 static DECLCALLBACK(void) ahciR3PowerOff(PPDMDEVINS pDevIns)
 {
-    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-
+    Log(("achiR3PowerOff\n"));
     ahciR3SuspendOrPowerOff(pDevIns);
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(pAhci->aCts); i++)
-        ataControllerPowerOff(&pAhci->aCts[i]);
 }