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

Timestamp:

Jan 24, 2022 2:46:17 PM (3 years ago)

Author:

vboxsync

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

149513

Message:

DevATA: Keep track of current LBA for ATA R/W commands, too, not just ATAPI. Fixes problem with NetWare IDE.DSK which may overwrite CHS head of an in-progress command. See bugref:5869.

File:

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

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

@@ -60 +60 @@
  */
 /** The current saved state version. */
-#define ATA_SAVED_STATE_VERSION                         20
+#define ATA_SAVED_STATE_VERSION                         21
+/** Saved state version without iCurLBA for ATA commands. */
+#define ATA_SAVED_STATE_VERSION_WITHOUT_ATA_ILBA        20
 /** The saved state version used by VirtualBox 3.0.
  * This lacks the config part and has the type at the and.  */
@@ -282 +284 @@
     uint32_t                            iIOBufferPIODataEnd;
 
-    /** ATAPI current LBA position. */
-    uint32_t                            iATAPILBA;
+    /** Current LBA position (both ATA/ATAPI). */
+    uint32_t                            iCurLBA;
     /** ATAPI current sector size. */
     uint32_t                            cbATAPISector;
@@ -1846 +1848 @@
     cSectors = s->cbElementaryTransfer / cbSector;
     Assert(cSectors);
-    iLBA = ataR3GetSector(s);
+    iLBA = s->iCurLBA;
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
     rc = ataR3ReadSectors(pDevIns, pCtl, s, pDevR3, iLBA, s->abIOBuffer, cSectors, &fRedo);
@@ -1864 +1866 @@
             ataR3SetSector(s, iLBA + cSectors);
         s->uATARegNSector -= cSectors;
+        s->iCurLBA += cSectors;
         ataR3CmdOK(pCtl, s, ATA_STAT_SEEK);
     }
@@ -1898 +1901 @@
     cSectors = s->cbElementaryTransfer / cbSector;
     Assert(cSectors);
-    iLBA = ataR3GetSector(s);
+    iLBA = s->iCurLBA;
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
     rc = ataR3WriteSectors(pDevIns, pCtl, s, pDevR3, iLBA, s->abIOBuffer, cSectors, &fRedo);
@@ -1904 +1907 @@
     {
         ataR3SetSector(s, iLBA + cSectors);
+        s->iCurLBA = iLBA + cSectors;
         if (!s->cbTotalTransfer)
             s->iSourceSink = ATAFN_SS_NULL;
@@ -2010 +2014 @@
 
     Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
-    uint32_t const iATAPILBA     = s->iATAPILBA;
+    uint32_t const iATAPILBA     = s->iCurLBA;
     uint32_t const cbTransfer    = RT_MIN(s->cbTotalTransfer, RT_MIN(s->cbIOBuffer, ATA_MAX_IO_BUFFER_SIZE));
     uint32_t const cbATAPISector = s->cbATAPISector;
@@ -2120 +2124 @@
             s->iSourceSink = ATAFN_SS_NULL;
         atapiR3CmdOK(pCtl, s);
-        s->iATAPILBA = iATAPILBA + cSectors;
+        s->iCurLBA = iATAPILBA + cSectors;
     }
     else
@@ -2612 +2616 @@
 {
     Assert(cSectors > 0);
-    s->iATAPILBA = iATAPILBA;
+    s->iCurLBA = iATAPILBA;
     s->cbATAPISector = cbSector;
     ataR3StartTransfer(pDevIns, pCtl, s, cSectors * cbSector,
@@ -4398 +4402 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
+            s->iCurLBA = ataR3GetSector(s);
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
             break;
@@ -4408 +4413 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
+            s->iCurLBA = ataR3GetSector(s);
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
             break;
@@ -4417 +4423 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
+            s->iCurLBA = ataR3GetSector(s);
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
             break;
@@ -4426 +4433 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
+            s->iCurLBA = ataR3GetSector(s);
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
             break;
@@ -4436 +4444 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
+            s->iCurLBA = ataR3GetSector(s);
             s->fDMA = true;
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
@@ -4447 +4456 @@
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
+            s->iCurLBA = ataR3GetSector(s);
             s->fDMA = true;
             ataR3StartTransfer(pDevIns, pCtl, s, ataR3GetNSectors(s) * s->cbSector, PDMMEDIATXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
@@ -7260 +7270 @@
             pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].iIOBufferPIODataStart);
             pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].iIOBufferPIODataEnd);
-            pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].iATAPILBA);
+            pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].iCurLBA);
             pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].cbATAPISector);
             pHlp->pfnSSMPutMem(pSSM, &pThis->aCts[i].aIfs[j].abATAPICmd, sizeof(pThis->aCts[i].aIfs[j].abATAPICmd));
@@ -7303 +7313 @@
 
     if (   uVersion != ATA_SAVED_STATE_VERSION
+        && uVersion != ATA_SAVED_STATE_VERSION_WITHOUT_ATA_ILBA
         && uVersion != ATA_SAVED_STATE_VERSION_VBOX_30
         && uVersion != ATA_SAVED_STATE_VERSION_WITHOUT_FULL_SENSE
@@ -7448 +7459 @@
             pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].iIOBufferPIODataStart);
             pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].iIOBufferPIODataEnd);
-            pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].iATAPILBA);
+            pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].iCurLBA);
             pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].cbATAPISector);
             pHlp->pfnSSMGetMem(pSSM, &pThis->aCts[i].aIfs[j].abATAPICmd, sizeof(pThis->aCts[i].aIfs[j].abATAPICmd));
@@ -7475 +7486 @@
             rc = pHlp->pfnSSMGetU32(pSSM, &cbIOBuffer);
             AssertRCReturn(rc, rc);
+
+            if (   (uVersion <= ATA_SAVED_STATE_VERSION_WITHOUT_ATA_ILBA)
+                && !pThis->aCts[i].aIfs[j].fATAPI)
+            {
+                pThis->aCts[i].aIfs[j].iCurLBA = ataR3GetSector(&pThis->aCts[i].aIfs[j]);
+            }
 
             if (cbIOBuffer)