Changeset 40841 in vbox for trunk/src

Timestamp:

Apr 10, 2012 8:22:56 AM (13 years ago)

Author:

vboxsync

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

77360

Message:

Storage/ATA: Fix CD/DVD passthrough and Session At Once (SAO) recording by saving the CUE sheet and determining the correct sector sizes during recording

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevATA.cpp (modified) (8 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -303 +303 @@
     /** The revision string for SCSI INQUIRY commands. */
     char                                szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH+1];
-
-    uint8_t                             abAlignment3[7];
+    /** Size of the current CUE sheet in bytes. */
+    uint32_t                            cbCueSheet;
+    /** Align pbCueSheet correctly. */
+    uint32_t                            u32Alignment3;
+    /** The current CUE Sheet if passthrough is used. */
+    R3PTRTYPE(uint8_t *)                pbCueSheet;
+
+    uint8_t                             abAlignment4[HC_ARCH_BITS == 64 ? 7 : 3];
 } ATADevState;
 AssertCompileMemberAlignment(ATADevState, cTotalSectors, 8);
@@ -1127 +1133 @@
 }
 
+/**
+ * Compares two MSF values.
+ *
+ * @returns 1  if the first value is greater than the second value.
+ *          0  if both are equal
+ *          -1 if the first value is smaller than the second value.
+ */
+DECLINLINE(int) atapiCmpMSF(const uint8_t *pbMSF1, const uint8_t *pbMSF2)
+{
+    int iRes = 0;
+
+    for (unsigned i = 0; i < 3; i++)
+    {
+        if (pbMSF1[i] < pbMSF2[i])
+        {
+            iRes = -1;
+            break;
+        }
+        else if (pbMSF1[i] > pbMSF2[i])
+        {
+            iRes = 1;
+            break;
+        }
+    }
+
+    return iRes;
+}
+
+/**
+ * Return the correct sector size from the given LBA.
+ *
+ * @returns Sector size.
+ * @param   s            ATA Device state.
+ * @param   iATAPILBA    The LBA.
+ */
+static size_t atapiGetSectorSizeFromLba(ATADevState *s, uint32_t iATAPILBA)
+{
+    size_t cbATAPISector = 2048;
+
+    /*
+     * Check if there is a valid CUE Sheet we can use,
+     * otherwise we just return the standard sector size.
+     */
+    if (s->pbCueSheet)
+    {
+        uint8_t *pbCueSheetEntry = NULL;
+        uint8_t iMSF[3];
+
+        /*
+         * Convert the LBA to the MSF format so we can look it up in the cue sheet.
+         * Note that it is possible to have negative LBA values for the Lead-In area.
+         * See MMC6 spec chapter 6.46.3.3 for more details.
+         */
+        LogFlowFunc(("iATAPILBA=%#x (signed: %d unsigned: %u)\n",
+                     iATAPILBA, (int32_t)iATAPILBA, iATAPILBA));
+
+        if (   iATAPILBA > UINT32_C(0xffff4fa1)
+            && (int32_t)iATAPILBA < -150)
+        {
+            /* Lead-In area, this is always the first entry in the cue sheet. */
+            pbCueSheetEntry = s->pbCueSheet;
+            LogFlowFunc(("Selected Lead-In area\n"));
+        }
+        else
+        {
+            iATAPILBA += 150;
+            iMSF[0] = (iATAPILBA / 75) / 60;
+            iMSF[1] = (iATAPILBA / 75) % 60;
+            iMSF[2] = iATAPILBA % 75;
+
+            pbCueSheetEntry = s->pbCueSheet + 8; /* Start after the Lead-in track. */
+
+            /* Go through the CUE sheet and find the correct entry. */
+            for (unsigned i = 0; i < (s->cbCueSheet / 8) - 2; i++)
+            {
+                if (   atapiCmpMSF(&pbCueSheetEntry[5], iMSF) != 1
+                    && atapiCmpMSF(&pbCueSheetEntry[8+5], iMSF) == 1)
+                    break;
+                pbCueSheetEntry += 8;
+            }
+            LogFlowFunc(("Selected CUE sheet entry iMin=%u iSec=%u iFrame=%u\n",
+                         pbCueSheetEntry[5], pbCueSheetEntry[6], pbCueSheetEntry[7]));
+        }
+
+        if (pbCueSheetEntry)
+        {
+            /* Determine size of main data based on the data form field. */
+            switch (pbCueSheetEntry[3] & 0x3f)
+            {
+                case 0x00: /* CD-DA with data. */
+                case 0x11: /* CD-ROM mode 1 */
+                case 0x13:
+                case 0x21: /* CD-ROM XA, CD-I */
+                case 0x23:
+                case 0x31: /* CD-ROM Mode 2 */
+                case 0x33:
+                    cbATAPISector = 2352;
+                    break;
+                case 0x01: /* CD-DA without data (used for pauses between tracks). */
+                case 0x14:
+                case 0x24:
+                case 0x34:
+                    cbATAPISector = 0;
+                    break;
+                case 0x10: /* CD-ROM mode 1 */
+                case 0x12:
+                    cbATAPISector = 2048;
+                    break;
+                case 0x20: /* CD-ROM XA, CD-I */
+                case 0x22:
+                case 0x30: /* CD-ROM Mode 2 */
+                case 0x32:
+                    cbATAPISector = 2336;
+                    break;
+                default: /* Reserved, invalid mode. Log and leave default sector size. */
+                    LogRel(("ATA: Invalid data form mode %u for current CUE sheet\n",
+                            pbCueSheetEntry[3] & 0x3f));
+            }
+
+            /* Determine size of sub channel data based on data form field. */
+            switch ((pbCueSheetEntry[3] & 0xc0) >> 6)
+            {
+                case 0x00: /* Sub channel all zeroes, autogenerated by the drive. */
+                    break;
+                case 0x01:
+                case 0x03:
+                    cbATAPISector += 96;
+                    break;
+                default:
+                    LogRel(("ATA: Invalid sub-channel data form mode %u for current CUE sheet\n",
+                            pbCueSheetEntry[3] & 0xc0));
+            }
+        }
+    }
+
+    LogFlowFunc(("cbATAPISector=%zu\n", cbATAPISector));
+    return cbATAPISector;
+}
 
 static void ataCmdOK(ATADevState *s, uint8_t status)
