Commit 9ea1a2c4 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres Committed by Joerg Roedel
Browse files

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



Implement the unmap_pages() callback for the ARM SMMU 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 SMMU driver, as it will no longer be used.

Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
Suggested-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarGeorgi Djakov <quic_c_gdjako@quicinc.com>
Link: https://lore.kernel.org/r/1623850736-389584-15-git-send-email-quic_c_gdjako@quicinc.com


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

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

+5 −4
Original line number Diff line number Diff line
@@ -1215,8 +1215,9 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
	return ret;

}



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 *iotlb_gather)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

	struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;
@@ -1226,7 +1227,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, 
		return 0;



	arm_smmu_rpm_get(smmu);

	ret = ops->unmap(ops, iova, size, gather);

	ret = ops->unmap_pages(ops, iova, pgsize, pgcount, iotlb_gather);

	arm_smmu_rpm_put(smmu);



	return ret;
@@ -1583,7 +1584,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,