Changeset 34851 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Dec 9, 2010 12:45:04 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68664

Message:

AHCI: Fix ATAPI device detection with Solaris guests. The command shouldn't be cleared in the CI register if it failed. The controller should stop processing commands instead to preserve the CCS field in the CMD register and the bits in CI

File:

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

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

@@ -64 +64 @@
 
 /** The current saved state version. */
-#define AHCI_SAVED_STATE_VERSION                4
+#define AHCI_SAVED_STATE_VERSION                5
 /** Saved state version before ATAPI support was added. */
 #define AHCI_SAVED_STATE_VERSION_PRE_ATAPI      3
@@ -440 +440 @@
     volatile uint32_t               u32TasksNew;
 
+    /** Current command slot processed.
+     * Accessed by the guest by reading the CMD register.
+     * Holds the command slot of the command processed at the moment. */
+    volatile uint32_t               u32CurrentCommandSlot;
+
+#if HC_ARCH_BITS == 64
+    uint32_t                        u32Alignment2;
+#endif
+
     /** Device specific settings (R3 only stuff). */
     /** Pointer to the attached driver's base interface. */
@@ -480 +489 @@
     R3PTRTYPE(volatile PAHCIPORTTASKSTATE) pTaskErr;
 
+#if HC_ARCH_BITS == 32
+    uint32_t                        u32Alignment4;
+#endif
+
     /** Release statistics: number of DMA commands. */
     STAMCOUNTER                     StatDMA;
@@ -514 +527 @@
     uint32_t                        cErrors;
 
-    uint32_t                        u32Alignment4;
+    uint32_t                        u32Alignment5;
 } AHCIPort;
 /** Pointer to the state of an AHCI port. */
@@ -1232 +1245 @@
              (pAhciPort->regCMD & AHCI_PORT_CMD_PMA) >> 17, (pAhciPort->regCMD & AHCI_PORT_CMD_CPS) >> 16,
              (pAhciPort->regCMD & AHCI_PORT_CMD_CR) >> 15, (pAhciPort->regCMD & AHCI_PORT_CMD_FR) >> 14,
-             (pAhciPort->regCMD & AHCI_PORT_CMD_ISS) >> 13, (pAhciPort->regCMD & AHCI_PORT_CMD_CCS) >> 8,
+             (pAhciPort->regCMD & AHCI_PORT_CMD_ISS) >> 13, pAhciPort->u32CurrentCommandSlot,
              (pAhciPort->regCMD & AHCI_PORT_CMD_FRE) >> 4, (pAhciPort->regCMD & AHCI_PORT_CMD_CLO) >> 3,
              (pAhciPort->regCMD & AHCI_PORT_CMD_POD) >> 2, (pAhciPort->regCMD & AHCI_PORT_CMD_SUD) >> 1,
              (pAhciPort->regCMD & AHCI_PORT_CMD_ST)));
-    *pu32Value = pAhciPort->regCMD;
+    *pu32Value = pAhciPort->regCMD | AHCI_PORT_CMD_CCS_SHIFT(pAhciPort->u32CurrentCommandSlot);
     return VINF_SUCCESS;
 }
@@ -1282 +1295 @@
             pAhciPort->regCI = 0;
             /** Clear current command slot. */
-            u32Value &= ~(AHCI_PORT_CMD_CCS_SHIFT(0xff));
+            pAhciPort->u32CurrentCommandSlot = 0;
             u32Value &= ~AHCI_PORT_CMD_CR;
         }
@@ -1874 +1887 @@
     pAhciPort->u32TasksFinished = 0;
     pAhciPort->u32QueuedTasksFinished = 0;
+    pAhciPort->u32CurrentCommandSlot = 0;
 
     pAhciPort->cTasksActive = 0;
@@ -4561 +4575 @@
             if (pAhciPort->regIE & AHCI_PORT_IE_TFEE)
                 fAssertIntr = true;
