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

Timestamp:

Jan 2, 2018 4:21:53 PM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Do not count transfer fragment in hdaStreamInit() if a fragment is part of the position adjustment the guest set up (like newer Ubuntu guests).

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (6 diffs)

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

@@ -1560 +1560 @@
         pStream->State.tsTransferNext      = tsNow + cTicksToNext;
 
-        Assert(pStream->State.cTransferPendingInterrupts);
         if (pStream->State.cTransferPendingInterrupts)
             pStream->State.cTransferPendingInterrupts--;

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

@@ -243 +243 @@
                     pThis->u16TimerHz, pStream->State.Cfg.Props.uHz));
 
+        /* Figure out how many transfer fragments we're going to use for this stream. */
         /** @todo Use a more dynamic fragment size? */
         Assert(pStream->u16LVI <= UINT8_MAX - 1);
@@ -249 +250 @@
             cFragments = 2; /* At least two fragments (BDLEs) must be present. */
 
-        /* Calculate the fragment size the guest OS expects interrupt delivery at. */
-        pStream->State.cbTransferSize = pStream->u32CBL / cFragments;
-        Assert(pStream->State.cbTransferSize);
-        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) * pStream->State.cbFrameSize;
-        Assert(pStream->State.cbTransferChunk);
-        Assert(pStream->State.cbTransferChunk % pStream->State.cbFrameSize == 0);
-
-        /* Make sure that the transfer chunk does not exceed the overall transfer size. */
-        if (pStream->State.cbTransferChunk > pStream->State.cbTransferSize)
-            pStream->State.cbTransferChunk = pStream->State.cbTransferSize;
-
-        pStream->State.cbTransferProcessed        = 0;
-        pStream->State.cTransferPendingInterrupts = 0;
-
-        const uint64_t cTicksPerHz = TMTimerGetFreq(pThis->pTimer) / pThis->u16TimerHz;
-
-        /* Calculate the timer ticks per byte for this stream. */
-        pStream->State.cTicksPerByte = cTicksPerHz / pStream->State.cbTransferChunk;
-        Assert(pStream->State.cTicksPerByte);
-
-        /* Calculate timer ticks per transfer. */
-        pStream->State.cTransferTicks     = pStream->State.cbTransferChunk * pStream->State.cTicksPerByte;
-
-        /* Initialize the transfer timestamps. */
-        pStream->State.tsTransferLast     = 0;
-        pStream->State.tsTransferNext     = 0;
-
-        LogFunc(("[SD%RU8] Timer %uHz (%RU64 ticks per Hz), cTicksPerByte=%RU64, cbTransferChunk=%RU32, cTransferTicks=%RU64, " \
-                 "cbTransferSize=%RU32\n",
-                 pStream->u8SD, pThis->u16TimerHz, cTicksPerHz, pStream->State.cTicksPerByte,
-                 pStream->State.cbTransferChunk, pStream->State.cTransferTicks, pStream->State.cbTransferSize));
         /*
          * Handle the stream's position adjustment.
@@ -289 +255 @@
         uint32_t cfPosAdjust = 0;
 
+        LogFunc(("[SD%RU8] fPosAdjustEnabled=%RTbool, cPosAdjustFrames=%RU16\n",
+                 pStream->u8SD, pThis->fPosAdjustEnabled, pThis->cPosAdjustFrames));
+
         if (pThis->fPosAdjustEnabled) /* Is the position adjustment enabled at all? */
         {
+            HDABDLE BDLE;
+            RT_ZERO(BDLE);
+
+            Assert(pStream->u64BDLBase);
+
+            int rc2 = hdaBDLEFetch(pThis, &BDLE, pStream->u64BDLBase, 0 /* Entry */);
+            AssertRC(rc2);
+
+            Assert(BDLE.Desc.u32BufSize % pStream->State.cbFrameSize == 0);
+
             /* If no custom set position adjustment is set, apply some
              * simple heuristics to detect the appropriate position adjustment. */
-            if (   pStream->u64BDLBase
-                && !pThis->cPosAdjustFrames)
+            if (   !pThis->cPosAdjustFrames
+            /* Position adjustmenet buffer *must* have the IOC bit set! */
+                && hdaBDLENeedsInterrupt(&BDLE))
             {
-                HDABDLE BDLE;
-                int rc2 = hdaBDLEFetch(pThis, &BDLE, pStream->u64BDLBase, 0 /* Entry */);
-                AssertRC(rc2);
-
                 /** @todo Implement / use a (dynamic) table once this gets more complicated. */
-
 #ifdef VBOX_WITH_INTEL_HDA
                 /* Intel ICH / PCH: 1 frame. */
@@ -313 +288 @@
                     cfPosAdjust = 32;
                 }
-                else
 #endif
-                    cfPosAdjust = pThis->cPosAdjustFrames;
             }
             else /* Go with the set default. */
