iommu: constify of_phandle_args in xlate

krzk · joergroedel · commit b42a905b6aad · 2024-03-01T13:46:57.000+01:00
The xlate callbacks are supposed to translate of_phandle_args to proper provider without modifying the of_phandle_args. Make the argument pointer to const for code safety and readability. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20240216144027.185959-2-krzysztof.kozlowski@linaro.org Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
@@ -779,7 +779,8 @@ static void apple_dart_domain_free(struct iommu_domain *domain)
 	kfree(dart_domain);
 }
 
-static int apple_dart_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int apple_dart_of_xlate(struct device *dev,
+			       const struct of_phandle_args *args)
 {
 	struct apple_dart_master_cfg *cfg = dev_iommu_priv_get(dev);
 	struct platform_device *iommu_pdev = of_find_device_by_node(args->np);
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2704,7 +2704,8 @@ static int arm_smmu_enable_nesting(struct iommu_domain *domain)
 	return ret;
 }
 
-static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int arm_smmu_of_xlate(struct device *dev,
+			     const struct of_phandle_args *args)
 {
 	return iommu_fwspec_add_ids(dev, args->args, 1);
 }
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
@@ -1551,7 +1551,8 @@ static int arm_smmu_set_pgtable_quirks(struct iommu_domain *domain,
 	return ret;
 }
 
-static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int arm_smmu_of_xlate(struct device *dev,
+			     const struct of_phandle_args *args)
 {
 	u32 mask, fwid = 0;
 
diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -546,7 +546,8 @@ static struct iommu_device *qcom_iommu_probe_device(struct device *dev)
 	return &qcom_iommu->iommu;
 }
 
-static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int qcom_iommu_of_xlate(struct device *dev,
+			       const struct of_phandle_args *args)
 {
 	struct qcom_iommu_dev *qcom_iommu;
 	struct platform_device *iommu_pdev;
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
@@ -1431,7 +1431,7 @@ static void exynos_iommu_release_device(struct device *dev)
 }
 
 static int exynos_iommu_of_xlate(struct device *dev,
-				 struct of_phandle_args *spec)
+				 const struct of_phandle_args *spec)
 {
 	struct platform_device *sysmmu = of_find_device_by_node(spec->np);
 	struct exynos_iommu_owner *owner = dev_iommu_priv_get(dev);
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -2825,7 +2825,7 @@ void iommu_fwspec_free(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(iommu_fwspec_free);
 
-int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
+int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids)
 {
 	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
 	int i, new_num;
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
@@ -709,7 +709,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
 }
 
 static int ipmmu_init_platform_device(struct device *dev,
-				      struct of_phandle_args *args)
+				      const struct of_phandle_args *args)
 {
 	struct platform_device *ipmmu_pdev;
 
@@ -773,7 +773,7 @@ static bool ipmmu_device_is_allowed(struct device *dev)
 }
 
 static int ipmmu_of_xlate(struct device *dev,
-			  struct of_phandle_args *spec)
+			  const struct of_phandle_args *spec)
 {
 	if (!ipmmu_device_is_allowed(dev))
 		return -ENODEV;
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
@@ -598,7 +598,7 @@ static void print_ctx_regs(void __iomem *base, int ctx)
 
 static int insert_iommu_master(struct device *dev,
 				struct msm_iommu_dev **iommu,
-				struct of_phandle_args *spec)
+				const struct of_phandle_args *spec)
 {
 	struct msm_iommu_ctx_dev *master = dev_iommu_priv_get(dev);
 	int sid;
@@ -626,7 +626,7 @@ static int insert_iommu_master(struct device *dev,
 }
 
 static int qcom_iommu_of_xlate(struct device *dev,
-			       struct of_phandle_args *spec)
+			       const struct of_phandle_args *spec)
 {
 	struct msm_iommu_dev *iommu = NULL, *iter;
 	unsigned long flags;
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
@@ -957,7 +957,8 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)
 	return group;
 }
 
-static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int mtk_iommu_of_xlate(struct device *dev,
+			      const struct of_phandle_args *args)
 {
 	struct platform_device *m4updev;
 
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
@@ -398,7 +398,8 @@ static const struct iommu_ops mtk_iommu_v1_ops;
  * MTK generation one iommu HW only support one iommu domain, and all the client
  * sharing the same iova address space.
  */
-static int mtk_iommu_v1_create_mapping(struct device *dev, struct of_phandle_args *args)
+static int mtk_iommu_v1_create_mapping(struct device *dev,
+				       const struct of_phandle_args *args)
 {
 	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
 	struct mtk_iommu_v1_data *data;
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
@@ -1140,7 +1140,7 @@ static void rk_iommu_release_device(struct device *dev)
 }
 
 static int rk_iommu_of_xlate(struct device *dev,
-			     struct of_phandle_args *args)
+			     const struct of_phandle_args *args)
 {
 	struct platform_device *iommu_dev;
 	struct rk_iommudata *data;
diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c
@@ -390,7 +390,8 @@ static struct iommu_device *sprd_iommu_probe_device(struct device *dev)
 	return &sdev->iommu;
 }
 
