Changeset 85007 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 30, 2020 5:19:25 PM (5 years ago)

Author:

vboxsync

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

138905

Message:

AMD IOMMU: bugref:9654 PDM, Main: Changes for southbridge I/O APIC and related PCI address assignment.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -36 +36 @@
 #include <VBox/version.h>
 #include <VBox/log.h>
+#include <VBox/pci.h>
 #include <VBox/err.h>
 #include <iprt/asm.h>
@@ -1457 +1458 @@
                             rc);
 
+#ifdef VBOX_WITH_IOMMU_AMD
+        /** @todo IOMMU: Restrict this to the AMD flavor of IOMMU only at runtime. */
+        PPDMIOMMU  pIommu       = &pVM->pdm.s.aIommus[0];
+        PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
+        if (pDevInsIommu)
+        {
+            /*
+             * If the PCI device/function number has been explicitly specified via CFGM,
+             * ensure it's not the BDF reserved for the southbridge I/O APIC expected
+             * by linux guests when using an AMD IOMMU, see @bugref{9654#c23}.
+             */
+            uint16_t const uDevFn    = VBOX_PCI_DEVFN_MAKE(uPciDevNo, uPciFunNo);
+            uint16_t const uBusDevFn = PCIBDF_MAKE(u8Bus, uDevFn);
+            if (uBusDevFn == VBOX_PCI_BDF_SB_IOAPIC)
+            {
+                LogRel(("Configuration error: PCI BDF (%u:%u:%u) conflicts with SB I/O APIC (%s/%d/%d)\n", u8Bus,
+                        uCfgDevice, uCfgFunction, pDevIns->pReg->szName, pDevIns->iInstance, pPciDev->Int.s.idxSubDev));
+                return VERR_NOT_AVAILABLE;
+            }
+        }
+#endif
 
         /*