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

Timestamp:

Oct 8, 2020 6:53:36 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 LsiLogic: Use PCI interfaces while reading/writing guest physical memory.

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -1898 +1898 @@
 
         AssertPtr(pvSeg);
-        PDMDevHlpPhysReadUser(pDevIns, GCPhys, pvSeg, cbSeg);
+        PDMDevHlpPCIPhysReadUser(pDevIns, GCPhys, pvSeg, cbSeg);
         GCPhys += cbSeg;
         cbCopy -= cbSeg;
@@ -1971 +1971 @@
 
             /* Read the entry. */
-            PDMDevHlpPhysReadMeta(pDevIns, GCPhysSgEntryNext, &SGEntry, sizeof(MptSGEntryUnion));
+            PDMDevHlpPCIPhysReadMeta(pDevIns, GCPhysSgEntryNext, &SGEntry, sizeof(MptSGEntryUnion));
 
 # ifdef LOG_ENABLED
@@ -2016 +2016 @@
             MptSGEntryChain SGEntryChain;
 
-            PDMDevHlpPhysReadMeta(pDevIns, GCPhysSegmentStart + cChainOffsetNext, &SGEntryChain, sizeof(MptSGEntryChain));
+            PDMDevHlpPCIPhysReadMeta(pDevIns, GCPhysSegmentStart + cChainOffsetNext, &SGEntryChain, sizeof(MptSGEntryChain));
 
             AssertMsg(SGEntryChain.u2ElementType == MPTSGENTRYTYPE_CHAIN, ("Invalid SG entry type\n"));
@@ -3265 +3265 @@
                 LogFlow(("cbBuffer=%u cbPage=%u\n", cbBuffer, cbPage));
 
-                PDMDevHlpPhysReadMeta(pDevIns, GCPhysAddrPageBuffer, pbPageData,
-                                      RT_MIN(cbBuffer, cbPage));
+                PDMDevHlpPCIPhysReadMeta(pDevIns, GCPhysAddrPageBuffer, pbPageData, RT_MIN(cbBuffer, cbPage));
             }
             break;
@@ -4149 +4148 @@
 
             /* Read the message header from the guest first. */
-            PDMDevHlpPhysReadMeta(pDevIns, GCPhysMessageFrameAddr, &GuestRequest, sizeof(MptMessageHdr));
+            PDMDevHlpPCIPhysReadMeta(pDevIns, GCPhysMessageFrameAddr, &GuestRequest, sizeof(MptMessageHdr));
 
             /* Determine the size of the request. */
@@ -4197 +4196 @@
             {
                 /* Read the complete message frame from guest memory now. */
-                PDMDevHlpPhysReadMeta(pDevIns, GCPhysMessageFrameAddr, &GuestRequest, cbRequest);
+                PDMDevHlpPCIPhysReadMeta(pDevIns, GCPhysMessageFrameAddr, &GuestRequest, cbRequest);
 
                 /* Handle SCSI I/O requests now. */