-static int sprd_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int sprd_iommu_of_xlate(struct device *dev,
+			       const struct of_phandle_args *args)
 {
 	struct platform_device *pdev;
 
diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c
@@ -819,7 +819,7 @@ static struct iommu_device *sun50i_iommu_probe_device(struct device *dev)
 }
 
 static int sun50i_iommu_of_xlate(struct device *dev,
-				 struct of_phandle_args *args)
+				 const struct of_phandle_args *args)
 {
 	struct platform_device *iommu_pdev = of_find_device_by_node(args->np);
 	unsigned id = args->args[0];
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
@@ -830,7 +830,7 @@ static struct tegra_smmu *tegra_smmu_find(struct device_node *np)
 }
 
 static int tegra_smmu_configure(struct tegra_smmu *smmu, struct device *dev,
-				struct of_phandle_args *args)
+				const struct of_phandle_args *args)
 {
 	const struct iommu_ops *ops = smmu->iommu.ops;
 	int err;
@@ -959,7 +959,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
 }
 
 static int tegra_smmu_of_xlate(struct device *dev,
-			       struct of_phandle_args *args)
+			       const struct of_phandle_args *args)
 {
 	struct platform_device *iommu_pdev = of_find_device_by_node(args->np);
 	struct tegra_mc *mc = platform_get_drvdata(iommu_pdev);
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
@@ -1051,7 +1051,8 @@ static struct iommu_group *viommu_device_group(struct device *dev)
 		return generic_device_group(dev);
 }
 
