Changeset 89455 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2021 8:05:34 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Address translation, WIP.

File:

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

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

@@ -2431 +2431 @@
         DMARMEMREQREMAP MemReqRemap;
         RT_ZERO(MemReqRemap);
-        MemReqRemap.Req.uDmaAddr    = uIova;
-        MemReqRemap.Req.cbDma       = cbIova;
-        MemReqRemap.Req.fReqPerm    = fReqPerm;
-        MemReqRemap.Req.idDevice    = idDevice;
-        MemReqRemap.Req.Pasid       = NIL_PCIPASID;
-        MemReqRemap.Req.enmAddrType = PCIADDRTYPE_UNTRANSLATED;
-        MemReqRemap.Req.enmReqType  = enmReqType;
-        MemReqRemap.fTtm                = fTtm;
-        MemReqRemap.Iotlbe.GCPhysBase   = NIL_RTGCPHYS;
+        MemReqRemap.Req.uDmaAddr      = uIova;
+        MemReqRemap.Req.cbDma         = cbIova;
+        MemReqRemap.Req.fReqPerm      = fReqPerm;
+        MemReqRemap.Req.idDevice      = idDevice;
+        MemReqRemap.Req.Pasid         = NIL_PCIPASID;
+        MemReqRemap.Req.enmAddrType   = PCIADDRTYPE_UNTRANSLATED;
+        MemReqRemap.Req.enmReqType    = enmReqType;
+        MemReqRemap.fTtm              = fTtm;
+        MemReqRemap.Iotlbe.GCPhysBase = NIL_RTGCPHYS;
 
         int rc;
@@ -2475 +2475 @@
 
         *pcbContiguous = MemReqRemap.cbContiguous;
-        *pGCPhysSpa    = MemReqRemap.Iotlbe.GCPhysBase | DMAR_GET_PAGE_OFF_MASK(MemReqRemap.Iotlbe.cShift);
+        *pGCPhysSpa    = MemReqRemap.Iotlbe.GCPhysBase
+                       | (uIova & DMAR_GET_PAGE_OFF_MASK(MemReqRemap.Iotlbe.cShift));
         return rc;
     }