Commit 193e67c0 authored by Vivek Gautam's avatar Vivek Gautam Committed by Joerg Roedel
Browse files

iommu/io-pgtable: Use size_t return type for all foo_unmap 



Unmap returns a size_t all throughout the IOMMU framework.
Make io-pgtable match this convention.
Moreover, there isn't a need to have a signed int return type
as we return 0 in case of failures.

Signed-off-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c5611a87

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

+11 −10
Original line number Original line Diff line number Diff line
@@ -357,7 +357,7 @@ static bool arm_v7s_pte_is_cont(arm_v7s_iopte pte, int lvl) 
	return false;

	return false;

}

}





static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *, unsigned long,

static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *, unsigned long,

			      size_t, int, arm_v7s_iopte *);

			      size_t, int, arm_v7s_iopte *);





static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data,

static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data,
@@ -541,9 +541,10 @@ static arm_v7s_iopte arm_v7s_split_cont(struct arm_v7s_io_pgtable *data, 
	return pte;

	return pte;

}

}





static int arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,

static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,

				      unsigned long iova, size_t size,

				      unsigned long iova, size_t size,

				   arm_v7s_iopte blk_pte, arm_v7s_iopte *ptep)

				      arm_v7s_iopte blk_pte,

				      arm_v7s_iopte *ptep)

{

{

	struct io_pgtable_cfg *cfg = &data->iop.cfg;

	struct io_pgtable_cfg *cfg = &data->iop.cfg;

	arm_v7s_iopte pte, *tablep;

	arm_v7s_iopte pte, *tablep;
@@ -584,7 +585,7 @@ static int arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data, 
	return size;

	return size;

}

}





static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,

static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,

			      unsigned long iova, size_t size, int lvl,

			      unsigned long iova, size_t size, int lvl,

			      arm_v7s_iopte *ptep)

			      arm_v7s_iopte *ptep)

{

{
@@ -656,7 +657,7 @@ static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *data, 
	return __arm_v7s_unmap(data, iova, size, lvl + 1, ptep);

	return __arm_v7s_unmap(data, iova, size, lvl + 1, ptep);

}

}





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

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

			    size_t size)

			    size_t size)

{

{

	struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);

	struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);

drivers/iommu/io-pgtable-arm.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -268,7 +268,7 @@ static void __arm_lpae_set_pte(arm_lpae_iopte *ptep, arm_lpae_iopte pte, 
		__arm_lpae_sync_pte(ptep, cfg);

		__arm_lpae_sync_pte(ptep, cfg);

}

}





static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,

static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,

			       unsigned long iova, size_t size, int lvl,

			       unsigned long iova, size_t size, int lvl,

			       arm_lpae_iopte *ptep);

			       arm_lpae_iopte *ptep);
@@ -506,7 +506,7 @@ static void arm_lpae_free_pgtable(struct io_pgtable *iop) 
	kfree(data);

	kfree(data);

}

}





static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,

static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,

				       unsigned long iova, size_t size,

				       unsigned long iova, size_t size,

				       arm_lpae_iopte blk_pte, int lvl,

				       arm_lpae_iopte blk_pte, int lvl,

				       arm_lpae_iopte *ptep)

				       arm_lpae_iopte *ptep)
@@ -560,7 +560,7 @@ static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, 
	return size;

	return size;

}

}





static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,

static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,

			       unsigned long iova, size_t size, int lvl,

			       unsigned long iova, size_t size, int lvl,

			       arm_lpae_iopte *ptep)

			       arm_lpae_iopte *ptep)

{

{
@@ -606,7 +606,7 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, 
	return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);

	return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);

}

}





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

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

			     size_t size)

			     size_t size)

{

{

	struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);

	struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);

drivers/iommu/io-pgtable.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ struct io_pgtable_cfg { 
struct io_pgtable_ops {

struct io_pgtable_ops {

	int (*map)(struct io_pgtable_ops *ops, unsigned long iova,

	int (*map)(struct io_pgtable_ops *ops, unsigned long iova,

		   phys_addr_t paddr, size_t size, int prot);

		   phys_addr_t paddr, size_t size, int prot);

	int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,

	size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,

			size_t size);

			size_t size);

	phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,

	phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,

				    unsigned long iova);

				    unsigned long iova);

CRA Git | Maintained and supported by SUSTech CRA and CCSE