Commit 59103c79 authored by Xiang Chen's avatar Xiang Chen Committed by Joerg Roedel
Browse files

iommu/arm-smmu-v3: Implement the unmap_pages() IOMMU driver callback 



Implement the unmap_pages() callback for ARM SMMUV3 driver to allow calls
from iommu_unmap to unmap multiple pages of the same size in one call.
Also remove the unmap() callback for the ARM SMMUV3 driver as it will
no longer be used.

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/1627697831-158822-2-git-send-email-chenxiang66@hisilicon.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 75cc1018

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+5 −4
Original line number Diff line number Diff line
@@ -2450,8 +2450,9 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
	return ops->map(ops, iova, paddr, size, prot, gfp);

}



static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,

			     size_t size, struct iommu_iotlb_gather *gather)

static size_t arm_smmu_unmap_pages(struct iommu_domain *domain, unsigned long iova,

				   size_t pgsize, size_t pgcount,

				   struct iommu_iotlb_gather *gather)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops;
@@ -2459,7 +2460,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, 
	if (!ops)

		return 0;



	return ops->unmap(ops, iova, size, gather);

	return ops->unmap_pages(ops, iova, pgsize, pgcount, gather);

}



static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain)
@@ -2823,7 +2824,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.domain_free		= arm_smmu_domain_free,

	.attach_dev		= arm_smmu_attach_dev,

	.map			= arm_smmu_map,

	.unmap			= arm_smmu_unmap,

	.unmap_pages		= arm_smmu_unmap_pages,

	.flush_iotlb_all	= arm_smmu_flush_iotlb_all,

	.iotlb_sync		= arm_smmu_iotlb_sync,

	.iova_to_phys		= arm_smmu_iova_to_phys,