]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iommu/dma: add missing support for DMA_ATTR_MMIO for dma_iova_unlink()
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 24 Nov 2025 17:09:55 +0000 (18:09 +0100)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 24 Nov 2025 21:15:11 +0000 (22:15 +0100)
Commit c288d657dd51 added support for DMA_ATTR_MMIO attribute in the
dma_iova_link() code path, but missed that the CPU cache is being also
touched in the dma_iova_unlink() path. Fix this.

Fixes: c288d657dd51 ("iommu/dma: implement DMA_ATTR_MMIO for dma_iova_link().")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Leon Romanovsky <leon@kernel.org>
Link: https://lore.kernel.org/r/20251124170955.3884351-1-m.szyprowski@samsung.com
drivers/iommu/dma-iommu.c

index 7944a3af4545e68664b06a819509a94f7c4de39a..f1fb27681b0bdc1ad57d409df4a43684f9a63032 100644 (file)
@@ -2008,7 +2008,7 @@ static void iommu_dma_iova_unlink_range_slow(struct device *dev,
                        end - addr, iovad->granule - iova_start_pad);
 
                if (!dev_is_dma_coherent(dev) &&
-                   !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+                   !(attrs & (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_MMIO)))
                        arch_sync_dma_for_cpu(phys, len, dir);
 
                swiotlb_tbl_unmap_single(dev, phys, len, dir, attrs);
@@ -2032,7 +2032,8 @@ static void __iommu_dma_iova_unlink(struct device *dev,
        size_t unmapped;
 
        if ((state->__size & DMA_IOVA_USE_SWIOTLB) ||
-           (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)))
+           (!dev_is_dma_coherent(dev) &&
+            !(attrs & (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_MMIO))))
                iommu_dma_iova_unlink_range_slow(dev, addr, size, dir, attrs);
 
        iommu_iotlb_gather_init(&iotlb_gather);