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

Timestamp:

May 15, 2020 6:30:29 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Bits.

File:

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

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

@@ -2637 +2637 @@
 
 /**
- * Halts command processing.
- *
- * @param   pDevIns     The IOMMU device instance.
- */
-static void iommuAmdHaltCmdProcessing(PPDMDEVINS pDevIns)
-{
-    IOMMU_ASSERT_LOCKED(pDevIns);
-
-    PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
-    ASMAtomicAndU64(&pThis->Status.u64, ~IOMMU_STATUS_CMD_BUF_RUNNING);
-}
-
-
-/**
  * Wakes up the command thread if there are commands to be processed or if
  * processing is requested to be stopped by software.
@@ -3710 +3696 @@
     AssertCompile(sizeof(EVT_GENERIC_T) == sizeof(EVT_CMD_HW_ERR_T));
     PCEVT_GENERIC_T pEvent = (PCEVT_GENERIC_T)pEvtCmdHwErr;
+    PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
 
     IOMMU_LOCK_NORET(pDevIns);
@@ -3715 +3702 @@
     iommuAmdSetHwError(pDevIns, (PCEVT_GENERIC_T)pEvent);
     iommuAmdWriteEvtLogEntry(pDevIns, (PCEVT_GENERIC_T)pEvent);
-    iommuAmdHaltCmdProcessing(pDevIns);
+    ASMAtomicAndU64(&pThis->Status.u64, ~IOMMU_STATUS_CMD_BUF_RUNNING);
 
     IOMMU_UNLOCK(pDevIns);
@@ -3804 +3791 @@
     AssertCompile(sizeof(EVT_GENERIC_T) == sizeof(EVT_ILLEGAL_DTE_T));
     PCEVT_GENERIC_T pEvent = (PCEVT_GENERIC_T)pEvtIllegalCmd;
+    PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
 
     IOMMU_LOCK_NORET(pDevIns);
 
     iommuAmdWriteEvtLogEntry(pDevIns, pEvent);
-    iommuAmdHaltCmdProcessing(pDevIns);
+    ASMAtomicAndU64(&pThis->Status.u64, ~IOMMU_STATUS_CMD_BUF_RUNNING);
 
     IOMMU_UNLOCK(pDevIns);
@@ -4768 +4756 @@
 
         IOMMU_STATUS_T const Status = iommuAmdGetStatus(pThis);
-        if (Status.u64 & IOMMU_STATUS_CMD_BUF_RUNNING)
+        if (Status.n.u1CmdBufRunning)
         {
             /* Get the offset we need to read the command from memory (circular buffer offset). */