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

Timestamp:

Aug 9, 2012 6:49:59 PM (13 years ago)

Author:

vboxsync

Message:

AHCI: Fix EFI boot

File:

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

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

@@ -263 +263 @@
 
 /** Task encountered a buffer overflow. */
-#define AHCI_REQ_OVERFLOW RT_BIT_32(0)
+#define AHCI_REQ_OVERFLOW   RT_BIT_32(0)
 /** Request is a PIO data command, if this flag is not set it either is
  * a command which does not transfer data or a DMA command based on the transfer size. */
-#define AHCI_REQ_PIO_DATA RT_BIT_32(1)
+#define AHCI_REQ_PIO_DATA   RT_BIT_32(1)
+/** The request has the SACT register set. */
+#define AHCI_REQ_CLEAR_SACT RT_BIT_32(2)
+/** FLag whether the request is queued. */
+#define AHCI_REQ_IS_QUEUED  RT_BIT_32(3)
 
 /**
@@ -277 +281 @@
     /** Tag of the task. */
     uint32_t                   uTag;
-    /** Command is queued. */
-    bool                       fQueued;
     /** The command header for this task. */
     CmdHdr                     cmdHdr;
@@ -5700 +5702 @@
         if (!fRedo)
         {
-            if (pAhciReq->fQueued)
+
+            /* Post a PIO setup FIS first if this is a PIO command which transfers data. */
+            if (pAhciReq->fFlags & AHCI_REQ_PIO_DATA)
+                ahciSendPioSetupFis(pAhciPort, pAhciReq, pAhciReq->cmdFis, false /* fInterrupt */);
+
+            if (pAhciReq->fFlags & AHCI_REQ_CLEAR_SACT)
             {
                 if (RT_SUCCESS(rcReq) && !ASMAtomicReadPtrT(&pAhciPort->pTaskErr, PAHCIREQ))
                     ASMAtomicOrU32(&pAhciPort->u32QueuedTasksFinished, RT_BIT_32(pAhciReq->uTag));
-
+            }
+
+            if (pAhciReq->fFlags & AHCI_REQ_IS_QUEUED)
+            {
                 /*
                  * Always raise an interrupt after task completion; delaying
@@ -5713 +5723 @@
             }
             else
-            {
-                /* Post a PIO setup FIS first if this is a PIO command which transfers data. */
-                if (pAhciReq->fFlags & AHCI_REQ_PIO_DATA)
-                    ahciSendPioSetupFis(pAhciPort, pAhciReq, pAhciReq->cmdFis, false /* fInterrupt */);
                 ahciSendD2HFis(pAhciPort, pAhciReq, pAhciReq->cmdFis, true);
-            }
         }
     }
@@ -5961 +5966 @@
             pAhciReq->cbTransfer = ahciGetNSectorsQueued(pCmdFis) * 512;
             pAhciReq->uOffset = ahciGetSectorQueued(pCmdFis) * 512;
+            pAhciReq->fFlags |= AHCI_REQ_IS_QUEUED;
             rc = AHCITXDIR_READ;
             break;
@@ -5968 +5974 @@
             pAhciReq->cbTransfer = ahciGetNSectorsQueued(pCmdFis) * 512;
             pAhciReq->uOffset = ahciGetSectorQueued(pCmdFis) * 512;
+            pAhciReq->fFlags |= AHCI_REQ_IS_QUEUED;
             rc = AHCITXDIR_WRITE;
             break;
@@ -5994 +6001 @@
                         if (pTaskErr)
                         {
-                            aBuf[0] = pTaskErr->fQueued ? pTaskErr->uTag : (1 << 7);
+                            aBuf[0] = (pTaskErr->fFlags & AHCI_REQ_IS_QUEUED) ? pTaskErr->uTag : (1 << 7);
                             aBuf[2] = pTaskErr->uATARegStatus;
                             aBuf[3] = pTaskErr->uATARegError;
@@ -6118 +6125 @@
 
     /* We "received" the FIS. Clear the BSY bit in regTFD. */
-    if ((pAhciReq->cmdHdr.u32DescInf & AHCI_CMDHDR_C) && (pAhciReq->fQueued))
+    if ((pAhciReq->cmdHdr.u32DescInf & AHCI_CMDHDR_C) && (pAhciReq->fFlags & AHCI_REQ_CLEAR_SACT))
     {
         /*
@@ -6223 +6230 @@
             if (pAhciPort->regSACT & (1 << idx))
             {
-                pAhciReq->fQueued = true;
+                pAhciReq->fFlags |= AHCI_REQ_CLEAR_SACT;
                 ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciReq->uTag));
             }
-            else
-                pAhciReq->fQueued = false;
 
             if (!(pAhciReq->cmdFis[AHCI_CMDFIS_BITS] & AHCI_CMDFIS_C))
@@ -6411 +6416 @@
             if (pAhciPort->regSACT & (1 << idx))
             {
-                pAhciReq->fQueued = true;
+                pAhciReq->fFlags |= AHCI_REQ_CLEAR_SACT;
                 ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciReq->uTag));
             }
-            else
-                pAhciReq->fQueued = false;
 
             ahciPortTaskGetCommandFis(pAhciPort, pAhciReq);