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

Timestamp:

May 18, 2010 11:48:31 AM (15 years ago)

Author:

vboxsync

Message:

BusLogic: Make sure that there are no tasks pending during suspend

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevBusLogic.cpp (modified) (8 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -381 +381 @@
     /** Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)  pLedsConnector;
+
+#if HC_ARCH_BITS == 64
+    uint32_t                       Alignment3;
+#endif
+
+    /** Indicates that PDMDevHlpAsyncNotificationCompleted should be called when
+     * a port is entering the idle state. */
+    bool volatile                  fSignalIdle;
+
 } BUSLOGIC, *PBUSLOGIC;
 
@@ -1987 +1996 @@
     /* Add task to the cache. */
     RTMemCacheFree(pBusLogic->hTaskCache, pTaskState);
+
+    if (pBusLogicDevice->cOutstandingRequests == 0 && pBusLogic->fSignalIdle)
+        PDMDevHlpAsyncNotificationCompleted(pBusLogic->pDevInsR3);
+
     return VINF_SUCCESS;
 }
@@ -2386 +2399 @@
 }
 
+/* -=-=-=-=- Helper -=-=-=-=- */
+
+ /**
+ * Checks if all asynchronous I/O is finished.
+ *
+ * Used by lsilogicReset, lsilogicSuspend and lsilogicPowerOff.
+ *
+ * @returns true if quiesced, false if busy.
+ * @param   pDevIns         The device instance.
+ */
+static bool buslogicR3AllAsyncIOIsFinished(PPDMDEVINS pDevIns)
+{
+    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+
+    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aDeviceStates); i++)
+    {
+        PBUSLOGICDEVICE pThisDevice = &pThis->aDeviceStates[i];
+        if (pThisDevice->pDrvBase)
+        {
+            if (pThisDevice->cOutstandingRequests != 0)
+                return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Callback employed by lsilogicR3Suspend and lsilogicR3PowerOff..
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDevIns     The device instance.
+ */
+static DECLCALLBACK(bool) buslogicR3IsAsyncSuspendOrPowerOffDone(PPDMDEVINS pDevIns)
+{
+    if (!buslogicR3AllAsyncIOIsFinished(pDevIns))
+        return false;
+
+    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+    ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+    return true;
+}
+
+/**
+ * Common worker for ahciR3Suspend and ahciR3PowerOff.
+ */
+static void buslogicR3SuspendOrPowerOff(PPDMDEVINS pDevIns)
+{
+    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+
+    ASMAtomicWriteBool(&pThis->fSignalIdle, true);
+    if (!buslogicR3AllAsyncIOIsFinished(pDevIns))
+        PDMDevHlpSetAsyncNotification(pDevIns, buslogicR3IsAsyncSuspendOrPowerOffDone);
+    else
+        ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+}
+
+/**
+ * Suspend notification.
+ *
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(void) buslogicSuspend(PPDMDEVINS pDevIns)
+{
+    Log(("buslogicSuspend\n"));
+    buslogicR3SuspendOrPowerOff(pDevIns);
+}
+
 /**
  * Detach notification.
@@ -2462 +2543 @@
 }
 
+/**
+ * Callback employed by buslogicR3Reset.
+ *
+ * @returns true if we've quiesced, false if we're still working.
+ * @param   pDevIns     The device instance.
+ */
+static DECLCALLBACK(bool) buslogicR3IsAsyncResetDone(PPDMDEVINS pDevIns)
+{
+    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+
+    if (!buslogicR3AllAsyncIOIsFinished(pDevIns))
+        return false;
+    ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+
+    buslogicHwReset(pThis);
+    return true;
+}
+
+/**
+ * @copydoc FNPDMDEVRESET
+ */
+static DECLCALLBACK(void) buslogicReset(PPDMDEVINS pDevIns)
+{
+    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+
+    ASMAtomicWriteBool(&pThis->fSignalIdle, true);
+    if (!buslogicR3AllAsyncIOIsFinished(pDevIns))
+        PDMDevHlpSetAsyncNotification(pDevIns, buslogicR3IsAsyncResetDone);
+    else
+    {
+        ASMAtomicWriteBool(&pThis->fSignalIdle, false);
+        buslogicHwReset(pThis);
+    }
+}
+
 static DECLCALLBACK(void) buslogicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
@@ -2480 +2596 @@
 
 /**
- * Reset notification.
- *
- * @returns VBox status.
- * @param   pDevIns     The device instance data.
- */
-static DECLCALLBACK(void)  buslogicReset(PPDMDEVINS pDevIns)
-{
-    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
-
-    buslogicHwReset(pThis);
+ * Poweroff notification.
+ *
+ * @param   pDevIns Pointer to the device instance
+ */
+static DECLCALLBACK(void) buslogicPowerOff(PPDMDEVINS pDevIns)
+{
+    Log(("buslogicPowerOff\n"));
+    buslogicR3SuspendOrPowerOff(pDevIns);
 }
 
@@ -2682 +2796 @@
     "BusLogic BT-958 SCSI host adapter.\n",
     /* fFlags */
-    PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
+    PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0 |
+    PDM_DEVREG_FLAGS_FIRST_SUSPEND_NOTIFICATION | PDM_DEVREG_FLAGS_FIRST_POWEROFF_NOTIFICATION,
     /* fClass */
     PDM_DEVREG_CLASS_STORAGE,
@@ -2702 +2817 @@
     buslogicReset,
     /* pfnSuspend */
-    NULL,
+    buslogicSuspend,
     /* pfnResume */
     NULL,
@@ -2714 +2829 @@
     NULL,
     /* pfnPowerOff */
-    NULL,
+    buslogicPowerOff,
     /* pfnSoftReset */
     NULL,

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

@@ -1459 +1459 @@
     GEN_CHECK_OFF(BUSLOGIC, ILeds);
     GEN_CHECK_OFF(BUSLOGIC, pLedsConnector);
+    GEN_CHECK_OFF(BUSLOGIC, fSignalIdle);
 #endif /* VBOX_WITH_BUSLOGIC */