Changeset 28388 in vbox for trunk/src/VBox/Devices/Storage/DevAHCI.cpp

Timestamp:

Apr 15, 2010 7:31:27 PM (15 years ago)

Author:

vboxsync

Message:

AHCI: Use async I/O flush API

File:

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

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

@@ -226 +226 @@
 
 /**
+ * Transfer type.
+ */
+typedef enum AHCITXDIR
+{
+    /** Invalid */
+    AHCITXDIR_INVALID = 0,
+    /** None */
+    AHCITXDIR_NONE,
+    /** Read */
+    AHCITXDIR_READ,
+    /** Write */
+    AHCITXDIR_WRITE,
+    /** Flush */
+    AHCITXDIR_FLUSH
+} AHCITXDIR;
+
+/**
  * A task state.
  */
@@ -243 +260 @@
     RTGCPHYS                   GCPhysCmdHdrAddr;
     /** Data direction. */
-    uint8_t                    uTxDir;
+    AHCITXDIR                  enmTxDir;
     /** Start offset. */
     uint64_t                   uOffset;
@@ -2696 +2713 @@
     pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
     pAhciPortTaskState->cmdFis[AHCI_CMDFIS_SECTN] = (pAhciPortTaskState->cmdFis[AHCI_CMDFIS_SECTN] & ~7)
-        | ((pAhciPortTaskState->uTxDir != PDMBLOCKTXDIR_TO_DEVICE) ? ATAPI_INT_REASON_IO : 0)
+        | ((pAhciPortTaskState->enmTxDir != AHCITXDIR_WRITE) ? ATAPI_INT_REASON_IO : 0)
         | (!pAhciPortTaskState->cbTransfer ? ATAPI_INT_REASON_CD : 0);
     pAhciPort->uATAPISenseKey = SCSI_SENSE_NONE;
@@ -3546 +3563 @@
                 }
                 atapiReadSectors(pAhciPort, pAhciPortTaskState, iATAPILBA, cSectors, 2048);
-                iTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
+                iTxDir = AHCITXDIR_READ;
             }
             break;
@@ -3595 +3612 @@
                         /* normal read */
                         atapiReadSectors(pAhciPort, pAhciPortTaskState, iATAPILBA, cSectors, 2048);
-                        iTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
+                        iTxDir = AHCITXDIR_READ;
                         break;
                     case 0xf8:
                         /* read all data */
                         atapiReadSectors(pAhciPort, pAhciPortTaskState, iATAPILBA, cSectors, 2352);
-                        iTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
+                        iTxDir = AHCITXDIR_READ;
                         break;
                     default:
@@ -4209 +4226 @@
     pAhciPortTaskState->paSGEntries[0].u.temp.pvBuf = pAhciPortTaskState->pvBufferUnaligned;
 
