Changeset 88572 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Apr 16, 2021 7:30:00 PM (4 years ago)

Author:

vboxsync

Message:

DevHda: Set the FIFORDY bit when a stream is enabled and clear it when the stream is disabled. This should help Linux guests waste less time reading the STS bit when starting playback or recording. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (5 diffs)
• DevHdaStream.cpp (modified) (6 diffs)
• DevHdaStream.h (modified) (1 diff)

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

@@ -1301 +1301 @@
         if (pStreamShared->State.fRunning)
         {
-            int rc2 = hdaR3StreamEnable(pStreamShared, pStreamR3, false /* fEnable */);
+            int rc2 = hdaR3StreamEnable(pThis, pStreamShared, pStreamR3, false /* fEnable */);
             AssertRC(rc2); Assert(!pStreamShared->State.fRunning);
             pStreamShared->State.fRunning = false;
@@ -1380 +1380 @@
             {
                 /* Enable/disable the stream. */
-                rc2 = hdaR3StreamEnable(pStreamShared, pStreamR3, fRun /* fEnable */);
+                rc2 = hdaR3StreamEnable(pThis, pStreamShared, pStreamR3, fRun /* fEnable */);
                 AssertRC(rc2);
 
@@ -2518 +2518 @@
             /* Only disable the stream if the stream descriptor # has changed. */
             if (pSink->pStreamShared->u8SD != uSD)
-                hdaR3StreamEnable(pSink->pStreamShared, pSink->pStreamR3, false /*fEnable*/);
+                hdaR3StreamEnable(pThis, pSink->pStreamShared, pSink->pStreamR3, false /*fEnable*/);
 
             pSink->pStreamR3->pMixSink = NULL;
@@ -2766 +2766 @@
 
         /* We're doing this unconditionally, hope that's not problematic in any way... */
-        int rc = hdaR3StreamEnable(pStreamShared, &pThisCC->aStreams[idxStream], false /* fEnable */);
+        int rc = hdaR3StreamEnable(pThis, pStreamShared, &pThisCC->aStreams[idxStream], false /* fEnable */);
         AssertLogRelMsg(RT_SUCCESS(rc) && !pStreamShared->State.fRunning,
                         ("Disabling stream #%u failed: %Rrc, fRunning=%d\n", idxStream, rc, pStreamShared->State.fRunning));
@@ -3474 +3474 @@
 #endif
             /* (Re-)enable the stream. */
-            rc2 = hdaR3StreamEnable(pStreamShared, pStreamR3, true /* fEnable */);
+            rc2 = hdaR3StreamEnable(pThis, pStreamShared, pStreamR3, true /* fEnable */);
             AssertRC(rc2);
 

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

@@ -885 +885 @@
  *
  * @returns VBox status code.
+ * @param   pThis               The shared HDA device state.
  * @param   pStreamShared       HDA stream to enable or disable - shared bits.
  * @param   pStreamR3           HDA stream to enable or disable - ring-3 bits.
  * @param   fEnable             Whether to enable or disble the stream.
  */
-int hdaR3StreamEnable(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, bool fEnable)
+int hdaR3StreamEnable(PHDASTATE pThis, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, bool fEnable)
 {
     AssertPtr(pStreamR3);
@@ -942 +943 @@
             pStreamShared->State.tsTransferLast = 0; /* Make sure it's not stale and messes up WALCLK calculations. */
         pStreamShared->State.fRunning = fEnable;
+
+        /*
+         * Set the FIFORDY bit when we start running and clear it when stopping.
+         *
+         * This prevents Linux from timing out in snd_hdac_stream_sync when starting
+         * a stream.  Technically, Linux also uses the SSYNC feature there, but we
+         * can get away with just setting the FIFORDY bit for now.
+         */
+        if (fEnable)
+            HDA_STREAM_REG(pThis, STS, pStreamShared->u8SD) |= HDA_SDSTS_FIFORDY;
+        else
+            HDA_STREAM_REG(pThis, STS, pStreamShared->u8SD) &= ~HDA_SDSTS_FIFORDY;
     }
 
@@ -1204 +1217 @@
     pStreamShared->State.tsLastTransferNs = tsNowNs;
 
-    /*
-     * Set the FIFORDY bit on the stream while doing the transfer.
-     */
-    /** @todo r=bird: I don't get the HDA_SDSTS_FIFORDY logic.  Unless we're
-     *        assuming SMP guest and that it can get stream registers while we're
-     *        here.  Only it cannot do the later because we're sitting on the big
-     *        HDA device lock, see assertions in hdaR3Timer().  So, this is an
-     *        pointless guesture given that we clear it again after the loop. */
-    HDA_STREAM_REG(pThis, STS, uSD) |= HDA_SDSTS_FIFORDY;
-
     return true;
 }
@@ -1221 +1224 @@
  *
  * @param   pDevIns         The device instance.
- * @param   pThis           The shared HDA device state.
  * @param   pStreamShared   The HDA stream (shared).
  * @param   pStreamR3       The HDA stream (ring-3).
  */
-DECLINLINE(void) hdaR3StreamDoDmaEpilogue(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3)
-{
-    /*
-     * Clear the (pointless) FIFORDY bit again.
-     */
-    HDA_STREAM_REG(pThis, STS, pStreamShared->u8SD) &= ~HDA_SDSTS_FIFORDY;
-
+DECLINLINE(void) hdaR3StreamDoDmaEpilogue(PPDMDEVINS pDevIns, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3)
+{
     /*
      * We must update this in the epilogue rather than in the prologue
@@ -1525 +1522 @@
      * Common epilogue.
      */
-    hdaR3StreamDoDmaEpilogue(pDevIns, pThis, pStreamShared, pStreamR3);
+    hdaR3StreamDoDmaEpilogue(pDevIns, pStreamShared, pStreamR3);
 
     /*
@@ -1812 +1809 @@
      * Common epilogue.
      */
-    hdaR3StreamDoDmaEpilogue(pDevIns, pThis, pStreamShared, pStreamR3);
+    hdaR3StreamDoDmaEpilogue(pDevIns, pStreamShared, pStreamR3);
 
     /*

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

@@ -354 +354 @@
 void                hdaR3StreamReset(PHDASTATE pThis, PHDASTATER3 pThisCC,
                                      PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, uint8_t uSD);
-int                 hdaR3StreamEnable(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, bool fEnable);
+int                 hdaR3StreamEnable(PHDASTATE pThis, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, bool fEnable);
 void                hdaR3StreamMarkStarted(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStreamShared, uint64_t tsNow);
 void                hdaR3StreamMarkStopped(PHDASTREAM pStreamShared);