@@ -322 +295 @@
             if (cfPosAdjust)
             {
+                /* Also adjust the number of fragments, as the position adjustment buffer
+                 * does not count as an own fragment as such.
+                 *
+                 * This e.g. can happen on (newer) Ubuntu guests which use
+                 * 4 (IOC) + 4408 (IOC) + 4408 (IOC) + 4408 (IOC) + 4404 (= 17632) bytes,
+                 * where the first buffer (4) is used as position adjustment.
+                 *
+                 * Only skip a fragment if the whole buffer fragment is used for
+                 * position adjustment.
+                 */
+                if (   (cfPosAdjust * pStream->State.cbFrameSize) == BDLE.Desc.u32BufSize
+                    && cFragments)
+                {
+                    cFragments--;
+                }
+
                 /* Initialize position adjustment counter. */
                 pStream->State.cPosAdjustFramesLeft = cfPosAdjust;
@@ -328 +317 @@
         }
 
-        LogFunc(("[SD%RU8] cfPosAdjust=%RU32\n", pStream->u8SD, cfPosAdjust));
+        LogFunc(("[SD%RU8] cfPosAdjust=%RU32, cFragments=%RU8\n", pStream->u8SD, cfPosAdjust, cFragments));
+
+        /*
+         * Set up data transfer transfer stuff.
+         */
+
+        /* Calculate the fragment size the guest OS expects interrupt delivery at. */
+        pStream->State.cbTransferSize = pStream->u32CBL / cFragments;
+        Assert(pStream->State.cbTransferSize);
+        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) * pStream->State.cbFrameSize;
+        Assert(pStream->State.cbTransferChunk);
+        Assert(pStream->State.cbTransferChunk % pStream->State.cbFrameSize == 0);
+
+        /* Make sure that the transfer chunk does not exceed the overall transfer size. */
+        if (pStream->State.cbTransferChunk > pStream->State.cbTransferSize)
+            pStream->State.cbTransferChunk = pStream->State.cbTransferSize;
+
+        pStream->State.cbTransferProcessed        = 0;
+        pStream->State.cTransferPendingInterrupts = 0;
+
+        const uint64_t cTicksPerHz = TMTimerGetFreq(pThis->pTimer) / pThis->u16TimerHz;
+
+        /* Calculate the timer ticks per byte for this stream. */
+        pStream->State.cTicksPerByte = cTicksPerHz / pStream->State.cbTransferChunk;
+        Assert(pStream->State.cTicksPerByte);
+
+        /* Calculate timer ticks per transfer. */
+        pStream->State.cTransferTicks     = pStream->State.cbTransferChunk * pStream->State.cTicksPerByte;
+
+        /* Initialize the transfer timestamps. */
+        pStream->State.tsTransferLast     = 0;
+        pStream->State.tsTransferNext     = 0;
+
+        LogFunc(("[SD%RU8] Timer %uHz (%RU64 ticks per Hz), cTicksPerByte=%RU64, cbTransferChunk=%RU32, cTransferTicks=%RU64, " \
+                 "cbTransferSize=%RU32\n",
+                 pStream->u8SD, pThis->u16TimerHz, cTicksPerHz, pStream->State.cTicksPerByte,
+                 pStream->State.cbTransferChunk, pStream->State.cTransferTicks, pStream->State.cbTransferSize));
 
         /* Make sure to also update the stream's DMA counter (based on its current LPIB value). */