Changeset 32300 in vbox

Timestamp:

Sep 7, 2010 10:34:57 PM (15 years ago)

Author:

vboxsync

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

65635

Message:

AHCI/ATAPI: port fixes for audio CD over and implement support for saved states

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (13 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -64 +64 @@
 
 /** The current saved state version. */
-#define AHCI_SAVED_STATE_VERSION                3
+#define AHCI_SAVED_STATE_VERSION                4
+/** Saved state version before ATAPI support was added. */
+#define AHCI_SAVED_STATE_VERSION_PRE_ATAPI      3
 /** The saved state version use in VirtualBox 3.0 and earlier.
  * This was before the config was added and ahciIOTasks was dropped. */
@@ -106 +108 @@
 #define ATA_EVENT_STATUS_MEDIA_CHANGED          3    /**< medium was removed + new medium was inserted */
 #define ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED  4    /**< medium eject requested (eject button pressed) */
+
+/* Media track type */
+#define ATA_MEDIA_TYPE_UNKNOWN                  0    /**< unknown CD type */
+#define ATA_MEDIA_TYPE_DATA                     1    /**< Data CD */
+#define ATA_MEDIA_TYPE_CDDA                     2    /**< CD-DA  (audio) CD type */
 
 /** ATAPI sense info size. */
@@ -457 +464 @@
     /** The same for GET_EVENT_STATUS for mechanism */
     volatile uint32_t               MediaEventStatus;
+    /** Media type if known. */
+    volatile uint32_t               MediaTrackType;
 
     /** The LUN. */
@@ -467 +476 @@
     /** Bitmask for finished queued tasks. */
     volatile uint32_t               u32QueuedTasksFinished;
-
-    uint32_t                        u32Alignment6;
 
     /**
@@ -1903 +1910 @@
 
     ASMAtomicWriteU32(&pAhciPort->MediaEventStatus, ATA_EVENT_STATUS_UNCHANGED);
+    ASMAtomicWriteU32(&pAhciPort->MediaTrackType, ATA_MEDIA_TYPE_UNKNOWN);
 
     if (pAhciPort->pDrvBase)
@@ -3466 +3474 @@
 }
 
+/**
+ * Sets the given media track type.
+ */
+static uint32_t ataMediumTypeSet(PAHCIPort pAhciPort, uint32_t MediaTrackType)
+{
+    return ASMAtomicXchgU32(&pAhciPort->MediaTrackType, MediaTrackType);
+}
+
 static int atapiPassthroughSS(PAHCIPORTTASKSTATE pAhciPortTaskState, PAHCIPort pAhciPort, int *pcbData)
 {
@@ -3624 +3640 @@
                 ataSCSIPadStr((uint8_t *)pAhciPortTaskState->pSGListHead[0].pvSeg + 16, "CD-ROM", 16);
                 ataSCSIPadStr((uint8_t *)pAhciPortTaskState->pSGListHead[0].pvSeg + 32, "1.0", 4);
+            }
+            else if (pAhciPortTaskState->aATAPICmd[0] == SCSI_READ_TOC_PMA_ATIP)
+            {
+                /* Set the media type if we can detect it. */
+                uint8_t *pbBuf = (uint8_t *)pAhciPortTaskState->pSGListHead[0].pvSeg;
+
+                /** @todo: Implemented only for formatted TOC now. */
+                if (   (pAhciPortTaskState->aATAPICmd[1] & 0xf) == 0
+                    && cbTransfer >= 6)
+                {
+                    uint32_t NewMediaType;
+                    uint32_t OldMediaType;
+
+                    if (pbBuf[5] & 0x4)
+                        NewMediaType = ATA_MEDIA_TYPE_DATA;
+                    else
+                        NewMediaType = ATA_MEDIA_TYPE_CDDA;
+
+                    OldMediaType = ataMediumTypeSet(pAhciPort, NewMediaType);
+
+                    if (OldMediaType != NewMediaType)
+                        LogRel(("AHCI: LUN#%d: CD-ROM passthrough, detected %s CD\n",
+                                pAhciPort->iLUN,
+                                NewMediaType == ATA_MEDIA_TYPE_DATA
+                                ? "data"
+                                : "audio"));
+                }
+                else /* Play safe and set to unknown. */
+                    ataMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
             }
             if (cbTransfer)
@@ -4196 +4241 @@
             goto sendcmd;
         case SCSI_READ_CD:
-            pAhciPortTaskState->cbATAPISector = 2048; /**< @todo this size is not always correct */
+        {
+            /* Get sector size based on the expected sector type field. */
+            switch ((pbPacket[1] >> 2) & 0x7)
+            {
+                case 0x0: /* All types. */
+                    if (ASMAtomicReadU32(&pAhciPort->MediaTrackType) == ATA_MEDIA_TYPE_CDDA)
+                        pAhciPortTaskState->cbATAPISector = 2352;
+                    else
+                        pAhciPortTaskState->cbATAPISector = 2048; /* Might be incorrect if we couldn't determine the type. */
+                    break;
+                case 0x1: /* CD-DA */
+                    pAhciPortTaskState->cbATAPISector = 2352;
+                    break;
+                case 0x2: /* Mode 1 */
+                    pAhciPortTaskState->cbATAPISector = 2048;
+                    break;
+                case 0x3: /* Mode 2 formless */
+                    pAhciPortTaskState->cbATAPISector = 2336;
+                    break;
+                case 0x4: /* Mode 2 form 1 */
+                    pAhciPortTaskState->cbATAPISector = 2048;
+                    break;
+                case 0x5: /* Mode 2 form 2 */
+                    pAhciPortTaskState->cbATAPISector = 2324;
+                    break;
+                default: /* Reserved */
+                    AssertMsgFailed(("Unknown sector type\n"));
+                    pAhciPortTaskState->cbATAPISector = 0; /** @todo we should probably fail the command here already. */
+            }
+
             cbTransfer = ataBE2H_U24(pbPacket + 6) * pAhciPortTaskState->cbATAPISector;
             enmTxDir = AHCITXDIR_READ;
             goto sendcmd;
+        }
         case SCSI_READ_CD_MSF:
             cSectors = ataMSF2LBA(pbPacket + 6) - ataMSF2LBA(pbPacket + 3);
@@ -6714 +6789 @@
         SSMR3PutU32(pSSM, pThis->ahciPort[i].u32TasksFinished);
         SSMR3PutU32(pSSM, pThis->ahciPort[i].u32QueuedTasksFinished);
+
+        /* ATAPI saved state. */
+        SSMR3PutBool(pSSM, pThis->ahciPort[i].fATAPI);
+        SSMR3PutMem(pSSM, &pThis->ahciPort[i].abATAPISense[0], sizeof(pThis->ahciPort[i].abATAPISense));
+        SSMR3PutU8(pSSM, pThis->ahciPort[i].cNotifiedMediaChange);
+        SSMR3PutU32(pSSM, pThis->ahciPort[i].MediaEventStatus);
     }
 
