Changeset 51340 in vbox

Timestamp:

May 22, 2014 9:17:55 AM (11 years ago)

Author:

vboxsync

Message:

Storage/AHCI: Revert to the legacy port reset method if we loaded a saved state

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (6 diffs)

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

@@ -82 +82 @@
 
 /** The current saved state version. */
-#define AHCI_SAVED_STATE_VERSION                   7
+#define AHCI_SAVED_STATE_VERSION                        8
+/** The saved state version before changing the port reset logic in an incomptible way. */
+#define AHCI_SAVED_STATE_VERSION_PRE_PORT_RESET_CHANGES 7
 /** Saved state version before the per port hotplug port was added. */
-#define AHCI_SAVED_STATE_VERSION_PRE_HOTPLUG_FLAG  6
+#define AHCI_SAVED_STATE_VERSION_PRE_HOTPLUG_FLAG       6
 /** Saved state version before legacy ATA emulation was dropped. */
-#define AHCI_SAVED_STATE_VERSION_IDE_EMULATION     5
+#define AHCI_SAVED_STATE_VERSION_IDE_EMULATION          5
 /** Saved state version before ATAPI support was added. */
-#define AHCI_SAVED_STATE_VERSION_PRE_ATAPI         3
+#define AHCI_SAVED_STATE_VERSION_PRE_ATAPI              3
 /** The saved state version use in VirtualBox 3.0 and earlier.
  * This was before the config was added and ahciIOTasks was dropped. */
-#define AHCI_SAVED_STATE_VERSION_VBOX_30           2
+#define AHCI_SAVED_STATE_VERSION_VBOX_30                2
 /* for Older ATA state Read handling */
 #define ATA_CTL_SAVED_STATE_VERSION 3
@@ -692 +694 @@
     /** Flag whether the controller has BIOS access enabled. */
     bool                            fBootable;
+    /** Flag whether the legacy port reset method should be used to make it work with saved states. */
+    bool                            fLegacyPortResetMethod;
 
     /** Number of usable ports on this controller. */
@@ -1259 +1263 @@
              && pAhciPort->pDrvBase)
     {
-        pAhciPort->regSCTL = u32Value;  /* Update before kicking the I/O thread. */
-        pAhciPort->regSSTS = 0x1; /* Indicate device presence detected but communication not established. */
-
-        /* Kick the thread to finish the reset. */
-        ahciIoThreadKick(ahci, pAhciPort);
+        /* Do the port reset here, so the guest sees the new status immediately. */
+        if (ahci->fLegacyPortResetMethod)
+        {
+            ahciPortResetFinish(pAhciPort);
+            pAhciPort->regSCTL = u32Value; /* Update after finishing the reset, so the I/O thread doesn't get a chance to do the reset. */
+        }
+        else
+        {
+            pAhciPort->regSSTS = 0x1; /* Indicate device presence detected but communication not established. */
+            pAhciPort->regSCTL = u32Value;  /* Update before kicking the I/O thread. */
+
+            /* Kick the thread to finish the reset. */
+            ahciIoThreadKick(ahci, pAhciPort);
+        }
     }
 
@@ -6977 +6990 @@
     SSMR3PutBool(pSSM, pThis->fR0Enabled);
     SSMR3PutBool(pSSM, pThis->fGCEnabled);
+    SSMR3PutBool(pSSM, pThis->fLegacyPortResetMethod);
 
     /* Now every port. */
@@ -7108 +7122 @@
         uVersion++;
 
+    /*
+     * Check whether we have to resort to the legacy port reset method to
+     * prevent older BIOS versions from failing after a reset.
+     */
+    if (uVersion < AHCI_SAVED_STATE_VERSION_PRE_PORT_RESET_CHANGES)
+        pThis->fLegacyPortResetMethod = true;
+
     /* Verify config. */
     if (uVersion > AHCI_SAVED_STATE_VERSION_VBOX_30)
@@ -7206 +7227 @@
         SSMR3GetBool(pSSM, &pThis->fR0Enabled);
         SSMR3GetBool(pSSM, &pThis->fGCEnabled);
+        if (uVersion > AHCI_SAVED_STATE_VERSION_PRE_PORT_RESET_CHANGES)
+            SSMR3GetBool(pSSM, &pThis->fLegacyPortResetMethod);
 
         /* Now every port. */