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

Timestamp:

Sep 12, 2007 8:56:28 AM (17 years ago)

Author:

vboxsync

Message:

Real fix for the IDE device crash when huge blocks are read from CD. The
previous one was uneffective (and also incomplete).

File:

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

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

@@ -892 +892 @@
     uint32_t cbLimit, cbTransfer;
 
-    cbLimit = s->uATARegLCyl | (s->uATARegHCyl << 8);
+    if (s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+        cbLimit = 0xfffe;
+    else
+        cbLimit = s->uATARegLCyl | (s->uATARegHCyl << 8);
     Log2(("%s: byte count limit=%d\n", __FUNCTION__, cbLimit));
     if (cbLimit == 0xffff)
         cbLimit--;
-    cbTransfer = s->cbTotalTransfer;
+    cbTransfer = RT_MIN(s->cbTotalTransfer, s->iIOBufferEnd - s->iIOBufferCur);
     if (cbTransfer > cbLimit)
     {
@@ -1618 +1621 @@
     uint32_t cbTransfer, cSectors;
 
-    s->iSourceSink = ATAFN_SS_NULL;
     Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);
     cbTransfer = RT_MIN(s->cbTotalTransfer, s->cbIOBuffer);
@@ -1676 +1678 @@
          * transfer size. But the I/O buffer size limits what can actually be
          * done in one transfer, so set the actual value of the buffer end. */
-        s->iIOBufferEnd = cbTransfer;
+        s->cbElementaryTransfer = cbTransfer;
+        if (cbTransfer >= s->cbTotalTransfer)
+            s->iSourceSink = ATAFN_SS_NULL;
         atapiCmdOK(s);
         s->iATAPILBA += cSectors;
@@ -1836 +1840 @@
              * transfer size. But the I/O buffer size limits what can actually be
              * done in one transfer, so set the actual value of the buffer end. */
-            s->iIOBufferEnd = cbTransfer;
+            s->cbElementaryTransfer = cbTransfer;
             if (s->aATAPICmd[0] == SCSI_INQUIRY)
             {
@@ -3695 +3699 @@
     if (s->cbTotalTransfer && s->iIOBufferCur > s->iIOBufferEnd)
     {
-        LogRel(("PIIX3 ATA: LUN#%d: %s data in the middle of a PIO transfer - VERY SLOW\n", s->iLUN, s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE ? "storing" : "loading"));
+        LogRel(("PIIX3 ATA: LUN#%d: %s data in the middle of a PIO transfer - VERY SLOW\n", s->iLUN, s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE ? "loading" : "storing"));
         /* Any guest OS that triggers this case has a pathetic ATA driver.
          * In a real system it would block the CPU via IORDY, here we do it
@@ -3749 +3753 @@
     }
 
-    if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE || s->iSourceSink != ATAFN_SS_NULL)
+    if (   s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE
+        || (   s->iSourceSink != ATAFN_SS_NULL
+            && s->iIOBufferCur >= s->iIOBufferEnd))
     {
         /* Need to continue the transfer in the async I/O thread. This is
@@ -3762 +3768 @@
     else
     {
-        /* Everything finished (though maybe a couple of chunks need to be
-         * transferred, but all without source/sink callback). */
+        /* Either everything finished (though some data might still be pending)
+         * or some data is pending before the next read is due. */
 
         /* Continue a previously started transfer. */