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

Timestamp:

May 9, 2013 9:06:06 PM (12 years ago)

Author:

vboxsync

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

85624

Message:

DevATA: Do not unnecessarily restrict ATAPI PIO transfer size.

File:

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

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

@@ -179 +179 @@
     /** Elementary ATA/ATAPI transfer size, shared PIO/DMA. */
     uint32_t cbElementaryTransfer;
+    /** Maximum ATAPI elementary transfer size, PIO only. */
+    uint32_t cbPIOTransferLimit;
     /** Current read/write buffer position, shared PIO/DMA. */
     uint32_t iIOBufferCur;
@@ -1009 +1011 @@
     uint32_t cbLimit, cbTransfer;
 
-    cbLimit = s->uATARegLCyl | (s->uATARegHCyl << 8);
+    cbLimit = s->cbPIOTransferLimit;
     /* Use maximum transfer size if the guest requested 0. Avoids a hang. */
     if (cbLimit == 0)
@@ -1735 +1737 @@
     s->fATAPITransfer = true;
     s->cbElementaryTransfer = s->cbTotalTransfer;
+    s->cbPIOTransferLimit = s->uATARegLCyl | (s->uATARegHCyl << 8);
     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
         atapiCmdOK(s);
@@ -6659 +6662 @@
             SSMR3GetU32(pSSM, &pThis->aCts[i].aIfs[j].cbTotalTransfer);
             SSMR3GetU32(pSSM, &pThis->aCts[i].aIfs[j].cbElementaryTransfer);
+            /* NB: cbPIOTransferLimit could be saved/restored but it's sufficient
+             * to re-calculate it here, with a tiny risk that it could be
+             * unnecessarily low for the current transfer only. Could be changed
+             * when changing the saved state in the future.
+             */
+            pThis->aCts[i].aIfs[j].cbPIOTransferLimit = (pThis->aCts[i].aIfs[j].uATARegHCyl << 8) | pThis->aCts[i].aIfs[j].uATARegLCyl;
             SSMR3GetU32(pSSM, &pThis->aCts[i].aIfs[j].iIOBufferCur);
             SSMR3GetU32(pSSM, &pThis->aCts[i].aIfs[j].iIOBufferEnd);