drm/msm: Update the MMU helper function APIs

Jordan Crouse · robclark · commit fb212ad6cc58 · 2020-05-23T13:38:16.000-07:00
Instead of using a bare unsigned type for the length value for map/unmap
functions pass in a size_t to more correctly match up with the underlying
APIs.

Signed-off-by: Jordan Crouse &lt;jcrouse@codeaurora.org&gt;
Tested-by: Shawn Guo &lt;shawn.guo@linaro.org&gt;
Signed-off-by: Rob Clark &lt;robdclark@chromium.org&gt;
diff --git a/drivers/gpu/drm/msm/msm_gpummu.c b/drivers/gpu/drm/msm/msm_gpummu.c
@@ -26,7 +26,7 @@ static void msm_gpummu_detach(struct msm_mmu *mmu)
 }
 
 static int msm_gpummu_map(struct msm_mmu *mmu, uint64_t iova,
-		struct sg_table *sgt, unsigned len, int prot)
+		struct sg_table *sgt, size_t len, int prot)
 {
 	struct msm_gpummu *gpummu = to_msm_gpummu(mmu);
 	unsigned idx = (iova - GPUMMU_VA_START) / GPUMMU_PAGE_SIZE;
@@ -54,7 +54,7 @@ static int msm_gpummu_map(struct msm_mmu *mmu, uint64_t iova,
 	return 0;
 }
 
-static int msm_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, unsigned len)
+static int msm_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len)
 {
 	struct msm_gpummu *gpummu = to_msm_gpummu(mmu);
 	unsigned idx = (iova - GPUMMU_VA_START) / GPUMMU_PAGE_SIZE;
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
@@ -31,7 +31,7 @@ static void msm_iommu_detach(struct msm_mmu *mmu)
 }
 
 static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,
-		struct sg_table *sgt, unsigned len, int prot)
+		struct sg_table *sgt, size_t len, int prot)
 {
 	struct msm_iommu *iommu = to_msm_iommu(mmu);
 	size_t ret;
@@ -42,7 +42,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,
 	return (ret == len) ? 0 : -EINVAL;
 }
 
-static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, unsigned len)
+static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len)
 {
 	struct msm_iommu *iommu = to_msm_iommu(mmu);
 
diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h
@@ -12,8 +12,8 @@
 struct msm_mmu_funcs {
 	void (*detach)(struct msm_mmu *mmu);
 	int (*map)(struct msm_mmu *mmu, uint64_t iova, struct sg_table *sgt,
-			unsigned len, int prot);
-	int (*unmap)(struct msm_mmu *mmu, uint64_t iova, unsigned len);
+			size_t len, int prot);
+	int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len);
 	void (*destroy)(struct msm_mmu *mmu);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static void msm_gpummu_detach(struct msm_mmu *mmu)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`static int msm_gpummu_map(struct msm_mmu *mmu, uint64_t iova,`
`29`		`- struct sg_table *sgt, unsigned len, int prot)`
	`29`	`+ struct sg_table *sgt, size_t len, int prot)`
`30`	`30`	`{`
`31`	`31`	`struct msm_gpummu *gpummu = to_msm_gpummu(mmu);`
`32`	`32`	`unsigned idx = (iova - GPUMMU_VA_START) / GPUMMU_PAGE_SIZE;`
`@@ -54,7 +54,7 @@ static int msm_gpummu_map(struct msm_mmu *mmu, uint64_t iova,`
`54`	`54`	`return 0;`
`55`	`55`	`}`
`56`	`56`
`57`		`-static int msm_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, unsigned len)`
	`57`	`+static int msm_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len)`
`58`	`58`	`{`
`59`	`59`	`struct msm_gpummu *gpummu = to_msm_gpummu(mmu);`
`60`	`60`	`unsigned idx = (iova - GPUMMU_VA_START) / GPUMMU_PAGE_SIZE;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static void msm_iommu_detach(struct msm_mmu *mmu)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,`
`34`		`- struct sg_table *sgt, unsigned len, int prot)`
	`34`	`+ struct sg_table *sgt, size_t len, int prot)`
`35`	`35`	`{`
`36`	`36`	`struct msm_iommu *iommu = to_msm_iommu(mmu);`
`37`	`37`	`size_t ret;`
`@@ -42,7 +42,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,`
`42`	`42`	`return (ret == len) ? 0 : -EINVAL;`
`43`	`43`	`}`
`44`	`44`
`45`		`-static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, unsigned len)`
	`45`	`+static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len)`
`46`	`46`	`{`
`47`	`47`	`struct msm_iommu *iommu = to_msm_iommu(mmu);`
`48`	`48`