Changeset 88503 in vbox

Timestamp:

Apr 14, 2021 11:43:28 AM (4 years ago)

Author:

vboxsync

Message:

DevHda: Just use the ring-3 task (hCorbDmaTask) when ring-0 needs to do CORB DMA stuff. The codec is not yet suitable from ring-0, nor does it see sufficient action to warrant putting it in ring-0, and this approach should unload the EMT a tiny bit more. bugref:9890

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevHda.cpp (modified) (10 diffs)
• Audio/DevHda.h (modified) (1 diff)
• Audio/DevHdaCodec.cpp (modified) (1 diff)
• Audio/DevHdaCodec.h (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

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

@@ -667 +667 @@
 #endif /* IN_RING3 */
 
+#ifdef IN_RING3 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
+
 /**
  * Synchronizes the CORB / RIRB buffers between internal <-> device state.
@@ -679 +681 @@
  * @todo r=andy Break this up into two functions?
  */
-static int hdaCmdSync(PPDMDEVINS pDevIns, PHDASTATE pThis, bool fLocal)
+static int hdaR3CmdSync(PPDMDEVINS pDevIns, PHDASTATE pThis, bool fLocal)
 {
     int rc = VINF_SUCCESS;
@@ -765 +767 @@
  * @param   pThisCC             The ring-0 HDA device state.
  */
-static int hdaCORBCmdProcess(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTATECC pThisCC)
+static int hdaR3CORBCmdProcess(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTATECC pThisCC)
 {
     Log3Func(("ENTER CORB(RP:%x, WP:%x) RIRBWP:%x\n", HDA_REG(pThis, CORBRP), HDA_REG(pThis, CORBWP), HDA_REG(pThis, RIRBWP)));
@@ -777 +779 @@
     Assert(pThis->cbCorbBuf);
 
-    int rc = hdaCmdSync(pDevIns, pThis, true /* Sync from guest */);
+    int rc = hdaR3CmdSync(pDevIns, pThis, true /* Sync from guest */);
     AssertRCReturn(rc, rc);
 
@@ -791 +793 @@
     uint8_t        corbRp       = HDA_REG(pThis, CORBRP);
     uint8_t        rirbWp       = HDA_REG(pThis, RIRBWP);
-
-#ifndef IN_RING3
-    /*
-     * Check t
-     */
-#endif
 
     /*
@@ -891 +887 @@
      * Write out the response.
      */
-    rc = hdaCmdSync(pDevIns, pThis, false /* Sync to guest */);
+    rc = hdaR3CmdSync(pDevIns, pThis, false /* Sync to guest */);
     AssertRC(rc);
 
     return rc;
 }
+
+#endif /* IN_RING3 - @bugref{9890c64} */
 
 #ifdef IN_RING3
@@ -909 +907 @@
 
     DEVHDA_LOCK(pDevIns, pThis);
-    hdaCORBCmdProcess(pDevIns, pThis, pThisCC);
+    hdaR3CORBCmdProcess(pDevIns, pThis, pThisCC);
     DEVHDA_UNLOCK(pDevIns, pThis);
 
@@ -1144 +1142 @@
 
     if (HDA_REG(pThis, CORBCTL) & HDA_CORBCTL_DMA) /* DMA engine started? */
-        rc = hdaCORBCmdProcess(pDevIns, pThis, PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATECC));
+    {
+#ifdef IN_RING3 /** @todo do PDMDevHlpTaskTrigger everywhere? */
+        rc = hdaR3CORBCmdProcess(pDevIns, pThis, PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATECC));
+#else
+        rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hCorbDmaTask);
+        if (rc != VINF_SUCCESS && RT_SUCCESS(rc))
+            rc = VINF_SUCCESS;
+#endif
+    }
     else
         LogFunc(("CORB DMA not running, skipping\n"));
@@ -1211 +1217 @@
     AssertRCSuccess(VBOXSTRICTRC_VAL(rc));
 
-    return hdaCORBCmdProcess(pDevIns, pThis, PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATECC));
+#ifdef IN_RING3 /** @todo do PDMDevHlpTaskTrigger everywhere? */
+    return hdaR3CORBCmdProcess(pDevIns, pThis, PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATECC));
+#else
+    rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hCorbDmaTask);
+    return RT_SUCCESS(rc) ? VINF_SUCCESS : rc;
+#endif
 }
 
@@ -5293 +5304 @@
     AssertRCReturn(rc, rc);
 
+# if 0 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
     /* Construct the R0 codec part. */
     rc = hdaR0CodecConstruct(pDevIns, &pThis->Codec, &pThisCC->Codec);
     AssertRCReturn(rc, rc);
+# else
+    RT_NOREF(pThisCC);
+# endif
 
     return VINF_SUCCESS;

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

@@ -219 +219 @@
 typedef struct HDASTATER0
 {
+# if 0 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
     /** Pointer to HDA codec to use. */
     HDACODECR0              Codec;
+# else
+    uint32_t                u32Dummy;
+# endif
 } HDASTATER0;
 /** Pointer to a ring-0 HDA device state.  */

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

@@ -2611 +2611 @@
      */
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatLookupsR3, STAMTYPE_COUNTER, "Codec/LookupsR0", STAMUNIT_OCCURENCES, "Number of R0 codecLookup calls");
+# if 0 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatLookupsR0, STAMTYPE_COUNTER, "Codec/LookupsR3", STAMUNIT_OCCURENCES, "Number of R3 codecLookup calls");
+# endif
 
     return rc;

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

@@ -862 +862 @@
     uint8_t    au8Reserveds[CODEC_NODES_MAX];
 
+    STAMCOUNTER StatLookupsR3;
+#if 0 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
     STAMCOUNTER StatLookupsR0;
-    STAMCOUNTER StatLookupsR3;
+#endif
 } HDACODEC;
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -1224 +1224 @@
         Audio/DevHda.cpp \
         Audio/DevHdaCommon.cpp \
-        Audio/DevHdaCodec.cpp \
         Audio/DevHdaStream.cpp \
         Audio/DevIchAc97.cpp