-static int viommu_of_xlate(struct device *dev, struct of_phandle_args *args)
+static int viommu_of_xlate(struct device *dev,
+			   const struct of_phandle_args *args)
 {
 	return iommu_fwspec_add_ids(dev, args->args, 1);
 }
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
@@ -567,7 +567,7 @@ struct iommu_ops {
 	/* Request/Free a list of reserved regions for a device */
 	void (*get_resv_regions)(struct device *dev, struct list_head *list);
 
-	int (*of_xlate)(struct device *dev, struct of_phandle_args *args);
+	int (*of_xlate)(struct device *dev, const struct of_phandle_args *args);
 	bool (*is_attach_deferred)(struct device *dev);
 
 	/* Per device IOMMU features */
@@ -985,7 +985,7 @@ struct iommu_mm_data {
 int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
 		      const struct iommu_ops *ops);
 void iommu_fwspec_free(struct device *dev);
-int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids);
+int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids);
 const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode);
 
 static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,8 @@ static void apple_dart_domain_free(struct iommu_domain *domain)`
`779`	`779`	`kfree(dart_domain);`
`780`	`780`	`}`
`781`	`781`
`782`		`-static int apple_dart_of_xlate(struct device dev, struct of_phandle_args args)`
	`782`	`+static int apple_dart_of_xlate(struct device *dev,`
	`783`	`+ const struct of_phandle_args *args)`
`783`	`784`	`{`
`784`	`785`	`struct apple_dart_master_cfg *cfg = dev_iommu_priv_get(dev);`
`785`	`786`	`struct platform_device *iommu_pdev = of_find_device_by_node(args->np);`
Original file line number	Diff line number	Diff line change
`@@ -2704,7 +2704,8 @@ static int arm_smmu_enable_nesting(struct iommu_domain *domain)`
`2704`	`2704`	`return ret;`
`2705`	`2705`	`}`
`2706`	`2706`
`2707`		`-static int arm_smmu_of_xlate(struct device dev, struct of_phandle_args args)`
	`2707`	`+static int arm_smmu_of_xlate(struct device *dev,`
	`2708`	`+ const struct of_phandle_args *args)`
`2708`	`2709`	`{`
`2709`	`2710`	`return iommu_fwspec_add_ids(dev, args->args, 1);`
`2710`	`2711`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1551,7 +1551,8 @@ static int arm_smmu_set_pgtable_quirks(struct iommu_domain *domain,`
`1551`	`1551`	`return ret;`
`1552`	`1552`	`}`
`1553`	`1553`
`1554`		`-static int arm_smmu_of_xlate(struct device dev, struct of_phandle_args args)`
	`1554`	`+static int arm_smmu_of_xlate(struct device *dev,`
	`1555`	`+ const struct of_phandle_args *args)`
`1555`	`1556`	`{`
`1556`	`1557`	`u32 mask, fwid = 0;`
`1557`	`1558`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,8 @@ static struct iommu_device qcom_iommu_probe_device(struct device dev)`
`546`	`546`	`return &qcom_iommu->iommu;`
`547`	`547`	`}`
`548`	`548`
`549`		`-static int qcom_iommu_of_xlate(struct device dev, struct of_phandle_args args)`
	`549`	`+static int qcom_iommu_of_xlate(struct device *dev,`
	`550`	`+ const struct of_phandle_args *args)`
`550`	`551`	`{`
`551`	`552`	`struct qcom_iommu_dev *qcom_iommu;`
`552`	`553`	`struct platform_device *iommu_pdev;`
Original file line number	Diff line number	Diff line change
`@@ -1431,7 +1431,7 @@ static void exynos_iommu_release_device(struct device *dev)`
`1431`	`1431`	`}`
`1432`	`1432`
`1433`	`1433`	`static int exynos_iommu_of_xlate(struct device *dev,`
`1434`		`- struct of_phandle_args *spec)`
	`1434`	`+ const struct of_phandle_args *spec)`
`1435`	`1435`	`{`
`1436`	`1436`	`struct platform_device *sysmmu = of_find_device_by_node(spec->np);`
`1437`	`1437`	`struct exynos_iommu_owner *owner = dev_iommu_priv_get(dev);`
Original file line number	Diff line number	Diff line change
`@@ -2825,7 +2825,7 @@ void iommu_fwspec_free(struct device *dev)`
`2825`	`2825`	`}`
`2826`	`2826`	`EXPORT_SYMBOL_GPL(iommu_fwspec_free);`
`2827`	`2827`
`2828`		`-int iommu_fwspec_add_ids(struct device dev, u32 ids, int num_ids)`
	`2828`	`+int iommu_fwspec_add_ids(struct device dev, const u32 ids, int num_ids)`
`2829`	`2829`	`{`
`2830`	`2830`	`struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);`
`2831`	`2831`	`int i, new_num;`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`static int ipmmu_init_platform_device(struct device *dev,`
`712`		`- struct of_phandle_args *args)`
	`712`	`+ const struct of_phandle_args *args)`
`713`	`713`	`{`
`714`	`714`	`struct platform_device *ipmmu_pdev;`
`715`	`715`
`@@ -773,7 +773,7 @@ static bool ipmmu_device_is_allowed(struct device *dev)`
`773`	`773`	`}`
`774`	`774`
`775`	`775`	`static int ipmmu_of_xlate(struct device *dev,`
`776`		`- struct of_phandle_args *spec)`
	`776`	`+ const struct of_phandle_args *spec)`
`777`	`777`	`{`
`778`	`778`	`if (!ipmmu_device_is_allowed(dev))`
`779`	`779`	`return -ENODEV;`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ static void print_ctx_regs(void __iomem *base, int ctx)`
`598`	`598`
`599`	`599`	`static int insert_iommu_master(struct device *dev,`
`600`	`600`	`struct msm_iommu_dev **iommu,`
`601`		`- struct of_phandle_args *spec)`
	`601`	`+ const struct of_phandle_args *spec)`
`602`	`602`	`{`
`603`	`603`	`struct msm_iommu_ctx_dev *master = dev_iommu_priv_get(dev);`
`604`	`604`	`int sid;`
`@@ -626,7 +626,7 @@ static int insert_iommu_master(struct device *dev,`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`static int qcom_iommu_of_xlate(struct device *dev,`
`629`		`- struct of_phandle_args *spec)`
	`629`	`+ const struct of_phandle_args *spec)`
`630`	`630`	`{`
`631`	`631`	`struct msm_iommu_dev iommu = NULL, iter;`
`632`	`632`	`unsigned long flags;`
Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,8 @@ static struct iommu_group mtk_iommu_device_group(struct device dev)`
`957`	`957`	`return group;`
`958`	`958`	`}`
`959`	`959`
`960`		`-static int mtk_iommu_of_xlate(struct device dev, struct of_phandle_args args)`
	`960`	`+static int mtk_iommu_of_xlate(struct device *dev,`
	`961`	`+ const struct of_phandle_args *args)`
`961`	`962`	`{`
`962`	`963`	`struct platform_device *m4updev;`
`963`	`964`