Changeset 70132 in vbox for trunk

Timestamp:

Dec 14, 2017 3:40:51 PM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Implemented crude support for macOS guests. See notes for more to-dos.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (3 diffs)
• DevHDACommon.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (18 diffs)
• HDAStream.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -1376 +1376 @@
         hdaStreamAsyncIOEnable(pStream, false /* fEnable */);
 # endif
+        /* Make sure to remove the run bit before doing the actual stream reset. */
+        HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_RUN;
+
         hdaStreamReset(pThis, pStream, pStream->u8SD);
 
@@ -1445 +1448 @@
     }
 
-    DEVHDA_UNLOCK_BOTH(pThis);
-
     int rc2 = hdaRegWriteU24(pThis, iReg, u32Value);
     AssertRC(rc2);
+
+    DEVHDA_UNLOCK_BOTH(pThis);
 
     return VINF_SUCCESS; /* Always return success to the MMIO handler. */
@@ -1816 +1819 @@
     if (rc == VERR_NOT_SUPPORTED)
     {
-        LogRel2(("HDA: Unsupported channel count (%RU8), falling back to stereo channels\n", pCfg->Props.cChannels));
+        LogRel(("HDA: Warning: Unsupported channel count (%RU8), falling back to stereo channels (2)\n", pCfg->Props.cChannels));
 
         /* Fall back to 2 channels (see below in fUseFront block). */

trunk/src/VBox/Devices/Audio/DevHDACommon.cpp

@@ -362 +362 @@
         /* Sanity checks. */
         Assert(cbChunk <= pBDLE->Desc.u32BufSize - pBDLE->State.u32BufOff);
-        Assert(cbChunk % HDA_FRAME_SIZE == 0);
+        Assert(cbChunk % pStream->State.cbFrameSize == 0);
         Assert((cbChunk >> 1) >= 1);
 

trunk/src/VBox/Devices/Audio/HDAStream.cpp

@@ -180 +180 @@
     pStream->u32CBL     = HDA_STREAM_REG(pThis, CBL, pStream->u8SD);
     pStream->u16FIFOS   = HDA_STREAM_REG(pThis, FIFOS, pStream->u8SD) + 1;
-
-    /* Make sure to also update the stream's DMA counter (based on its current LPIB value). */
-    hdaStreamSetPosition(pStream, HDA_STREAM_REG(pThis, LPIB, pStream->u8SD));
 
     PPDMAUDIOSTREAMCFG pCfg = &pStream->State.Cfg;
@@ -218 +215 @@
             break;
     }
+
+    /* Set the stream's frame size. */
+    pStream->State.cbFrameSize = pCfg->Props.cChannels * (pCfg->Props.cBits / 8 /* To bytes */);
 
     /*
@@ -231 +231 @@
 
     LogFunc(("[SD%RU8] DMA @ 0x%x (%RU32 bytes), LVI=%RU16, FIFOS=%RU16, Hz=%RU32, rc=%Rrc\n",
-             pStream->u8SD, pStream->u64BDLBase, pStream->u32CBL, pStream->u16LVI, pStream->u16FIFOS, 
+             pStream->u8SD, pStream->u64BDLBase, pStream->u32CBL, pStream->u16LVI, pStream->u16FIFOS,
              pStream->State.Cfg.Props.uHz, rc));
 
@@ -251 +251 @@
         pStream->State.cbTransferSize = pStream->u32CBL / cFragments;
         Assert(pStream->State.cbTransferSize);
-        Assert(pStream->State.cbTransferSize % HDA_FRAME_SIZE == 0);
+        Assert(pStream->State.cbTransferSize % pStream->State.cbFrameSize == 0);
 
         /* Calculate the bytes we need to transfer to / from the stream's DMA per iteration.
          * This is bound to the device's Hz rate and thus to the (virtual) timing the device expects. */
-        pStream->State.cbTransferChunk = (pStream->State.Cfg.Props.uHz / pThis->u16TimerHz) * HDA_FRAME_SIZE;
+        pStream->State.cbTransferChunk = (pStream->State.Cfg.Props.uHz / pThis->u16TimerHz) * pStream->State.cbFrameSize;
         Assert(pStream->State.cbTransferChunk);
