Changeset 84809 in vbox for trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

Timestamp:

Jun 12, 2020 6:49:41 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Use the proper PCI bus number. Not the Bus array index.

File:

• trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

@@ -158 +158 @@
         && pDevInsIommu != pDevIns)
     {
+        size_t const idxBus = pPciDev->Int.s.idxPdmBus;
+        Assert(idxBus < RT_ELEMENTS(pGVM->pdmr0.s.aPciBuses));
+        PPDMPCIBUSR0 pBus = &pGVM->pdmr0.s.aPciBuses[idxBus];
+
         RTGCPHYS GCPhysOut;
-        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pPciDev->Int.s.idxPdmBus, pPciDev->uDevFn);
+        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemRead(pDevInsIommu, uDeviceId, GCPhys, cbRead, &GCPhysOut);
         if (RT_FAILURE(rc))
@@ -206 +210 @@
         && pDevInsIommu != pDevIns)
     {
+        size_t const idxBus = pPciDev->Int.s.idxPdmBus;
+        Assert(idxBus < RT_ELEMENTS(pGVM->pdmr0.s.aPciBuses));
+        PPDMPCIBUSR0 pBus = &pGVM->pdmr0.s.aPciBuses[idxBus];
+
         RTGCPHYS GCPhysOut;
-        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pPciDev->Int.s.idxPdmBus, pPciDev->uDevFn);
+        uint16_t const uDeviceId = VBOX_PCI_BUSDEVFN_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemWrite(pDevInsIommu, uDeviceId, GCPhys, cbWrite, &GCPhysOut);
         if (RT_FAILURE(rc))