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

Timestamp:

May 3, 2010 2:45:14 PM (15 years ago)

Author:

vboxsync

Message:

Devices/Storage: fix extremely sporadic bogus triggering of "I/O state inconsistent" release assertion due to BMDMA transfers getting started twice

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (5 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -417 +417 @@
     ATARequest          aAsyncIORequests[4];
     /** The position at which to insert a new request for the AIO thread. */
-    uint8_t             AsyncIOReqHead;
+    volatile uint8_t    AsyncIOReqHead;
     /** The position at which to get a new request for the AIO thread. */
-    uint8_t             AsyncIOReqTail;
+    volatile uint8_t    AsyncIOReqTail;
     /** Whether to call PDMDevHlpAsyncNotificationCompleted when idle. */
     bool volatile       fSignalIdle;
@@ -1133 +1133 @@
 {
     Log(("%s: code=%#x\n", __FUNCTION__, uErrorCode));
+    Assert(uErrorCode);
     s->uATARegError = uErrorCode;
     ataSetStatusValue(s, ATA_STAT_READY | ATA_STAT_ERR);
@@ -5063 +5064 @@
          * mid-flight. Not allowed, according to the PIIX3 specs. */
         Assert(!(pCtl->BmDma.u8Status & BM_STATUS_DMAING) || !((val ^ pCtl->BmDma.u8Cmd) & 0x04));
+        uint8_t uOldBmDmaStatus = pCtl->BmDma.u8Status;
         pCtl->BmDma.u8Status |= BM_STATUS_DMAING;
         pCtl->BmDma.u8Cmd = val & (BM_CMD_START | BM_CMD_WRITE);
@@ -5073 +5075 @@
         }
 
-        /* Do not start DMA transfers if there's a PIO transfer going on. */
-        if (!pCtl->aIfs[pCtl->iSelectedIf].fDMA)
+        /* Do not start DMA transfers if there's a PIO transfer going on,
+         * or if there is already a transfer started on this controller. */
+        if (   !pCtl->aIfs[pCtl->iSelectedIf].fDMA
+            || (uOldBmDmaStatus & BM_STATUS_DMAING))
             return;