1 files changed, 11 insertions, 7 deletions

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index e269b6f9b444..59bdceea3737 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -234,12 +234,14 @@ void dma_direct_sync_sg_for_device(struct device *dev,
         int i;
 
         for_each_sg(sgl, sg, nents, i) {
-                if (unlikely(is_swiotlb_buffer(sg_phys(sg))))
-                        swiotlb_tbl_sync_single(dev, sg_phys(sg), sg->length,
+                phys_addr_t paddr = dma_to_phys(dev, sg_dma_address(sg));
+
+                if (unlikely(is_swiotlb_buffer(paddr)))
+                        swiotlb_tbl_sync_single(dev, paddr, sg->length,
                                         dir, SYNC_FOR_DEVICE);
 
                 if (!dev_is_dma_coherent(dev))
-                        arch_sync_dma_for_device(dev, sg_phys(sg), sg->length,
+                        arch_sync_dma_for_device(dev, paddr, sg->length,
                                         dir);
         }
 }
@@ -271,11 +273,13 @@ void dma_direct_sync_sg_for_cpu(struct device *dev,
         int i;
 
         for_each_sg(sgl, sg, nents, i) {
+                phys_addr_t paddr = dma_to_phys(dev, sg_dma_address(sg));
+
                 if (!dev_is_dma_coherent(dev))
-                        arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir);
-        
-                if (unlikely(is_swiotlb_buffer(sg_phys(sg))))
-                        swiotlb_tbl_sync_single(dev, sg_phys(sg), sg->length, dir,
+                        arch_sync_dma_for_cpu(dev, paddr, sg->length, dir);
+
+                if (unlikely(is_swiotlb_buffer(paddr)))
+                        swiotlb_tbl_sync_single(dev, paddr, sg->length, dir,
                                         SYNC_FOR_CPU);
         }