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

Timestamp:

Mar 18, 2021 2:21:20 PM (4 years ago)

Author:

vboxsync

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

143351

Message:

DevHDA: Reset while running fix. A few todos. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -1374 +1374 @@
     if (fInReset)
     {
-        Assert(!fReset);
-        Assert(!fInRun && !fRun);
+        ASSERT_GUEST(!fReset);
+        ASSERT_GUEST(!fInRun && !fRun);
 
         /* Exit reset state. */
@@ -1388 +1388 @@
     {
         /* ICH6 datasheet 18.2.33 says that RUN bit should be cleared before initiation of reset. */
-        Assert(!fInRun && !fRun);
+        ASSERT_GUEST(!fInRun && !fRun);
 
         LogFunc(("[SD%RU8] Reset enter\n", uSD));
@@ -1397 +1397 @@
         hdaR3StreamAsyncIOLock(pStreamR3);
 # endif
+        /* Deal with reset while running. */
+        if (pStreamShared->State.fRunning)
+        {
+            hdaR3StreamEnable(pStreamShared, pStreamR3, false /* fEnable */);
+            ASMAtomicWriteBool(&pStreamShared->State.fRunning, false);
+            if (pThisCC->cStreamsActive > 0)
+                pThisCC->cStreamsActive++;
+        }
+
         /* Make sure to remove the run bit before doing the actual stream reset. */
         HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_RUN;
-
         hdaR3StreamReset(pThis, pThisCC, pStreamShared, pStreamR3, uSD);
 
@@ -1414 +1422 @@
         if (fInRun != fRun)
         {
-            Assert(!fReset && !fInReset);
+            Assert(!fReset && !fInReset); /* (code change paranoia, currently impossible ) */
             LogFunc(("[SD%RU8] State changed (fRun=%RTbool)\n", uSD, fRun));
 
@@ -1456 +1464 @@
                     /* Any vital stream change occurred so that we need to (re-)add the stream to our setup?
                      * Otherwise just skip this, as this costs a lot of performance. */
+                    /** @todo r=bird: hdaR3StreamSetUp does not return VINF_NO_CHANGE since r142810. */
                     && rc2 != VINF_NO_CHANGE)
                 {
@@ -2942 +2951 @@
     for (size_t idxStream = 0; idxStream < RT_ELEMENTS(pThis->aStreams); idxStream++)
     {
+/** @todo r=bird: insufficient locking here, I think... May race stream timer
+ *        and AIO threads. We should probably do this a lot earlier too. */
         int rc2 = hdaR3StreamEnable(&pThis->aStreams[idxStream], &pThisCC->aStreams[idxStream], false /* fEnable */);
         if (RT_SUCCESS(rc2))

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

@@ -231 +231 @@
     /** Mapping table between stream tags and stream states. */
     HDATAG                  aTags[HDA_MAX_TAGS];
-    /** Number of active (running) SDn streams. */
+    /** Number of active (running) SDn streams.
+     * @todo pointless, not used for anything at all.  */
     uint8_t                 cStreamsActive;
     uint8_t                 abPadding0[7];