Changeset 85988 in vbox for trunk/src

Timestamp:

Sep 2, 2020 7:12:44 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Fix bit transitions to enable command-buffer and event logging in the control register. Fixed assertion.
Enable bus master bit as the virtual IOMMU writes to guest memory.

File:

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

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

@@ -507 +507 @@
 
     PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
-    if (   !ASMAtomicXchgBool(&pThis->fCmdThreadSignaled, true)
-        &&  ASMAtomicReadBool(&pThis->fCmdThreadSleeping))
+    IOMMU_STATUS_T const Status = iommuAmdGetStatus(pThis);
+    if (Status.n.u1CmdBufRunning)
     {
         LogFlowFunc(("Signaling command thread\n"));
@@ -647 +647 @@
     ASMAtomicWriteU64(&pThis->Ctrl.u64, NewCtrl.u64);
 
+    bool const fNewIommuEn = NewCtrl.n.u1IommuEn;
+    bool const fOldIommuEn = OldCtrl.n.u1IommuEn;
+
     /* Enable or disable event logging when the bit transitions. */
-    bool const fNewIommuEn  = NewCtrl.n.u1IommuEn;
     bool const fOldEvtLogEn = OldCtrl.n.u1EvtLogEn;
     bool const fNewEvtLogEn = NewCtrl.n.u1EvtLogEn;
-    if (fOldEvtLogEn != fNewEvtLogEn)
+    if (   fOldEvtLogEn != fNewEvtLogEn
+        || fOldIommuEn != fNewIommuEn)
     {
         if (   fNewIommuEn
@@ -666 +669 @@
     bool const fOldCmdBufEn = OldCtrl.n.u1CmdBufEn;
     bool const fNewCmdBufEn = NewCtrl.n.u1CmdBufEn;
-    if (fOldCmdBufEn != fNewCmdBufEn)
-    {
-        if (   fNewIommuEn
-            && fNewCmdBufEn)
+    if (   fOldCmdBufEn != fNewCmdBufEn
+        || fOldIommuEn != fNewIommuEn)
+    {
+        if (   fNewCmdBufEn
+            && fNewIommuEn)
+        {
             ASMAtomicOrU64(&pThis->Status.u64, IOMMU_STATUS_CMD_BUF_RUNNING);
+            LogFunc(("Command buffer enabled\n"));
+
+            /* Wake up the command thread to start processing commands. */
+            iommuAmdCmdThreadWakeUpIfNeeded(pDevIns);
+        }
         else
+        {
             ASMAtomicAndU64(&pThis->Status.u64, ~IOMMU_STATUS_CMD_BUF_RUNNING);
-
-        /* Wake up the command thread to start or stop processing commands. */
-        iommuAmdCmdThreadWakeUpIfNeeded(pDevIns);
+            LogFunc(("Command buffer disabled\n"));
+        }
     }
 
@@ -1475 +1485 @@
         pThis->HwEvtHi.u64 = RT_MAKE_U64(pEvent->au32[0], pEvent->au32[1]);
         pThis->HwEvtLo     = RT_MAKE_U64(pEvent->au32[2], pEvent->au32[3]);
-        Assert(pThis->HwEvtHi.n.u4EvtCode == IOMMU_EVT_DEV_TAB_HW_ERROR);
+        Assert(   pThis->HwEvtHi.n.u4EvtCode == IOMMU_EVT_DEV_TAB_HW_ERROR
+               || pThis->HwEvtHi.n.u4EvtCode == IOMMU_EVT_PAGE_TAB_HW_ERROR
+               || pThis->HwEvtHi.n.u4EvtCode == IOMMU_EVT_COMMAND_HW_ERROR);
     }
 }
@@ -2771 +2783 @@
     IOMMU_ASSERT_NOT_LOCKED(pDevIns);
 
+    LogFlowFunc(("\n"));
+
     PIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
     uint8_t const bCmd = pCmd->n.u4Opcode;
@@ -2936 +2950 @@
         if (Status.n.u1CmdBufRunning)
         {
+            LogFlowFunc(("Command buffer running\n"));
+
             /* Get the offset we need to read the command from memory (circular buffer offset). */
             uint32_t const cbCmdBuf = iommuAmdGetTotalBufLength(pThis->CmdBufBaseAddr.n.u4Len);
@@ -3844 +3860 @@
     PDMPciDevSetVendorId(pPciDev,          IOMMU_PCI_VENDOR_ID);       /* AMD */
     PDMPciDevSetDeviceId(pPciDev,          IOMMU_PCI_DEVICE_ID);       /* VirtualBox IOMMU device */
-    PDMPciDevSetCommand(pPciDev,           0);                         /* Command */
+    PDMPciDevSetCommand(pPciDev,           VBOX_PCI_COMMAND_MASTER);   /* Enable bus master (as we write to main memory). */
     PDMPciDevSetStatus(pPciDev,            VBOX_PCI_STATUS_CAP_LIST);  /* Status - CapList supported */
     PDMPciDevSetRevisionId(pPciDev,        IOMMU_PCI_REVISION_ID);     /* VirtualBox specific device implementation revision */