Changeset 38328 in vbox

Timestamp:

Aug 5, 2011 3:16:49 PM (13 years ago)

Author:

vboxsync

Message:

AHCI: Fixes for CD/DVD hotplugging

File:

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

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

@@ -1043 +1043 @@
     pAhciPort->regCI &= ~uCIValue;
 
-    if (   (pAhciPort->regCMD & AHCI_PORT_CMD_ST)
+    if (   (pAhciPort->regCMD & AHCI_PORT_CMD_CR)
         && u32Value > 0)
     {
@@ -1312 +1312 @@
             ahciLog(("%s: Engine starts\n", __FUNCTION__));
 
-            /** Set engine state to running. */
-            u32Value |= AHCI_PORT_CMD_CR;
+            /* Set engine state to running if there is a device attached. */
+            if (pAhciPort->pDrvBase)
+                u32Value |= AHCI_PORT_CMD_CR;
         }
         else
@@ -1320 +1321 @@
             /* Clear command issue register. */
             pAhciPort->regCI = 0;
-            /** Clear current command slot. */
+            /* Clear current command slot. */
             pAhciPort->u32CurrentCommandSlot = 0;
             u32Value &= ~AHCI_PORT_CMD_CR;
@@ -8061 +8062 @@
          */
         pAhciPort->regSSTS = 0;
-        ASMAtomicAndU32(&pAhciPort->regCMD, ~AHCI_PORT_CMD_CPS);
+        /*
+         * Clear CR bit too to prevent submission of new commands when CI is written
+         * (AHCI Spec 1.2: 7.4 Interaction of the Command List and Port Change Status).
+         */
+        ASMAtomicAndU32(&pAhciPort->regCMD, ~(AHCI_PORT_CMD_CPS | AHCI_PORT_CMD_CR));
         ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_CPDS | AHCI_PORT_IS_PRCS);
         ASMAtomicOrU32(&pAhciPort->regSERR, AHCI_PORT_SERR_N);