Changeset 84088 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Apr 29, 2020 4:11:15 PM (5 years ago)

Author:

vboxsync

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

137671

Message:

AMD IOMMU: bugref:9654 Bits.

File:

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

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

@@ -2775 +2775 @@
 #endif
 
+
 /**
  * Writes an IOMMU register (32-bit and 64-bit).
@@ -3385 +3386 @@
                 pThis->IommuBar.au32[0] = u32Value & IOMMU_BAR_VALID_MASK;
                 Assert(pThis->hMmio == NIL_IOMMMIOHANDLE);
-                RTGCPHYS const GCPhysMmioBase = RT_MAKE_U64(pThis->IommuBar.n.u18BaseAddrLo, pThis->IommuBar.n.u32BaseAddrHi);
+                RTGCPHYS GCPhysMmioBase = RT_MAKE_U64(pThis->IommuBar.n.u18BaseAddrLo, pThis->IommuBar.n.u32BaseAddrHi);
+                GCPhysMmioBase <<= 14;  /* 16K aligned when performance counters are not supported. */
+                Assert(!pThis->ExtFeat.n.u1PerfCounterSup);
                 rcStrict = PDMDevHlpMmioMap(pDevIns, pThis->hMmio, GCPhysMmioBase);
                 if (RT_FAILURE(rcStrict))