@@ -1917 +2061 @@
     PDMCritSectLeave(&pCtl->lock);
 
+#if defined(LOG_ENABLED)
+    char szBuf[1024];
+
+    memset(szBuf, 0, sizeof(szBuf));
+
+    switch (s->aATAPICmd[0])
+    {
+        case SCSI_MODE_SELECT_10:
+        {
+            size_t cbBlkDescLength = ataBE2H_U16(&s->CTX_SUFF(pbIOBuffer)[6]);
+
+            SCSILogModePage(szBuf, sizeof(szBuf) - 1,
+                            s->CTX_SUFF(pbIOBuffer) + 8 + cbBlkDescLength,
+                            cbTransfer - 8 - cbBlkDescLength);
+            break;
+        }
+        case SCSI_SEND_CUE_SHEET:
+        {
+            SCSILogCueSheet(szBuf, sizeof(szBuf) - 1,
+                            s->CTX_SUFF(pbIOBuffer), cbTransfer);
+            break;
+        }
+        default:
+            break;
+    }
+
+    Log2(("%s\n", szBuf));
+#endif
+
     if (pProf) { STAM_PROFILE_ADV_START(pProf, b); }
     if (   cbTransfer > SCSI_MAX_BUFFER_SIZE
@@ -2063 +2236 @@
     if (RT_SUCCESS(rc))
     {
+        /* Do post processing for certain commands. */
+        switch (s->aATAPICmd[0])
+        {
+            case SCSI_SEND_CUE_SHEET:
+            {
+                /* Save the CUE sheet to determine sector sizes during writes */
+                if (s->pbCueSheet)
+                {
+                    s->cbCueSheet = 0;
+                    RTMemFree(s->pbCueSheet);
+                }
+
+                s->pbCueSheet = (uint8_t *)RTMemAllocZ(s->cbElementaryTransfer);
+                if (s->pbCueSheet)
+                {
+                    s->cbCueSheet = s->cbElementaryTransfer;
+                    memcpy(s->pbCueSheet, s->CTX_SUFF(pbIOBuffer), s->cbElementaryTransfer);
+                }
+                else if (s->cErrors++ < MAX_LOG_REL_ERRORS)
+                    LogRel(("ATA: Out of memory while saving the CUE sheet, burning disc might fail\n"));
+                break;
+            }
+            case SCSI_SYNCHRONIZE_CACHE:
+            {
+                /* Free the current CUE sheet after session at once recording. */
+                if (s->pbCueSheet)
+                {
+                    s->cbCueSheet = 0;
+                    RTMemFree(s->pbCueSheet);
+                }
+                break;
+            }
+        }
+
         if (s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
         {
@@ -3557 +3764 @@
             goto sendcmd;
         case SCSI_WRITE_10:
+        case SCSI_WRITE_AND_VERIFY_10:
             iATAPILBA = ataBE2H_U32(pbPacket + 2);
             cSectors = ataBE2H_U16(pbPacket + 7);
-            Log2(("ATAPI PT: lba %d sectors %d\n", iATAPILBA, cSectors));
-#if 0
-            /* The sector size is determined by the async I/O thread. */
-            s->cbATAPISector = 0;
-            /* Preliminary, will be corrected once the sector size is known. */
-            cbTransfer = cSectors;
-#else
-            s->cbATAPISector = 2048; /**< @todo this size is not always correct */
+            s->cbATAPISector = atapiGetSectorSizeFromLba(s, iATAPILBA);
+            Log2(("ATAPI PT: lba %d sectors %d sector size %d\n", iATAPILBA, cSectors, s->cbATAPISector));
             cbTransfer = cSectors * s->cbATAPISector;
-#endif
             uTxDir = PDMBLOCKTXDIR_TO_DEVICE;
             goto sendcmd;
@@ -3574 +3775 @@
             iATAPILBA = ataBE2H_U32(pbPacket + 2);
             cSectors = ataBE2H_U32(pbPacket + 6);
-            Log2(("ATAPI PT: lba %d sectors %d\n", iATAPILBA, cSectors));
-#if 0
-            /* The sector size is determined by the async I/O thread. */
-            s->cbATAPISector = 0;
-            /* Preliminary, will be corrected once the sector size is known. */
-            cbTransfer = cSectors;
-#else
-            s->cbATAPISector = 2048; /**< @todo this size is not always correct */
+            s->cbATAPISector = atapiGetSectorSizeFromLba(s, iATAPILBA);
+            Log2(("ATAPI PT: lba %d sectors %d sector size %d\n", iATAPILBA, cSectors, s->cbATAPISector));
             cbTransfer = cSectors * s->cbATAPISector;
-#endif
-            uTxDir = PDMBLOCKTXDIR_TO_DEVICE;
-            goto sendcmd;
-        case SCSI_WRITE_AND_VERIFY_10:
-            iATAPILBA = ataBE2H_U32(pbPacket + 2);
-            cSectors = ataBE2H_U16(pbPacket + 7);
-            Log2(("ATAPI PT: lba %d sectors %d\n", iATAPILBA, cSectors));
-            /* The sector size is determined by the async I/O thread. */
-            s->cbATAPISector = 0;
-            /* Preliminary, will be corrected once the sector size is known. */
-            cbTransfer = cSectors;
             uTxDir = PDMBLOCKTXDIR_TO_DEVICE;
             goto sendcmd;
@@ -4823 +5007 @@
             {
                 dmalen = RT_MIN(cbBuffer, iIOBufferEnd - iIOBufferCur);
-                Log2(("%s: DMA desc %#010x: addr=%#010x size=%#010x\n", __FUNCTION__,
-                       (int)pDesc, pBuffer, cbBuffer));
+                Log2(("%s: DMA desc %#010x: addr=%#010x size=%#010x orig_size=%#010x\n", __FUNCTION__,
+                       (int)pDesc, pBuffer, cbBuffer, RT_LE2H_U32(DMADesc.cbBuffer) & 0xfffe));
                 if (uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
                     PDMDevHlpPhysWrite(pDevIns, pBuffer, s->CTX_SUFF(pbIOBuffer) + iIOBufferCur, dmalen);
@@ -6108 +6292 @@
                 LogRel(("PIIX3 ATA Dtor: Ctl#%u actually completed.\n", i));
             }
+        }
+
+        for (uint32_t iIf = 0; iIf < RT_ELEMENTS(pThis->aCts[i].aIfs); iIf++)
+        {
+            if (pThis->aCts[i].aIfs[iIf].pbCueSheet)
+                RTMemFree(pThis->aCts[i].aIfs[iIf].pbCueSheet);
         }
     }

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -811 +811 @@
     GEN_CHECK_OFF(ATADevState, szInquiryRevision);
     GEN_CHECK_OFF(ATADevState, szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH]);
+    GEN_CHECK_OFF(ATADevState, cbCueSheet);
+    GEN_CHECK_OFF(ATADevState, pbCueSheet);
     GEN_CHECK_SIZE(ATATransferRequest);
     GEN_CHECK_OFF(ATATransferRequest, iIf);