Changeset 89497 in vbox

Timestamp:

Jun 4, 2021 7:41:33 AM (3 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Use the common x86 page-offset macro now.

File:

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

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

@@ -187 +187 @@
 #endif  /* IOMMU_WITH_DTE_CACHE */
 
-/** Gets the page offset mask given the number of bits to shift. */
-#define IOMMU_GET_PAGE_OFF_MASK(a_cShift)           (~(UINT64_C(0xffffffffffffffff) << (a_cShift)))
-
 /** Acquires the PDM lock (returns a_rcBusy on contention). */
 #define IOMMU_LOCK_RET(a_pDevIns, a_pThisCC, a_rcBusy)  \
@@ -813 +810 @@
     /* Paranoia: Ensure offset bits are 0. */
     {
-        uint64_t const fOffMaskPrev = IOMMU_GET_PAGE_OFF_MASK(pPageLookupPrev->cShift);
-        uint64_t const fOffMask     = IOMMU_GET_PAGE_OFF_MASK(pPageLookup->cShift);
+        uint64_t const fOffMaskPrev = X86_GET_PAGE_OFFSET_MASK(pPageLookupPrev->cShift);
+        uint64_t const fOffMask     = X86_GET_PAGE_OFFSET_MASK(pPageLookup->cShift);
         Assert(!(GCPhysPrev & fOffMaskPrev));
         Assert(!(GCPhys     & fOffMask));
@@ -3887 +3884 @@
             if (cbRemaining == cbIova)
             {
-                uint64_t const offMask = IOMMU_GET_PAGE_OFF_MASK(PageLookup.cShift);
+                uint64_t const offMask = X86_GET_PAGE_OFFSET_MASK(PageLookup.cShift);
                 uint64_t const offSpa  = uIova & offMask;
                 Assert(!(PageLookup.GCPhysSpa & offMask));