-    if (pAhciPortTaskState->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
+    if (pAhciPortTaskState->enmTxDir == AHCITXDIR_WRITE)
         ahciCopyFromSGListIntoBuffer(pDevIns, &pAhciPortTaskState->paSGEntries[0]);
 
@@ -4261 +4278 @@
     if (pAhciPortTaskState->pfnPostProcess)
     {
-        ahciLog(("%s: Request with post processing.\n"));
+        ahciLog(("%s: Request with post processing.\n", __FUNCTION__));
 
         ahciScatterGatherListGetTotalBufferSize(pAhciPort, pAhciPortTaskState);
@@ -4379 +4396 @@
                                  * segments into the temporary buffer.
                                  */
-                                if (pAhciPortTaskState->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
+                                if (pAhciPortTaskState->enmTxDir == AHCITXDIR_WRITE)
                                     ahciCopyFromSGListIntoBuffer(pDevIns, pSGInfoCurr);
 
@@ -4625 +4642 @@
          * segments into the temporary buffer.
          */
-        if (pAhciPortTaskState->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
+        if (pAhciPortTaskState->enmTxDir == AHCITXDIR_WRITE)
             ahciCopyFromSGListIntoBuffer(pDevIns, pSGInfoCurr);
     }
@@ -4667 +4684 @@
             PDMDevHlpPhysReleasePageMappingLock(pDevIns, &pSGInfoCurr->u.direct.PageLock);
         }
-        else if (pAhciPortTaskState->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+        else if (pAhciPortTaskState->enmTxDir == AHCITXDIR_READ)
         {
             /* Copy the data into the guest segments now. */
@@ -4848 +4865 @@
                        &pAhciPortTaskState->cmdHdr, sizeof(CmdHdr));
 
-    if (pAhciPortTaskState->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+    if (pAhciPortTaskState->enmTxDir == AHCITXDIR_READ)
     {
         STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesRead, pAhciPortTaskState->cbTransfer);
         pAhciPort->Led.Actual.s.fReading = 0;
     }
-    else
+    else if (pAhciPortTaskState->enmTxDir == AHCITXDIR_WRITE)
     {
         STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesWritten, pAhciPortTaskState->cbTransfer);
@@ -4908 +4925 @@
  * @param   pCmdHdr Pointer to the command header.
  */
-static int ahciProcessCmd(PAHCIPort pAhciPort, PAHCIPORTTASKSTATE pAhciPortTaskState, uint8_t *pCmdFis)
-{
-    int rc = PDMBLOCKTXDIR_NONE;
+static AHCITXDIR ahciProcessCmd(PAHCIPort pAhciPort, PAHCIPORTTASKSTATE pAhciPortTaskState, uint8_t *pCmdFis)
+{
+    AHCITXDIR rc = AHCITXDIR_NONE;
     bool fLBA48 = false;
     CmdHdr   *pCmdHdr = &pAhciPortTaskState->cmdHdr;
@@ -4924 +4941 @@
                 if (pAhciPort->pDrvBlock && !pAhciPort->fATAPI)
                 {
+                    int rc2;
                     uint16_t u16Temp[256];
 
@@ -4930 +4948 @@
 
                     /* Create scatter gather list. */
-                    rc = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, false);
-                    if (RT_FAILURE(rc))
-                        AssertMsgFailed(("Creating list failed rc=%Rrc\n", rc));
+                    rc2 = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, false);
+                    if (RT_FAILURE(rc2))
+                        AssertMsgFailed(("Creating list failed rc=%Rrc\n", rc2));
 
                     /* Copy the buffer. */
@@ -4938 +4956 @@
 
                     /* Destroy list. */
-                    rc = ahciScatterGatherListDestroy(pAhciPort, pAhciPortTaskState);
-                    if (RT_FAILURE(rc))
-                        AssertMsgFailed(("Freeing list failed rc=%Rrc\n", rc));
+                    rc2 = ahciScatterGatherListDestroy(pAhciPort, pAhciPortTaskState);
+                    if (RT_FAILURE(rc2))
+                        AssertMsgFailed(("Freeing list failed rc=%Rrc\n", rc2));
 
                     pAhciPortTaskState->uATARegError = 0;
@@ -4971 +4989 @@
                     break;
                 case 0x82: /* write cache disable */
-                    rc = pAhciPort->pDrvBlock->pfnFlush(pAhciPort->pDrvBlock);
-                    pAhciPortTaskState->uATARegError = 0;
-                    pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+                    rc = AHCITXDIR_FLUSH;
                     break;
                 case 0x03:
@@ -5000 +5016 @@
         case ATA_FLUSH_CACHE_EXT:
         case ATA_FLUSH_CACHE:
-            rc = pAhciPort->pDrvBlock->pfnFlush(pAhciPort->pDrvBlock);
-            pAhciPortTaskState->uATARegError = 0;
-            pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+            rc = AHCITXDIR_FLUSH;
             break;
         case ATA_PACKET:
@@ -5012 +5026 @@
             else
             {
-                rc = atapiParseCmdVirtualATAPI(pAhciPort, pAhciPortTaskState);
+                int rc2 = atapiParseCmdVirtualATAPI(pAhciPort, pAhciPortTaskState);
             }
             break;
@@ -5067 +5081 @@
             pAhciPortTaskState->cbTransfer = ahciGetNSectors(pCmdFis, fLBA48) * 512;
             pAhciPortTaskState->uOffset = ahciGetSector(pAhciPort, pCmdFis, fLBA48) * 512;
-            rc = PDMBLOCKTXDIR_FROM_DEVICE;
+            rc = AHCITXDIR_READ;
             break;
         }
@@ -5076 +5090 @@
             pAhciPortTaskState->cbTransfer = ahciGetNSectors(pCmdFis, fLBA48) * 512;
             pAhciPortTaskState->uOffset = ahciGetSector(pAhciPort, pCmdFis, fLBA48) * 512;
-            rc = PDMBLOCKTXDIR_TO_DEVICE;
+            rc = AHCITXDIR_WRITE;
             break;
         }
@@ -5083 +5097 @@
             pAhciPortTaskState->cbTransfer = ahciGetNSectorsQueued(pCmdFis) * 512;
             pAhciPortTaskState->uOffset = ahciGetSectorQueued(pCmdFis) * 512;
-            rc = PDMBLOCKTXDIR_FROM_DEVICE;
+            rc = AHCITXDIR_READ;
             break;
         }
@@ -5090 +5104 @@
             pAhciPortTaskState->cbTransfer = ahciGetNSectorsQueued(pCmdFis) * 512;
             pAhciPortTaskState->uOffset = ahciGetSectorQueued(pCmdFis) * 512;
-            rc = PDMBLOCKTXDIR_TO_DEVICE;
+            rc = AHCITXDIR_WRITE;
             break;
         }
