Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23f88e0a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Joerg Roedel
Browse files

iommu/dma: Use for_each_sg in iommu_dma_alloc 



arch_dma_prep_coherent can handle physically contiguous ranges larger
than PAGE_SIZE just fine, which means we don't need a page-based
iterator.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent af751d43

drivers/iommu/dma-iommu.c

+5 −9
Original line number Diff line number Diff line
@@ -606,15 +606,11 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, 
		goto out_free_iova;



	if (!(prot & IOMMU_CACHE)) {

		struct sg_mapping_iter miter;

		/*

		 * The CPU-centric flushing implied by SG_MITER_TO_SG isn't

		 * sufficient here, so skip it by using the "wrong" direction.

		 */

		sg_miter_start(&miter, sgt.sgl, sgt.orig_nents, SG_MITER_FROM_SG);

		while (sg_miter_next(&miter))

			arch_dma_prep_coherent(miter.page, PAGE_SIZE);

		sg_miter_stop(&miter);

		struct scatterlist *sg;

		int i;



		for_each_sg(sgt.sgl, sg, sgt.orig_nents, i)

			arch_dma_prep_coherent(sg_page(sg), sg->length);

	}



	if (iommu_map_sg(domain, iova, sgt.sgl, sgt.orig_nents, prot)