Changeset 52673 in vbox

Timestamp:

Sep 10, 2014 11:32:13 AM (10 years ago)

Author:

vboxsync

Message:

Storage/AHCI: Switch ordering of register updates when completing the port reset. Update the status register last to make sure the BIOS acts on fully updated registers. Fixes a hang in the BIOS when detecting storage devices on startup

File:

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

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

@@ -1077 +1077 @@
         pAhciPort->regSIG = AHCI_PORT_SIG_DISK;
 
+    /* We received a COMINIT from the device. Tell the guest. */
+    ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_PCS);
+    pAhciPort->regSERR |= AHCI_PORT_SERR_X;
+    pAhciPort->regTFD  |= ATA_STAT_BUSY;
+
+    if ((pAhciPort->regCMD & AHCI_PORT_CMD_FRE) && (!pAhciPort->fFirstD2HFisSend))
+    {
+        ahciPostFirstD2HFisIntoMemory(pAhciPort);
+        ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_DHRS);
+
+        if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
+        {
+            int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+            AssertRC(rc);
+        }
+    }
+
     pAhciPort->regSSTS = (0x01 << 8)  | /* Interface is active. */
                          (0x03 << 0);   /* Device detected and communication established. */
@@ -1094 +1111 @@
             pAhciPort->regSSTS |= (0x02 << 4); /* Generation 2 (3.0GBps) speed. */
             break;
-    }
-
-    /* We received a COMINIT from the device. Tell the guest. */
-    ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_PCS);
-    pAhciPort->regSERR |= AHCI_PORT_SERR_X;
-    pAhciPort->regTFD  |= ATA_STAT_BUSY;
-
-    if ((pAhciPort->regCMD & AHCI_PORT_CMD_FRE) && (!pAhciPort->fFirstD2HFisSend))
-    {
-        ahciPostFirstD2HFisIntoMemory(pAhciPort);
-        ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_DHRS);
-
-        if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
-        {
-            int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
-            AssertRC(rc);
-        }
     }
 
@@ -6938 +6938 @@
         pHlp->pfnPrintf(pHlp, "PortTasksFinished=%#x\n", pThisPort->u32TasksFinished);
         pHlp->pfnPrintf(pHlp, "PortQueuedTasksFinished=%#x\n", pThisPort->u32QueuedTasksFinished);
+        pHlp->pfnPrintf(pHlp, "PortTasksNew=%#x\n", pThisPort->u32TasksNew);
         pHlp->pfnPrintf(pHlp, "\n");
     }