+            /*
+             * Don't mark the command slot as completed because the guest
+             * needs it to identify the failed command.
+             */
         }
-
-        if (fInterrupt)
+        else if (fInterrupt)
         {
             ASMAtomicOrU32(&pAhciPort->regIS, AHCI_PORT_IS_DHRS);
@@ -4569 +4586 @@
             if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
                 fAssertIntr = true;
+
+            /* Mark command as completed. */
+            ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciPortTaskState->uTag));
         }
-
-        ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciPortTaskState->uTag));
 
         if (fAssertIntr)
@@ -5795 +5813 @@
                 {
                     pAhciPortTaskState->uATARegError = ABRT_ERR;
-                    pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+                    pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK  | ATA_STAT_ERR;
                 }
                 break;
@@ -6177 +6195 @@
             /* Set current command slot */
             pAhciPortTaskState->uTag = idx;
-            pAhciPort->regCMD |= (AHCI_PORT_CMD_CCS_SHIFT(pAhciPortTaskState->uTag));
+            ASMAtomicWriteU32(&pAhciPort->u32CurrentCommandSlot, pAhciPortTaskState->uTag);
 
             ahciPortTaskGetCommandFis(pAhciPort, pAhciPortTaskState);
@@ -6359 +6377 @@
 
             /* Set current command slot */
-            pAhciPort->regCMD |= (AHCI_PORT_CMD_CCS_SHIFT(pAhciPortTaskState->uTag));
+            ASMAtomicWriteU32(&pAhciPort->u32CurrentCommandSlot, pAhciPortTaskState->uTag);
 
             /* Mark the task as processed by the HBA if this is a queued task so that it doesn't occur in the CI register anymore. */
@@ -6854 +6872 @@
         SSMR3PutU8(pSSM, pThis->ahciPort[i].uATATransferMode);
         SSMR3PutBool(pSSM, pThis->ahciPort[i].fResetDevice);
-
-        /* No need to save but to avoid changing the SSM format they are still written. */
-        SSMR3PutU8(pSSM, 0); /* Prev: Write position in the FIFO. */
-        SSMR3PutU8(pSSM, 0); /* Prev: Read position in the FIFO. */
-
         SSMR3PutBool(pSSM, pThis->ahciPort[i].fPoweredOn);
         SSMR3PutBool(pSSM, pThis->ahciPort[i].fSpunUp);
         SSMR3PutU32(pSSM, pThis->ahciPort[i].u32TasksFinished);
         SSMR3PutU32(pSSM, pThis->ahciPort[i].u32QueuedTasksFinished);
+        SSMR3PutU32(pSSM, pThis->ahciPort[i].u32CurrentCommandSlot);
 
         /* ATAPI saved state. */
@@ -6991 +7005 @@
         for (uint32_t i = 0; i < AHCI_MAX_NR_PORTS_IMPL; i++)
         {
-            uint8_t u8;
             PAHCIPort pAhciPort = &pThis->ahciPort[i];
 
@@ -7021 +7034 @@
                 SSMR3Skip(pSSM, AHCI_NR_COMMAND_SLOTS * sizeof(uint8_t)); /* no active data here */
 
-            SSMR3GetU8(pSSM, &u8);
-            SSMR3GetU8(pSSM, &u8);
+            if (uVersion <= AHCI_SAVED_STATE_VERSION)
+            {
+                /* The old positions in the FIFO, not required. */
+                SSMR3Skip(pSSM, 2*sizeof(uint8_t));
+            }
             SSMR3GetBool(pSSM, &pThis->ahciPort[i].fPoweredOn);
             SSMR3GetBool(pSSM, &pThis->ahciPort[i].fSpunUp);
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32TasksFinished);
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32QueuedTasksFinished);
+            SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32CurrentCommandSlot);
 
             if (uVersion > AHCI_SAVED_STATE_VERSION_PRE_ATAPI)