Changeset 62612 in vbox for trunk

Timestamp:

Jul 27, 2016 8:11:53 PM (8 years ago)

Author:

vboxsync

Message:

DevIchHda: Need to call hdaRegWriteSDUnlock in hdaRegWriteSDFMT when hdaRegWriteSDLock succeeds, it's not cool to skip it if any of the operations mysteriously fails.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (16 diffs)

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

@@ -883 +883 @@
 static FNPDMDEVRESET hdaReset;
 
-/*
- * Stubs.
+/** @name Register read/write stubs.
+ * @{
  */
 static int hdaRegReadUnimpl(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
 static int hdaRegWriteUnimpl(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
-
-/*
- * Global register set read/write functions.
+/** @} */
+
+/** @name Global register set read/write functions.
+ * @{
  */
 static int hdaRegWriteGCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
@@ -909 +910 @@
 static int hdaRegReadIRS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
 static int hdaRegWriteBase(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
-
-/*
- * {IOB}SDn read/write functions.
+/** @} */
+
+/** @name {IOB}SDn write functions.
+ * @{
  */
 static int       hdaRegWriteSDCBL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
@@ -922 +924 @@
 static int       hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
 static int       hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
+/** @} */
+
+/* Locking + logging. */
 DECLINLINE(int)  hdaRegWriteSDLock(PHDASTATE pThis, PHDASTREAM pStream, uint32_t iReg, uint32_t u32Value);
 DECLINLINE(void) hdaRegWriteSDUnlock(PHDASTREAM pStream);
 
-/*
- * Generic register read/write functions.
+/** @name Generic register read/write functions.
+ * @{
  */
 static int hdaRegReadU32(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
@@ -936 +941 @@
 static int hdaRegReadU8(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
 static int hdaRegWriteU8(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
+/** @} */
 
 #ifdef IN_RING3
@@ -1397 +1403 @@
  *
  * @returns Register index on success, -1 if not found.
- * @param   pThis               The HDA device state.
  * @param   offReg              The register offset.
  */
-static int hdaRegLookup(PHDASTATE pThis, uint32_t offReg)
+static int hdaRegLookup(uint32_t offReg)
 {
     /*
@@ -1449 +1454 @@
  *
  * @returns Register index on success, -1 if not found.
- * @param   pThis               The HDA device state.
  * @param   offReg              The register offset.
  */
-static int hdaRegLookupWithin(PHDASTATE pThis, uint32_t offReg)
+static int hdaRegLookupWithin(uint32_t offReg)
 {
     /*
@@ -2790 +2794 @@
     }
 
-    rc = hdaRegWriteSDLock(pThis, pStream, iReg, u32Value);
-    AssertRC(rc);
+    int rcSem = hdaRegWriteSDLock(pThis, pStream, iReg, u32Value);
+    AssertRC(rcSem);
 
     LogFunc(("[SD%RU8]: Hz=%RU32, Channels=%RU8, enmFmt=%RU32\n",
@@ -2801 +2805 @@
     {
         case PDMAUDIODIR_IN:
-#ifdef VBOX_WITH_HDA_MIC_IN
-# error "Implement me!"
-#else
+# ifdef VBOX_WITH_HDA_MIC_IN
+#  error "Implement me!"
+# else
             strmCfg.DestSource.Source = PDMAUDIORECSOURCE_LINE;
             RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Line In");
-#endif
+# endif
             break;
 
@@ -2835 +2839 @@
     if (RT_SUCCESS(rc))
     {
-        int rc2;
         PHDADRIVER pDrv;
         RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
         {
+            int rc2;
             switch (strmCfg.enmDir)
             {
@@ -2873 +2877 @@
         else
             LogFunc(("[SD%RU8]: (Re-)Opening stream failed with rc=%Rrc\n", pStream->u8SD, rc));
-
+    }
+
+    if (RT_SUCCESS(rcSem))
         hdaRegWriteSDUnlock(pStream);
-    }
 
     return VINF_SUCCESS; /* Never return failure. */
@@ -2933 +2938 @@
  * XXX
  *
- * @return  bool                Returns @true if write is allowed, @false if not.
+ * @return  VBox status code.  ALL THE CALLERS IGNORES THIS. DUH.
+ *
  * @param   pThis               Pointer to HDA state.
- * @param   iReg                Register to write.
- * @param   u32Value            Value to write.
+ * @param   iReg                Register to write (logging only).
+ * @param   u32Value            Value to write (logging only).
  */
 DECLINLINE(int) hdaRegWriteSDLock(PHDASTATE pThis, PHDASTREAM pStream, uint32_t iReg, uint32_t u32Value)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    AssertPtr(pThis);   /* don't bother returning errors */
+    AssertPtr(pStream);
 
 #ifdef VBOX_STRICT
@@ -2958 +2964 @@
 #endif
 
+    /** @todo r=bird: Why on EARTH are we using mutexes?  USE CRITICAL SECTIONS!! */
     return RTSemMutexRequest(pStream->State.hMtx, RT_INDEFINITE_WAIT);
 }
@@ -4472 +4479 @@
      */
     uint32_t        offReg = GCPhysAddr - pThis->MMIOBaseAddr;
-    int             idxRegDsc = hdaRegLookup(pThis, offReg);    /* Register descriptor index. */
+    int             idxRegDsc = hdaRegLookup(offReg);    /* Register descriptor index. */
 #ifdef LOG_ENABLED
     unsigned const  cbLog     = cb;
@@ -4589 +4596 @@
      */
     uint32_t    offReg = GCPhysAddr - pThis->MMIOBaseAddr;
-    int         idxRegDsc = hdaRegLookup(pThis, offReg);
+    int         idxRegDsc = hdaRegLookup(offReg);
     uint32_t    idxRegMem = idxRegDsc != -1 ? g_aHdaRegMap[idxRegDsc].mem_idx : UINT32_MAX;
     uint64_t    u64Value;
@@ -4636 +4643 @@
          * shifting out input values.
          */
-        if (idxRegDsc == -1 && (idxRegDsc = hdaRegLookupWithin(pThis, offReg)) != -1)
+        if (idxRegDsc == -1 && (idxRegDsc = hdaRegLookupWithin(offReg)) != -1)
         {
             uint32_t const cbBefore = offReg - g_aHdaRegMap[idxRegDsc].offset; Assert(cbBefore > 0 && cbBefore < 4);
@@ -4683 +4690 @@
             u64Value >>= cbReg * 8;
             if (idxRegDsc == -1)
-                idxRegDsc = hdaRegLookup(pThis, offReg);
+                idxRegDsc = hdaRegLookup(offReg);
             else
             {