Changeset 88196 in vbox

Timestamp:

Mar 18, 2021 4:43:03 PM (4 years ago)

Author:

vboxsync

Message:

DevHDA: No need to clear HDA_SDCTL_RUN before calling hdaR3StreamReset. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (2 diffs)
• HDAStream.cpp (modified) (2 diffs)

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

@@ -1405 +1405 @@
         }
 
-        /* Make sure to remove the run bit before doing the actual stream reset. */
-        HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_RUN; /** @todo r=bird: Isn't this utterly pointless? */
         hdaR3StreamReset(pThis, pThisCC, pStreamShared, pStreamR3, uSD);
 
@@ -2877 +2875 @@
         pStreamShared->State.fRunning = false;
 
-        /* Remove the RUN bit from SDnCTL in case the stream was in a running state before. */
-        HDA_STREAM_REG(pThis, CTL, idxStream) &= ~HDA_SDCTL_RUN; /** @todo r=bird: Isn't this utterly pointless? */
         hdaR3StreamReset(pThis, pThisCC, pStreamShared, &pThisCC->aStreams[idxStream], (uint8_t)idxStream);
 

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

@@ -780 +780 @@
 void hdaR3StreamReset(PHDASTATE pThis, PHDASTATER3 pThisCC, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, uint8_t uSD)
 {
+    LogFunc(("[SD%RU8] Reset\n", uSD));
+
+    /*
+     * Assert some sanity.
+     */
     AssertPtr(pThis);
     AssertPtr(pStreamShared);
     AssertPtr(pStreamR3);
     Assert(uSD < HDA_MAX_STREAMS);
+    Assert(pStreamShared->u8SD == uSD);
+    Assert(pStreamR3->u8SD == uSD);
     AssertMsg(!pStreamShared->State.fRunning, ("[SD%RU8] Cannot reset stream while in running state\n", uSD));
-
-    LogFunc(("[SD%RU8] Reset\n", uSD));
 
     /*
@@ -801 +806 @@
     /* According to the ICH6 datasheet, 0x40000 is the default value for stream descriptor register 23:20
      * bits are reserved for stream number 18.2.33, resets SDnCTL except SRST bit. */
-    HDA_STREAM_REG(pThis, CTL,   uSD) = 0x40000 | (HDA_STREAM_REG(pThis, CTL, uSD) & HDA_SDCTL_SRST);
+    HDA_STREAM_REG(pThis, CTL,   uSD) = HDA_SDCTL_TP | (HDA_STREAM_REG(pThis, CTL, uSD) & HDA_SDCTL_SRST);
     /* ICH6 defines default values (120 bytes for input and 192 bytes for output descriptors) of FIFO size. 18.2.39. */
     HDA_STREAM_REG(pThis, FIFOS, uSD) = hdaGetDirFromSD(uSD) == PDMAUDIODIR_IN ? HDA_SDIFIFO_120B : HDA_SDOFIFO_192B;