Changeset 83599 in vbox for trunk/src

Timestamp:

Apr 7, 2020 5:03:28 AM (5 years ago)

Author:

vboxsync

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

137002

Message:

AMD IOMMU: bugref:9654 Use PDMDevHlpPCIRegisterMsi. Doesn't look like MSI is optional for IOMMU, so AssertRCReturn.

File:

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

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

@@ -2871 +2871 @@
 
     /* MSI Capability Header register. */
+#if 0
     PDMPciDevSetDWord(pPciDev, offMsiCapHdr,
                         RT_BF_MAKE(IOMMU_BF_MSI_CAPHDR_CAP_ID,       0x5)             /* RO - Capability ID. */
@@ -2878 +2879 @@
                       | RT_BF_MAKE(IOMMU_BF_MSI_CAPHDR_MULTMESS_EN,  0x0)             /* RW - MSI multi-message enable */
                       | RT_BF_MAKE(IOMMU_BF_MSI_CAPHDR_64BIT_EN,     0x1));           /* RO - MSI 64-bit enable */
+#else
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
+    MsiReg.cMsiVectors    = 1;
+    MsiReg.iMsiCapOffset  = offMsiCapHdr;
+    MsiReg.iMsiNextOffset = offMsiMapCapHdr;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
+    AssertRCReturn(rc, rc);
+#endif
 
     /* MSI Address Lo. */
@@ -2888 +2898 @@
     PDMPciDevSetDWord(pPciDev, offMsiData, 0);                              /* RW - MSI data. */
 
+    /** @todo IOMMU: I don't know if we can support this, disable later if required. */
     /* MSI Mapping Capability Header register. */
     PDMPciDevSetDWord(pPciDev, offMsiMapCapHdr,