@@ -6743 +6824 @@
 
     if (    uVersion != AHCI_SAVED_STATE_VERSION
+        &&  uVersion != AHCI_SAVED_STATE_VERSION_PRE_ATAPI
         &&  uVersion != AHCI_SAVED_STATE_VERSION_VBOX_30)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
@@ -6868 +6950 @@
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32TasksFinished);
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32QueuedTasksFinished);
+
+            if (uVersion > AHCI_SAVED_STATE_VERSION_PRE_ATAPI)
+            {
+                SSMR3GetBool(pSSM, &pThis->ahciPort[i].fATAPI);
+                SSMR3GetMem(pSSM, pThis->ahciPort[i].abATAPISense, sizeof(pThis->ahciPort[i].abATAPISense));
+                SSMR3GetU8(pSSM, &pThis->ahciPort[i].cNotifiedMediaChange);
+                SSMR3GetU32(pSSM, (uint32_t*)&pThis->ahciPort[i].MediaEventStatus);
+            }
+            else if (pThis->ahciPort[i].fATAPI)
+                return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Config mismatch: atapi - saved=%false config=true"));
         }
 
@@ -7034 +7126 @@
             pAhciPort->cNotifiedMediaChange = 2;
         ahciMediumInserted(pAhciPort);
+        ataMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else
@@ -7071 +7164 @@
         pAhciPort->cNotifiedMediaChange = 4;
         ahciMediumRemoved(pAhciPort);
+        ataMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else

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

@@ -1194 +1194 @@
     GEN_CHECK_OFF(AHCIPort, abATAPISense);
     GEN_CHECK_OFF(AHCIPort, cNotifiedMediaChange);
+    GEN_CHECK_OFF(AHCIPort, MediaEventStatus);
+    GEN_CHECK_OFF(AHCIPort, MediaTrackType);
     GEN_CHECK_OFF(AHCIPort, iLUN);
     GEN_CHECK_OFF(AHCIPort, fResetDevice);