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

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.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevIommuAmd.cpp (modified) (4 diffs)
• Bus/DevPCI.cpp (modified) (1 diff)
• Bus/DevPciIch9.cpp (modified) (1 diff)
• PC/DevIoApic.cpp (modified) (4 diffs)

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

@@ -5868 +5868 @@
 static DECLCALLBACK(int) iommuAmdR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    NOREF(iInstance);
-
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    PIOMMU          pThis   = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
-    PIOMMUCC        pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PIOMMUCC);
-    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
-    int             rc;
+    RT_NOREF2(iInstance, pCfg);
     LogFlowFunc(("\n"));
 
+    PIOMMU   pThis   = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
+    PIOMMUCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PIOMMUCC);
     pThisCC->pDevInsR3 = pDevIns;
-
-    /*
-     * Validate and read the configuration.
-     */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "Device|Function", "");
-
-    uint8_t uPciDevice;
-    rc = pHlp->pfnCFGMQueryU8Def(pCfg, "Device", &uPciDevice, 0);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("IOMMU: Failed to query \"Device\""));
-
-    uint8_t uPciFunction;
-    rc = pHlp->pfnCFGMQueryU8Def(pCfg, "Function", &uPciFunction, 2);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("IOMMU: Failed to query \"Function\""));
 
     /*
@@ -5904 +5886 @@
     IommuReg.pfnMsiRemap = iommuAmdDeviceMsiRemap;
     IommuReg.u32TheEnd   = PDM_IOMMUREGCC_VERSION;
-    rc = PDMDevHlpIommuRegister(pDevIns, &IommuReg, &pThisCC->CTX_SUFF(pIommuHlp), &pThis->idxIommu);
+    int rc = PDMDevHlpIommuRegister(pDevIns, &IommuReg, &pThisCC->CTX_SUFF(pIommuHlp), &pThis->idxIommu);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to register ourselves as an IOMMU device"));
@@ -6007 +5989 @@
      * Register the PCI function with PDM.
      */
-    rc = PDMDevHlpPCIRegisterEx(pDevIns, pPciDev, 0 /* fFlags */, uPciDevice, uPciFunction, "amd-iommu");
+    rc = PDMDevHlpPCIRegister(pDevIns, pPciDev);
     AssertLogRelRCReturn(rc, rc);
 
@@ -6160 +6142 @@
     /* .szName = */                 "iommu-amd",
     /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
-    /* .fClass = */                 PDM_DEVREG_CLASS_BUS_ISA,   /* Instantiate after PDM_DEVREG_CLASS_BUS_PCI */
+    /* .fClass = */                 PDM_DEVREG_CLASS_PCI_BUILTIN,
     /* .cMaxInstances = */          ~0U,
     /* .uSharedVersion = */         42,

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

@@ -1432 +1432 @@
     /* .szName = */                 "pci",
     /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
-    /* .fClass = */                 PDM_DEVREG_CLASS_BUS_PCI | PDM_DEVREG_CLASS_BUS_ISA,
+    /* .fClass = */                 PDM_DEVREG_CLASS_BUS_PCI,
     /* .cMaxInstances = */          1,
     /* .uSharedVersion = */         42,

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

@@ -3866 +3866 @@
     /* .szName = */                 "ich9pci",
     /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
-    /* .fClass = */                 PDM_DEVREG_CLASS_BUS_PCI | PDM_DEVREG_CLASS_BUS_ISA,
+    /* .fClass = */                 PDM_DEVREG_CLASS_BUS_PCI,
     /* .cMaxInstances = */          1,
     /* .uSharedVersion = */         42,

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

@@ -24 +24 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/msi.h>
+#include <Vbox/pci.h>
 #include <VBox/vmm/pdmdev.h>
 
@@ -165 +166 @@
 #define IOAPIC_DIRECT_OFF_DATA                  0x10
 #define IOAPIC_DIRECT_OFF_EOI                   0x40    /* Newer I/O APIC only. */
-
-/** The I/O APIC's Bus:Device:Function. */
-#define IOAPIC_BUS_DEV_FN                       NIL_PCIBDF
 
 /* Use PDM critsect for now for I/O APIC locking, see @bugref{8245#c121}. */
@@ -657 +655 @@
         uint32_t const uPinMask = UINT32_C(1) << idxRte;
         if (pThis->uIrr & uPinMask)
-            ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, IOAPIC_BUS_DEV_FN, idxRte);
+            ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, VBOX_PCI_BDF_SB_IOAPIC, idxRte);
 
         IOAPIC_UNLOCK(pDevIns, pThis, pThisCC);
@@ -772 +770 @@
                 uint32_t const uPinMask = UINT32_C(1) << idxRte;
                 if (pThis->uIrr & uPinMask)
-                    ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, IOAPIC_BUS_DEV_FN, idxRte);
+                    ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, VBOX_PCI_BDF_SB_IOAPIC, idxRte);
             }
         }