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

Timestamp:

Jan 28, 2011 2:41:06 PM (14 years ago)

Author:

vboxsync

Message:

Storage/DevATA: fix device reset handling, sanity check was wrong

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (1 diff)

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

@@ -4997 +4997 @@
 
             case ATA_AIO_ABORT:
-                /* Abort the current command only if it operates on the same interface. */
-                if (pCtl->iAIOIf == pReq->u.a.iIf)
+                /* Abort the current command no matter what. There cannot be
+                 * any command activity on the other drive otherwise using
+                 * one thread per controller wouldn't work at all. */
+                s = &pCtl->aIfs[pReq->u.a.iIf];
+
+                pCtl->uAsyncIOState = ATA_AIO_NEW;
+                /* Do not change the DMA registers, they are not affected by the
+                 * ATA controller reset logic. It should be sufficient to issue a
+                 * new command, which is now possible as the state is cleared. */
+                if (pReq->u.a.fResetDrive)
                 {
-                    s = &pCtl->aIfs[pCtl->iAIOIf];
-
-                    pCtl->uAsyncIOState = ATA_AIO_NEW;
-                    /* Do not change the DMA registers, they are not affected by the
-                     * ATA controller reset logic. It should be sufficient to issue a
-                     * new command, which is now possible as the state is cleared. */
-                    if (pReq->u.a.fResetDrive)
-                    {
-                        ataResetDevice(s);
-                        ataExecuteDeviceDiagnosticSS(s);
-                    }
-                    else
-                    {
-                        /* Stop any pending DMA transfer. */
-                        s->fDMA = false;
-                        ataPIOTransferStop(s);
-                        ataUnsetStatus(s, ATA_STAT_BUSY | ATA_STAT_DRQ | ATA_STAT_SEEK | ATA_STAT_ERR);
-                        ataSetStatus(s, ATA_STAT_READY);
-                        ataSetIRQ(s);
-                    }
+                    ataResetDevice(s);
+                    ataExecuteDeviceDiagnosticSS(s);
+                }
+                else
+                {
+                    /* Stop any pending DMA transfer. */
+                    s->fDMA = false;
+                    ataPIOTransferStop(s);
+                    ataUnsetStatus(s, ATA_STAT_BUSY | ATA_STAT_DRQ | ATA_STAT_SEEK | ATA_STAT_ERR);
+                    ataSetStatus(s, ATA_STAT_READY);
+                    ataSetIRQ(s);
                 }
                 break;