@@ -5147 +5161 @@
 
     /* Set transfer direction. */
-    pAhciPortTaskState->uTxDir = (pAhciPortTaskState->cmdHdr.u32DescInf & AHCI_CMDHDR_W) ? PDMBLOCKTXDIR_TO_DEVICE : PDMBLOCKTXDIR_FROM_DEVICE;
+    pAhciPortTaskState->enmTxDir = (pAhciPortTaskState->cmdHdr.u32DescInf & AHCI_CMDHDR_W) ? AHCITXDIR_WRITE : AHCITXDIR_READ;
 
     /* If this is an ATAPI command read the atapi command. */
@@ -5216 +5230 @@
     else
     {
-        int                iTxDir;
+        AHCITXDIR          enmTxDir;
         PAHCIPORTTASKSTATE pAhciPortTaskState;
 
@@ -5272 +5286 @@
         }
 
-        iTxDir = ahciProcessCmd(pAhciPort, pAhciPortTaskState, pAhciPortTaskState->cmdFis);
-
-        if (iTxDir != PDMBLOCKTXDIR_NONE)
+        enmTxDir = ahciProcessCmd(pAhciPort, pAhciPortTaskState, pAhciPortTaskState->cmdFis);
+
+        if (enmTxDir != AHCITXDIR_NONE)
         {
             if (pAhciPortTaskState->fQueued)
@@ -5283 +5297 @@
             }
 
