Changeset 86075 in vbox for trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp

Timestamp:

Sep 9, 2020 3:23:22 PM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Set the ComWaitInt bit in the Status register only when the COMPLETION_WAIT command requests it explicitly.

File:

• trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp

@@ -2818 +2818 @@
     IOMMU_ASSERT_NOT_LOCKED(pDevIns);
 
-    LogFlowFunc(("\n"));
-
     PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
     STAM_COUNTER_INC(&pThis->StatCmd);
@@ -2836 +2834 @@
             if (!(pCmdComWait->au64[0] & ~IOMMU_CMD_COM_WAIT_QWORD_0_VALID_MASK))
             {
-                /* If Completion Store is requested, write the StoreData to the specified address.*/
+                /* If Completion Store is requested, write the StoreData to the specified address. */
                 if (pCmdComWait->n.u1Store)
                 {
@@ -2851 +2849 @@
                 }
 
-                IOMMU_LOCK(pDevIns);
-
-                /* Indicate that this command has completed. */
-                ASMAtomicOrU64(&pThis->Status.u64, IOMMU_STATUS_COMPLETION_WAIT_INTR);
-
                 /* If the command requests an interrupt and completion wait interrupts are enabled, raise it. */
                 if (pCmdComWait->n.u1Interrupt)
                 {
+                    IOMMU_LOCK(pDevIns);
+                    ASMAtomicOrU64(&pThis->Status.u64, IOMMU_STATUS_COMPLETION_WAIT_INTR);
                     IOMMU_CTRL_T const Ctrl = iommuAmdGetCtrl(pThis);
-                    if (Ctrl.n.u1CompWaitIntrEn)
+                    bool const fRaiseInt = Ctrl.n.u1CompWaitIntrEn;
+                    IOMMU_UNLOCK(pDevIns);
+
+                    if (fRaiseInt)
                         iommuAmdRaiseMsiInterrupt(pDevIns);
                 }
 
-                IOMMU_UNLOCK(pDevIns);
                 return VINF_SUCCESS;
             }