-        Assert(pStream->State.cbTransferChunk % HDA_FRAME_SIZE == 0);
+        Assert(pStream->State.cbTransferChunk % pStream->State.cbFrameSize == 0);
 
         /* Make sure that the transfer chunk does not exceed the overall transfer size. */
@@ -303 +303 @@
 #ifdef VBOX_WITH_INTEL_HDA
                 /* Intel ICH / PCH: 1 frame. */
-                if (BDLE.Desc.u32BufSize == 1 * HDA_FRAME_SIZE)
+                if (BDLE.Desc.u32BufSize == 1 * pStream->State.cbFrameSize)
                 {
                     cfPosAdjust = 1;
                 }
                 /* Intel Baytrail / Braswell: 32 frames. */
-                else if (BDLE.Desc.u32BufSize == 32 * HDA_FRAME_SIZE)
+                else if (BDLE.Desc.u32BufSize == 32 * pStream->State.cbFrameSize)
                 {
                     cfPosAdjust = 32;
@@ -328 +328 @@
 
         LogFunc(("[SD%RU8] cfPosAdjust=%RU32\n", pStream->u8SD, cfPosAdjust));
+
+        /* Make sure to also update the stream's DMA counter (based on its current LPIB value). */
+        hdaStreamSetPosition(pStream, HDA_STREAM_REG(pThis, LPIB, pStream->u8SD));
 
 #ifdef LOG_ENABLED
@@ -492 +495 @@
     AssertPtrReturnVoid(pStream);
 
-    Assert(u32LPIB % HDA_FRAME_SIZE == 0);
+    Assert(u32LPIB % pStream->State.cbFrameSize == 0);
 
     Log3Func(("[SD%RU8] LPIB=%RU32 (DMA Position Buffer Enabled: %RTbool)\n",
@@ -811 +814 @@
     uint32_t cbProcessed = 0;
     uint32_t cbLeft      = cbToProcess;
-    Assert(cbLeft % HDA_FRAME_SIZE == 0);
+    Assert(cbLeft % pStream->State.cbFrameSize == 0);
 
     uint8_t abChunk[HDA_FIFO_MAX + 1];
@@ -825 +828 @@
          * make sure that we process them first as a whole. */
         if (pStream->State.cPosAdjustFramesLeft)
-            cbChunk = RT_MIN(cbChunk, uint32_t(pStream->State.cPosAdjustFramesLeft * HDA_FRAME_SIZE));
+            cbChunk = RT_MIN(cbChunk, uint32_t(pStream->State.cPosAdjustFramesLeft * pStream->State.cbFrameSize));
 
         Log3Func(("[SD%RU8] cbChunk=%RU32, cPosAdjustFramesLeft=%RU16\n",
@@ -843 +846 @@
             uint32_t cbDMAToWrite = cbChunk;
 
+            /** @todo Do we need interleaving streams support here as well?
+             *        Never saw anything else besides mono/stereo mics (yet). */
             while (cbDMAToWrite)
             {
@@ -893 +898 @@
                 }
 
+#ifndef VBOX_WITH_HDA_AUDIO_INTERLEAVING_STREAMS_SUPPORT
+                /**
+                 * The following code extracts the required audio stream (channel) data
+                 * of non-interleaved  *and* interleaved audio streams.
+                 *
+                 * We by default only support 2 channels with 16-bit samples (HDA_FRAME_SIZE),
+                 * but an HDA audio stream can have interleaved audio data of multiple audio
+                 * channels in such a single stream ("AA,AA,AA vs. AA,BB,AA,BB").
+                 *
+                 * So take this into account by just handling the first channel in such a stream ("A")
+                 * and just discard the other channel's data.
+                 */
                 while (cbDMALeft)
                 {
                     void *pvBuf; size_t cbBuf;
-                    RTCircBufAcquireWriteBlock(pCircBuf, cbDMALeft, &pvBuf, &cbBuf);
+                    RTCircBufAcquireWriteBlock(pCircBuf, HDA_FRAME_SIZE, &pvBuf, &cbBuf);
 
                     if (cbBuf)
@@ -903 +920 @@
                     RTCircBufReleaseWriteBlock(pCircBuf, cbBuf);
 
-                    cbDMALeft    -= (uint32_t)cbBuf;
-                    cbDMAWritten += (uint32_t)cbBuf;
+                    cbDMALeft    -= (uint32_t)pStream->State.cbFrameSize;
+                    cbDMAWritten += (uint32_t)pStream->State.cbFrameSize;
                 }
+#else
+                /** @todo This needs making use of HDAStreamMap + HDAStreamChannel. */
+# error "Implement reading interleaving streams support here."
+#endif
             }
             else
@@ -918 +939 @@
         if (cbDMA)
         {
-            Assert(cbDMA % HDA_FRAME_SIZE == 0);
+            Assert(cbDMA % pStream->State.cbFrameSize == 0);
 
             /* We always increment the position of DMA buffer counter because we're always reading
@@ -985 +1006 @@
 
         /* Do the position adjustment accounting. */
-        pStream->State.cPosAdjustFramesLeft -= RT_MIN(pStream->State.cPosAdjustFramesLeft, cbDMA / HDA_FRAME_SIZE);
+        pStream->State.cPosAdjustFramesLeft -= RT_MIN(pStream->State.cPosAdjustFramesLeft, cbDMA / pStream->State.cbFrameSize);
 
         if (RT_FAILURE(rc))
@@ -995 +1016 @@
 
     /* Sanity. */
-    Assert(cbProcessed % HDA_FRAME_SIZE == 0);
+    Assert(cbProcessed % pStream->State.cbFrameSize == 0);
     Assert(cbProcessed == cbToProcess);
     Assert(cbLeft      == 0);
@@ -1003 +1024 @@
     if (pStream->State.cPosAdjustFramesLeft == 0)
     {
-        hdaStreamPeriodInc(pPeriod, RT_MIN(cbProcessed / HDA_FRAME_SIZE, hdaStreamPeriodGetRemainingFrames(pPeriod)));
+        hdaStreamPeriodInc(pPeriod, RT_MIN(cbProcessed / pStream->State.cbFrameSize, hdaStreamPeriodGetRemainingFrames(pPeriod)));
 
         pStream->State.cbTransferProcessed += cbProcessed;
@@ -1032 +1053 @@
         const bool fWalClkSet = hdaWalClkSet(pThis,
                                                hdaWalClkGetCurrent(pThis)
-                                             + hdaStreamPeriodFramesToWalClk(pPeriod, pStream->State.cbTransferProcessed / HDA_FRAME_SIZE),
+                                             + hdaStreamPeriodFramesToWalClk(pPeriod, pStream->State.cbTransferProcessed / pStream->State.cbFrameSize),
                                              false /* fForce */);
         RT_NOREF(fWalClkSet);
@@ -1078 +1099 @@
         tsTransferNext = tsNow + (cbTransferNext * pStream->State.cTicksPerByte);
 
-        /** 
+        /**
          * If the current transfer is complete, reset our counter.
-         *  
+         *
          * This can happen for examlpe if the guest OS (like macOS) sets up
          * big BDLEs without IOC bits set (but for the last one) and the
-         * transfer is complete before we reach such a BDL entry. 
-         */ 
+         * transfer is complete before we reach such a BDL entry.
+         */
         if (fTransferComplete)
             pStream->State.cbTransferProcessed = 0;

trunk/src/VBox/Devices/Audio/HDAStream.h

@@ -148 +148 @@
      *  BDLE interrupt-on-completion (IOC) bits set. */
     uint8_t                 cTransferPendingInterrupts;
-    uint8_t                 Padding1[4];
+    /** The stream's current audio frame size (in bytes). */
+    uint32_t                cbFrameSize;
     /** How many audio data frames are left to be processed
      *  for the position adjustment handling.