Changeset 89098 in vbox for trunk/src/VBox/Devices

Timestamp:

May 17, 2021 1:58:09 PM (4 years ago)

Author:

vboxsync

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

144439

Message:

Intel IOMMU: bugref:9967 ConsoleImpl2, DevIoApic: When Main configures the PCI address of the I/O APIC to the BusAssignmentManager, pass it on to the I/O APIC device as well.
This will allow us to use different PCI addresses for AMD and Intel IOMMUs if required.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -265 +265 @@
     /** The I/O APIC chipset type. */
     IOAPICTYPE              enmType;
+    /** The I/O APIC PCI address. */
+    PCIBDF                  uPciAddress;
+    /** Padding. */
+    uint32_t                uPadding0;
 
 #ifndef IOAPIC_WITH_PDM_CRITSECT
@@ -616 +620 @@
 
     MSIMSG MsiOut;
-    int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, VBOX_PCI_BDF_SB_IOAPIC, &MsiIn, &MsiOut);
+    int const rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, pThis->uPciAddress, &MsiIn, &MsiOut);
     if (   rcRemap == VERR_IOMMU_NOT_PRESENT
         || rcRemap == VERR_IOMMU_CANNOT_CALL_SELF)
@@ -1515 +1519 @@
      * Validate and read the configuration.
      */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "NumCPUs|ChipType", "");
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "NumCPUs|ChipType|PCIAddress", "");
 
     /* The number of CPUs is currently unused, but left in CFGM and saved-state in case an ID of 0
@@ -1529 +1533 @@
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to query string value \"ChipType\""));
+
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "PCIAddress", &pThis->uPciAddress, NIL_PCIBDF);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to query 32-bit integer \"PCIAddress\""));
 
     if (!strcmp(szChipType, "ICH9"))