Changeset 87967 in vbox for trunk/src/VBox

Timestamp:

Mar 5, 2021 5:21:14 AM (4 years ago)

Author:

vboxsync

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

143070

Message:

AMD IOMMU: bugref:9654 LogRelMax some failures, return proper rc in LoadExec.

File:

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

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

@@ -4624 +4624 @@
                         if (uIntrCtrl == IOMMU_INTR_CTRL_TARGET_ABORT)
                         {
-                            LogFunc(("IntCtl=0: Remapping disallowed for fixed/arbitrated interrupt (%#x) -> Target abort\n",
-                                     pMsiIn->Data.n.u8Vector));
+                            LogRelMax(10, ("%s: Remapping disallowed for fixed/arbitrated interrupt %#x -> Target abort\n",
+                                           IOMMU_LOG_PFX, pMsiIn->Data.n.u8Vector));
                             iommuAmdSetPciTargetAbort(pDevIns);
                             return VERR_IOMMU_INTR_REMAP_DENIED;
@@ -4631 +4631 @@
 
                         Assert(uIntrCtrl == IOMMU_INTR_CTRL_RSVD); /* Paranoia. */
-                        LogFunc(("IntCtl mode invalid %#x -> Illegal DTE\n", uIntrCtrl));
+                        LogRelMax(10, ("%s: IntCtl mode invalid %#x -> Illegal DTE\n", IOMMU_LOG_PFX, uIntrCtrl));
                         EVT_ILLEGAL_DTE_T Event;
                         iommuAmdIllegalDteEventInit(idDevice, pMsiIn->Addr.u64, true /* fRsvdNotZero */, enmOp, &Event);
@@ -4645 +4645 @@
                     default:
                     {
-                        LogFunc(("MSI data delivery mode invalid %#x -> Target abort\n", u8DeliveryMode));
+                        LogRelMax(10, ("%s: MSI data delivery mode invalid %#x -> Target abort\n", IOMMU_LOG_PFX,
+                                       u8DeliveryMode));
                         iommuAmdSetPciTargetAbort(pDevIns);
                         return VERR_IOMMU_INTR_REMAP_FAILED;
@@ -4663 +4664 @@
                         return VINF_SUCCESS;
                     }
-                    LogFunc(("Remapping/passthru disallowed for interrupt %#x -> Target abort\n", pMsiIn->Data.n.u8Vector));
+                    LogRelMax(10, ("%s: Remapping/passthru disallowed for interrupt %#x -> Target abort\n", IOMMU_LOG_PFX,
+                                   pMsiIn->Data.n.u8Vector));
                 }
                 else
-                    LogFunc(("Logical destination mode invalid for delivery mode %#x\n -> Target abort\n", u8DeliveryMode));
+                    LogRelMax(10, ("%s: Logical destination mode invalid for delivery mode %#x\n -> Target abort\n",
+                                   IOMMU_LOG_PFX, u8DeliveryMode));
 
                 iommuAmdSetPciTargetAbort(pDevIns);
@@ -4674 +4677 @@
             {
                 /** @todo should be cause a PCI target abort here? */
-                LogFunc(("MSI address region invalid %#RX64\n", pMsiIn->Addr.u64));
+                LogRelMax(10, ("%s: MSI address region invalid %#RX64\n", IOMMU_LOG_PFX, pMsiIn->Addr.u64));
                 return VERR_IOMMU_INTR_REMAP_FAILED;
             }
@@ -6588 +6591 @@
     AssertPtrReturn(pThisR3, VERR_INVALID_POINTER);
 
+    int rc;
     IOMMU_LOCK(pDevIns, pThisR3);
 
     /* Map MMIO regions if the IOMMU BAR is enabled. */
     if (pThis->IommuBar.n.u1Enable)
-        iommuAmdR3MmioSetup(pDevIns);
+        rc = iommuAmdR3MmioSetup(pDevIns);
+    else
+        rc = VINF_SUCCESS;
 
     /* Wake up the command thread if commands need processing. */
@@ -6598 +6604 @@
 
     IOMMU_UNLOCK(pDevIns, pThisR3);
-    return VINF_SUCCESS;
+    return rc;
 }