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

Timestamp:

Nov 9, 2010 8:08:18 AM (14 years ago)

Author:

vboxsync

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

67529

Message:

Audio/HDA: clean up of Immediate Command processing.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (5 diffs)

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

@@ -433 +433 @@
 DECLCALLBACK(int)hdaRegWriteRIRBSTS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
 DECLCALLBACK(int)hdaRegWriteIRS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
+DECLCALLBACK(int)hdaRegReadIRS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value);
 DECLCALLBACK(int)hdaRegWriteSDCTL(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
 DECLCALLBACK(int)hdaRegReadSDCTL(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value);
@@ -506 +507 @@
     { 0x00060, 0x00004, 0xFFFFFFFF, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteU32          , "IC"        , "Immediate Command" },
     { 0x00064, 0x00004, 0x00000000, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteUnimplemented, "IR"        , "Immediate Response" },
-    { 0x00068, 0x00004, 0x00000002, 0x00000002, hdaRegReadU16          , hdaRegWriteIRS          , "IRS"       , "Immediate Command Status" },
+    { 0x00068, 0x00004, 0x00000002, 0x00000002, hdaRegReadIRS          , hdaRegWriteIRS          , "IRS"       , "Immediate Command Status" },
     { 0x00070, 0x00004, 0xFFFFFFFF, 0xFFFFFF81, hdaRegReadU32          , hdaRegWriteBase         , "DPLBASE"   , "DMA Position Lower Base" },
     { 0x00074, 0x00004, 0xFFFFFFFF, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteBase         , "DPUBASE"   , "DMA Position Upper Base" },
@@ -1057 +1058 @@
 }
 
+DECLCALLBACK(int)hdaRegReadIRS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value)
+{
+    int rc = VINF_SUCCESS;
+    /* regarding 3.4.3 we should mark IRS as busy in case CORB is active */
+    if (   CORBWP(pState) != CORBRP(pState)
+        || HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA))
+        IRS(pState) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
+
+    rc = hdaRegReadU32(pState, offset, index, pu32Value);
+    return rc;
+}
+
 DECLCALLBACK(int)hdaRegWriteIRS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value)
 {
@@ -1062 +1075 @@
     uint64_t resp;
     PFNCODECVERBPROCESSOR pfn = (PFNCODECVERBPROCESSOR)NULL;
+    /*
+     * if guest set ICB bit of IRS register HDA should process verb in IC register and
+     * writes response in IR register and set IRV (valid in case of success) bit of IRS register.
+     */
     if (   u32Value & HDA_REG_FIELD_FLAG_MASK(IRS, ICB)
         && !IRS_ICB(pState))
     {
         uint32_t cmd = IC(pState);
+        if (CORBWP(pState) != CORBRP(pState))
+        {
+            /*
+             * 3.4.3 defines behaviour of immediate Command status register.
+             */
+            LogRel(("hda: guest has tried process immediate verb (%x) with active CORB\n", cmd));
+            return rc;
+        }
         IRS(pState) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
         Log(("hda: IC:%x\n", cmd));
@@ -1076 +1101 @@
         IR(pState) = (uint32_t)resp;
         Log(("hda: IR:%x\n", IR(pState)));
-        IRS(pState) = HDA_REG_FIELD_FLAG_MASK(IRS, IRV);  /* clear busy, result is ready  */
+        IRS(pState) = HDA_REG_FIELD_FLAG_MASK(IRS, IRV);  /* result is ready  */
+        IRS(pState) &= ~HDA_REG_FIELD_FLAG_MASK(IRS, ICB); /* busy is clear */
         return rc;
     }
+    /*
+     * when guest's read the response it should clean the IRV bit of the IRS register.
+     */
     if (   u32Value & HDA_REG_FIELD_FLAG_MASK(IRS, IRV)
         && IRS_IRV(pState))
-        IRS(pState) ^= HDA_REG_FIELD_FLAG_MASK(IRS, IRV);
+        IRS(pState) &= ~HDA_REG_FIELD_FLAG_MASK(IRS, IRV);
     return rc;
 }