-            STAM_REL_COUNTER_INC(&pAhciPort->StatDMA);
-
-            rc = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, (iTxDir == PDMBLOCKTXDIR_FROM_DEVICE) ? false : true);
-            if (RT_FAILURE(rc))
-                AssertMsgFailed(("%s: Failed to process command %Rrc\n", __FUNCTION__, rc));
-
-            if (iTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+            if (enmTxDir != AHCITXDIR_FLUSH)
+            {
+                STAM_REL_COUNTER_INC(&pAhciPort->StatDMA);
+
+                rc = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, (enmTxDir == AHCITXDIR_READ) ? false : true);
+                if (RT_FAILURE(rc))
+                    AssertMsgFailed(("%s: Failed to process command %Rrc\n", __FUNCTION__, rc));
+            }
+
+            if (enmTxDir == AHCITXDIR_FLUSH)
+            {
+                rc = pAhciPort->pDrvBlockAsync->pfnStartFlush(pAhciPort->pDrvBlockAsync,
+                                                              pAhciPortTaskState);
+            }
+            else if (enmTxDir == AHCITXDIR_READ)
             {
                 pAhciPort->Led.Asserted.s.fReading = pAhciPort->Led.Actual.s.fReading = 1;
@@ -5437 +5459 @@
                && RT_LIKELY(!pAhciPort->fPortReset))
         {
-            int       iTxDir;
+            AHCITXDIR enmTxDir;
             uint8_t   uActTag;
 
@@ -5487 +5509 @@
             else
             {
-                iTxDir = ahciProcessCmd(pAhciPort, pAhciPortTaskState, &pAhciPortTaskState->cmdFis[0]);
-
-                if (iTxDir != PDMBLOCKTXDIR_NONE)
+                enmTxDir = ahciProcessCmd(pAhciPort, pAhciPortTaskState, &pAhciPortTaskState->cmdFis[0]);
+
+                if (enmTxDir == AHCITXDIR_FLUSH)
+                {
+                    rc = pAhciPort->pDrvBlock->pfnFlush(pAhciPort->pDrvBlock);
+
+                    /* Log the error. */
+                    if (   RT_FAILURE(rc)
+                        && pAhciPort->cErrors++ < MAX_LOG_REL_ERRORS)
+                    {
+                        LogRel(("AHCI#%u: Flush returned rc=%Rrc\n",
+                                pAhciPort->iLUN, rc));
+                    }
+
+                    if (RT_FAILURE(rc))
+                    {
+                        pAhciPortTaskState->uATARegError = ID_ERR;
+                        pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_ERR;
+                    }
+                    else
+                    {
+                        pAhciPortTaskState->uATARegError = 0;
+                        pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+                    }
+
+                    if (pAhciPortTaskState->fQueued)
+                        uQueuedTasksFinished |= (1 << pAhciPortTaskState->uTag);
+                    else
+                    {
+                        /* Task is not queued send D2H FIS */
+                        ahciSendD2HFis(pAhciPort, pAhciPortTaskState, &pAhciPortTaskState->cmdFis[0], true);
+                    }
+                }
+                else if (enmTxDir != AHCITXDIR_NONE)
                 {
                     uint64_t uOffset;
@@ -5496 +5549 @@
                     PAHCIPORTTASKSTATESGENTRY pSGInfoCurr;
 
-                    rc = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, (iTxDir == PDMBLOCKTXDIR_FROM_DEVICE) ? false : true);
+                    rc = ahciScatterGatherListCreate(pAhciPort, pAhciPortTaskState, (enmTxDir == AHCITXDIR_READ) ? false : true);
                     if (RT_FAILURE(rc))
                         AssertMsgFailed(("%s: Failed to get number of list elments %Rrc\n", __FUNCTION__, rc));
@@ -5518 +5571 @@
                         AssertMsg(!(cbProcess % 512), ("Number of bytes to process is not sector aligned %lu\n", cbProcess));
 
-                        if (iTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+                        if (enmTxDir == AHCITXDIR_READ)
                         {
                             pAhciPort->Led.Asserted.s.fReading = pAhciPort->Led.Actual.s.fReading = 1;
@@ -5556 +5609 @@
                         LogRel(("AHCI#%u: %s at offset %llu (%u bytes left) returned rc=%Rrc\n",
                                 pAhciPort->iLUN,
-                                iTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+                                enmTxDir == AHCITXDIR_READ
                                 ? "Read"
                                 : "Write",