shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Bug: 178537788
Change-Id: I4b53f9bb61fb089b658c6f07e0363327c3582be1
Link: https://lore.kernel.org/linux-iommu/20210408171402.12607-1-isaacm@codeaurora.org/T/#t
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
Suggested-by: Will Deacon <will@kernel.org>
This commit is contained in:
Isaac J. Manjarres
2021-04-01 17:33:30 -07:00
committed by Todd Kjos
parent 83dda912b3
commit 8bc46bd74b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/iommu/arm/arm-smmu/arm-smmu.c
View File

@@ -1216,8 +1216,9 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
return ret; return ret;
} }
static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, static size_t arm_smmu_unmap_pages(struct iommu_domain *domain, unsigned long iova,
size_t size, struct iommu_iotlb_gather *gather) size_t pgsize, size_t pgcount,
struct iommu_iotlb_gather *iotlb_gather)
{ {
struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops; struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu; struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;
@@ -1227,7 +1228,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
return 0; return 0;
arm_smmu_rpm_get(smmu); 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); arm_smmu_rpm_put(smmu);
return ret; return ret;
@@ -1609,7 +1610,7 @@ static struct iommu_ops arm_smmu_ops = {
.domain_free = arm_smmu_domain_free, .domain_free = arm_smmu_domain_free,
.attach_dev = arm_smmu_attach_dev, .attach_dev = arm_smmu_attach_dev,
.map = arm_smmu_map, .map = arm_smmu_map,
.unmap = arm_smmu_unmap, .unmap_pages = arm_smmu_unmap_pages,
.flush_iotlb_all = arm_smmu_flush_iotlb_all, .flush_iotlb_all = arm_smmu_flush_iotlb_all,
.iotlb_sync = arm_smmu_iotlb_sync, .iotlb_sync = arm_smmu_iotlb_sync,
.iova_to_phys = arm_smmu_iova_to_phys, .iova_to_phys = arm_smmu_iova_to_phys,