Commit a2d3a382 authored by Will Deacon's avatar Will Deacon
Browse files

iommu/io-pgtable: Pass struct iommu_iotlb_gather to ->unmap() 



Update the io-pgtable ->unmap() function to take an iommu_iotlb_gather
pointer as an argument, and update the callers as appropriate.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent e953f7f2

drivers/gpu/drm/panfrost/panfrost_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void panfrost_mmu_unmap(struct panfrost_gem_object *bo) 
		size_t unmapped_page;

		size_t pgsize = get_pgsize(iova, len - unmapped_len);



		unmapped_page = ops->unmap(ops, iova, pgsize);

		unmapped_page = ops->unmap(ops, iova, pgsize, NULL);

		if (!unmapped_page)

			break;

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, 
	if (!ops)

		return 0;



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

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

	if (ret && arm_smmu_atc_inv_domain(smmu_domain, 0, iova, size))

		return 0;

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,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);

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

	arm_smmu_rpm_put(smmu);



	return ret;

drivers/iommu/io-pgtable-arm-v7s.c

+3 −3
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data, 
}



static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,

			    size_t size)

			    size_t size, struct iommu_iotlb_gather *gather)

{

	struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
@@ -892,7 +892,7 @@ static int __init arm_v7s_do_selftests(void) 
	size = 1UL << __ffs(cfg.pgsize_bitmap);

	while (i < loopnr) {

		iova_start = i * SZ_16M;

		if (ops->unmap(ops, iova_start + size, size) != size)

		if (ops->unmap(ops, iova_start + size, size, NULL) != size)

			return __FAIL(ops);



		/* Remap of partial unmap */
@@ -910,7 +910,7 @@ static int __init arm_v7s_do_selftests(void) 
	for_each_set_bit(i, &cfg.pgsize_bitmap, BITS_PER_LONG) {

		size = 1UL << i;



		if (ops->unmap(ops, iova, size) != size)

		if (ops->unmap(ops, iova, size, NULL) != size)

			return __FAIL(ops);



		if (ops->iova_to_phys(ops, iova + 42))

drivers/iommu/io-pgtable-arm.c

+3 −4
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/atomic.h>

#include <linux/bitops.h>

#include <linux/io-pgtable.h>

#include <linux/iommu.h>

#include <linux/kernel.h>

#include <linux/sizes.h>

#include <linux/slab.h>
@@ -642,7 +641,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, 
}



static size_t arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,

			     size_t size)

			     size_t size, struct iommu_iotlb_gather *gather)

{

	struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);

	arm_lpae_iopte *ptep = data->pgd;
@@ -1167,7 +1166,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg) 


		/* Partial unmap */

		size = 1UL << __ffs(cfg->pgsize_bitmap);

		if (ops->unmap(ops, SZ_1G + size, size) != size)

		if (ops->unmap(ops, SZ_1G + size, size, NULL) != size)

			return __FAIL(ops, i);



		/* Remap of partial unmap */
@@ -1182,7 +1181,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg) 
		for_each_set_bit(j, &cfg->pgsize_bitmap, BITS_PER_LONG) {

			size = 1UL << j;



			if (ops->unmap(ops, iova, size) != size)

			if (ops->unmap(ops, iova, size, NULL) != size)

				return __FAIL(ops, i);



			if (ops->iova_to_phys(ops, iova + 42))