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

Commit bdc6d973 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu: Clean up DMA API usage 



With the correct DMA API calls now integrated into the io-pgtable code,
let that handle the flushing of non-coherent page table updates.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 2df7a25c

drivers/iommu/arm-smmu-v3.c

+3 −15
Original line number Diff line number Diff line
@@ -1334,23 +1334,10 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, 
static void arm_smmu_flush_pgtable(void *addr, size_t size, void *cookie)

{

	struct arm_smmu_domain *smmu_domain = cookie;

	struct arm_smmu_device *smmu = smmu_domain->smmu;

	unsigned long offset = (unsigned long)addr & ~PAGE_MASK;



	if (smmu->features & ARM_SMMU_FEAT_COHERENCY) {

	/* The page table code handles flushing in the non-coherent case */

	if (smmu_domain->smmu->features & ARM_SMMU_FEAT_COHERENCY)

		dsb(ishst);

	} else {

		dma_addr_t dma_addr;

		struct device *dev = smmu->dev;



		dma_addr = dma_map_page(dev, virt_to_page(addr), offset, size,

					DMA_TO_DEVICE);



		if (dma_mapping_error(dev, dma_addr))

			dev_err(dev, "failed to flush pgtable at %p\n", addr);

		else

			dma_unmap_page(dev, dma_addr, size, DMA_TO_DEVICE);

	}

}



static struct iommu_gather_ops arm_smmu_gather_ops = {
@@ -1532,6 +1519,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) 
		.ias		= ias,

		.oas		= oas,

		.tlb		= &arm_smmu_gather_ops,

		.iommu_dev	= smmu->dev,

	};



	pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);