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

Timestamp:

May 4, 2010 10:38:43 PM (15 years ago)

Author:

vboxsync

Message:

AHCI: Fix error reporting protocol violation

File:

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

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

@@ -3885 +3885 @@
  * @param   pAhciPort           The port for which the SDB Fis is send.
  * @param   uFinishedTasks      Bitmask of finished tasks.
- * @param   pAhciPortTaskState  The state of the last task.
  * @param   fInterrupt          If an interrupt should be asserted.
  */
-static void ahciSendSDBFis(PAHCIPort pAhciPort, uint32_t uFinishedTasks, PAHCIPORTTASKSTATE pAhciPortTaskState, bool fInterrupt)
+static void ahciSendSDBFis(PAHCIPort pAhciPort, uint32_t uFinishedTasks, bool fInterrupt)
 {
     uint32_t sdbFis[2];
@@ -4934 +4933 @@
 
         if (!cOutstandingTasks)
-            ahciSendSDBFis(pAhciPort, 0, pAhciPortTaskState, true);
+            ahciSendSDBFis(pAhciPort, 0, true);
     }
     else
@@ -5203 +5202 @@
                                 uChkSum += aBuf[i];
 
-                            aBuf[511] = ~uChkSum;
+                            aBuf[511] = (uint8_t)-(int8_t)uChkSum;
+
+                            /*
+                             * Reading this log page results in an abort of all outstanding commands
+                             * and clearing the SActive register and TaskFile register.
+                             */
+                            ahciSendSDBFis(pAhciPort, 0xffffffff, true);
                         }
                         break;
@@ -5467 +5472 @@
         {
 #ifdef RT_STRICT
-            bool fXchg = ASMAtomicCmpXchgBool(&pAhciPortTaskState->fActive, false, true);
+            fXchg = ASMAtomicCmpXchgBool(&pAhciPortTaskState->fActive, false, true);
             AssertMsg(fXchg, ("Task is not active\n"));
 #endif
@@ -5813 +5818 @@
             {
                 if (uQueuedTasksFinished && RT_LIKELY(!pAhciPort->fPortReset))
-                    ahciSendSDBFis(pAhciPort, uQueuedTasksFinished, pAhciPortTaskState, true);
+                    ahciSendSDBFis(pAhciPort, uQueuedTasksFinished, true);
 
                 uQueuedTasksFinished = 0;
@@ -5822 +5827 @@
 
         if (uQueuedTasksFinished && RT_LIKELY(!pAhciPort->fPortReset))
-            ahciSendSDBFis(pAhciPort, uQueuedTasksFinished, pAhciPortTaskState, true);
+            ahciSendSDBFis(pAhciPort, uQueuedTasksFinished, true);
 
         uQueuedTasksFinished = 0;