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

Timestamp:

Apr 29, 2020 4:53:42 PM (5 years ago)

Author:

vboxsync

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

137672

Message:

AMD IOMMU: bugref:9654 Bits.

File:

• trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp (modified) (1 diff)

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

@@ -3386 +3386 @@
                 pThis->IommuBar.au32[0] = u32Value & IOMMU_BAR_VALID_MASK;
                 Assert(pThis->hMmio == NIL_IOMMMIOHANDLE);
-                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);
+                Assert(!pThis->ExtFeat.n.u1PerfCounterSup); /* 16K aligned when performance counters aren't supported. */
+                uint64_t const fAlignMask = UINT64_C(0xffffffffffffc000);
+                RTGCPHYS const GCPhysMmioBase = RT_MAKE_U64(pThis->IommuBar.au32[0] & fAlignMask, pThis->IommuBar.au32[1]);
                 rcStrict = PDMDevHlpMmioMap(pDevIns, pThis->hMmio, GCPhysMmioBase);
                 if (RT_FAILURE(rcStrict))