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

Timestamp:

Aug 19, 2020 7:46:35 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 PDMDevHlpPCIRegisterMsi must be called -after- PDMDevHlpPCIRegister.

File:

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

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

@@ -5962 +5962 @@
     MsiReg.iMsiNextOffset = 0; /* IOMMU_PCI_OFF_MSI_MAP_CAP_HDR */
     MsiReg.fMsi64bit      = 1; /* 64-bit addressing support is mandatory; See AMD spec. 2.8 "IOMMU Interrupt Support". */
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
-    AssertRCReturn(rc, rc);
 
     /* MSI Address (Lo, Hi) and MSI data are read-write PCI config registers handled by our generic PCI config space code. */
@@ -5993 +5991 @@
     rc = PDMDevHlpPCIRegister(pDevIns, pPciDev);
     AssertLogRelRCReturn(rc, rc);
+
+    /*
+     * Register MSI support for the PCI device.
+     * This must be done -after- register it as a PCI device!
+     */
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
+    AssertRCReturn(rc, rc);
 
     /*