[v2,7/8] iommu: Remove IOMMU_OF_DECLARE

Message ID 20180524175024.19874-8-robh@kernel.org
State New
Headers show
Series
  • Untitled series #11644
Related show

Commit Message

Rob Herring May 24, 2018, 5:50 p.m.
Now that we use the driver core to stop deferred probe for missing
drivers, IOMMU_OF_DECLARE can be removed.

This is slightly less optimal than having a list of built-in drivers in
that we'll now defer probe twice before giving up. This shouldn't have a
significant impact on boot times as past discussions about deferred
probe have given no evidence of deferred probe having a substantial
impact.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: iommu@lists.linux-foundation.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: devicetree@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

---
 drivers/iommu/arm-smmu-v3.c    |  2 --
 drivers/iommu/arm-smmu.c       |  7 -------
 drivers/iommu/exynos-iommu.c   |  2 --
 drivers/iommu/ipmmu-vmsa.c     |  3 ---
 drivers/iommu/msm_iommu.c      |  2 --
 drivers/iommu/of_iommu.c       | 19 +------------------
 drivers/iommu/qcom_iommu.c     |  2 --
 drivers/iommu/rockchip-iommu.c |  2 --
 include/linux/of_iommu.h       |  4 ----
 9 files changed, 1 insertion(+), 42 deletions(-)

-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Marek Szyprowski May 28, 2018, 6:53 a.m. | #1
Hi Rob,

On 2018-05-24 19:50, Rob Herring wrote:
> Now that we use the driver core to stop deferred probe for missing

> drivers, IOMMU_OF_DECLARE can be removed.

>

> This is slightly less optimal than having a list of built-in drivers in

> that we'll now defer probe twice before giving up. This shouldn't have a

> significant impact on boot times as past discussions about deferred

> probe have given no evidence of deferred probe having a substantial

> impact.

>

> Cc: Will Deacon <will.deacon@arm.com>

> Cc: Robin Murphy <robin.murphy@arm.com>

> Cc: Joerg Roedel <joro@8bytes.org>

> Cc: Marek Szyprowski <m.szyprowski@samsung.com>

> Cc: Kukjin Kim <kgene@kernel.org>

> Cc: Krzysztof Kozlowski <krzk@kernel.org>

> Cc: Rob Clark <robdclark@gmail.com>

> Cc: Heiko Stuebner <heiko@sntech.de>

> Cc: Frank Rowand <frowand.list@gmail.com>

> Cc: linux-arm-kernel@lists.infradead.org

> Cc: iommu@lists.linux-foundation.org

> Cc: linux-samsung-soc@vger.kernel.org

> Cc: linux-arm-msm@vger.kernel.org

> Cc: linux-rockchip@lists.infradead.org

> Cc: devicetree@vger.kernel.org

> Signed-off-by: Rob Herring <robh@kernel.org>


For Exynos IOMMU:

Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>


> ---

>   drivers/iommu/arm-smmu-v3.c    |  2 --

>   drivers/iommu/arm-smmu.c       |  7 -------

>   drivers/iommu/exynos-iommu.c   |  2 --

>   drivers/iommu/ipmmu-vmsa.c     |  3 ---

>   drivers/iommu/msm_iommu.c      |  2 --

>   drivers/iommu/of_iommu.c       | 19 +------------------

>   drivers/iommu/qcom_iommu.c     |  2 --

>   drivers/iommu/rockchip-iommu.c |  2 --

>   include/linux/of_iommu.h       |  4 ----

>   9 files changed, 1 insertion(+), 42 deletions(-)

>

> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c

> index 1d647104bccc..22bdabd3d8e0 100644

> --- a/drivers/iommu/arm-smmu-v3.c

> +++ b/drivers/iommu/arm-smmu-v3.c

> @@ -2915,8 +2915,6 @@ static struct platform_driver arm_smmu_driver = {

>   };

>   module_platform_driver(arm_smmu_driver);

>   

> -IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3");

> -

>   MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");

>   MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

>   MODULE_LICENSE("GPL v2");

> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c

> index 69e7c60792a8..9dd7cbaa3b0c 100644

> --- a/drivers/iommu/arm-smmu.c

> +++ b/drivers/iommu/arm-smmu.c

> @@ -2211,13 +2211,6 @@ static struct platform_driver arm_smmu_driver = {

>   };

>   module_platform_driver(arm_smmu_driver);

>   

> -IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1");

> -IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2");

> -IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400");

> -IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401");

> -IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500");

> -IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2");

> -

>   MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");

>   MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

>   MODULE_LICENSE("GPL v2");

> diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c

> index 85879cfec52f..b128cb4372d3 100644

> --- a/drivers/iommu/exynos-iommu.c

> +++ b/drivers/iommu/exynos-iommu.c

> @@ -1390,5 +1390,3 @@ static int __init exynos_iommu_init(void)

>   	return ret;

>   }

>   core_initcall(exynos_iommu_init);

> -

> -IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu");

> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c

> index 40ae6e87cb88..f026aa16d5f1 100644

> --- a/drivers/iommu/ipmmu-vmsa.c

> +++ b/drivers/iommu/ipmmu-vmsa.c

> @@ -1108,9 +1108,6 @@ static void __exit ipmmu_exit(void)

>   subsys_initcall(ipmmu_init);

>   module_exit(ipmmu_exit);

>   

> -IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");

> -IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");

> -

>   MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");

>   MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");

>   MODULE_LICENSE("GPL v2");

> diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c

> index 0d3350463a3f..27377742600d 100644

> --- a/drivers/iommu/msm_iommu.c

> +++ b/drivers/iommu/msm_iommu.c

> @@ -877,7 +877,5 @@ static void __exit msm_iommu_driver_exit(void)

>   subsys_initcall(msm_iommu_driver_init);

>   module_exit(msm_iommu_driver_exit);

>   

> -IOMMU_OF_DECLARE(msm_iommu_of, "qcom,apq8064-iommu");

> -

>   MODULE_LICENSE("GPL v2");

>   MODULE_AUTHOR("Stepan Moskovchenko <stepanm@codeaurora.org>");

> diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c

> index 2aac8387717c..1904ccf9fc4e 100644

> --- a/drivers/iommu/of_iommu.c

> +++ b/drivers/iommu/of_iommu.c

> @@ -27,9 +27,6 @@

>   

>   #define NO_IOMMU	1

>   

> -static const struct of_device_id __iommu_of_table_sentinel

> -	__used __section(__iommu_of_table_end);

> -

>   /**

>    * of_get_dma_window - Parse *dma-window property and returns 0 if found.

>    *

> @@ -98,19 +95,6 @@ int of_get_dma_window(struct device_node *dn, const char *prefix, int index,

>   }

>   EXPORT_SYMBOL_GPL(of_get_dma_window);

>   

> -static bool of_iommu_driver_present(struct device_node *np)

> -{

> -	/*

> -	 * If the IOMMU still isn't ready by the time we reach init, assume

> -	 * it never will be. We don't want to defer indefinitely, nor attempt

> -	 * to dereference __iommu_of_table after it's been freed.

> -	 */

> -	if (system_state >= SYSTEM_RUNNING)

> -		return false;

> -

> -	return of_match_node(&__iommu_of_table, np);

> -}

> -

>   static int of_iommu_xlate(struct device *dev,

>   			  struct of_phandle_args *iommu_spec)

>   {

> @@ -120,8 +104,7 @@ static int of_iommu_xlate(struct device *dev,

>   

>   	ops = iommu_ops_from_fwnode(fwnode);

>   	if ((ops && !ops->of_xlate) ||

> -	    !of_device_is_available(iommu_spec->np) ||

> -	    (!ops && !of_iommu_driver_present(iommu_spec->np)))

> +	    !of_device_is_available(iommu_spec->np))

>   		return NO_IOMMU;

>   

>   	err = iommu_fwspec_init(dev, &iommu_spec->np->fwnode, ops);

> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c

> index 65b9c99707f8..fa0f6c39a144 100644

> --- a/drivers/iommu/qcom_iommu.c

> +++ b/drivers/iommu/qcom_iommu.c

> @@ -947,7 +947,5 @@ static void __exit qcom_iommu_exit(void)

>   module_init(qcom_iommu_init);

>   module_exit(qcom_iommu_exit);

>   

> -IOMMU_OF_DECLARE(qcom_iommu_dev, "qcom,msm-iommu-v1");

> -

>   MODULE_DESCRIPTION("IOMMU API for QCOM IOMMU v1 implementations");

>   MODULE_LICENSE("GPL v2");

> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c

> index 0468acfa131f..90d37f29c24c 100644

> --- a/drivers/iommu/rockchip-iommu.c

> +++ b/drivers/iommu/rockchip-iommu.c

> @@ -1284,8 +1284,6 @@ static int __init rk_iommu_init(void)

>   }

>   subsys_initcall(rk_iommu_init);

>   

> -IOMMU_OF_DECLARE(rk_iommu_of, "rockchip,iommu");

> -

>   MODULE_DESCRIPTION("IOMMU API for Rockchip");

>   MODULE_AUTHOR("Simon Xue <xxm@rock-chips.com> and Daniel Kurtz <djkurtz@chromium.org>");

>   MODULE_ALIAS("platform:rockchip-iommu");

> diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h

> index 4fa654e4b5a9..f3d40dd7bb66 100644

> --- a/include/linux/of_iommu.h

> +++ b/include/linux/of_iommu.h

> @@ -32,8 +32,4 @@ static inline const struct iommu_ops *of_iommu_configure(struct device *dev,

>   

>   #endif	/* CONFIG_OF_IOMMU */

>   

> -extern struct of_device_id __iommu_of_table;

> -

> -#define IOMMU_OF_DECLARE(name, compat)	OF_DECLARE_1(iommu, name, compat, NULL)

> -

>   #endif /* __OF_IOMMU_H */


Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 1d647104bccc..22bdabd3d8e0 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -2915,8 +2915,6 @@  static struct platform_driver arm_smmu_driver = {
 };
 module_platform_driver(arm_smmu_driver);
 
-IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3");
-
 MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");
 MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 69e7c60792a8..9dd7cbaa3b0c 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2211,13 +2211,6 @@  static struct platform_driver arm_smmu_driver = {
 };
 module_platform_driver(arm_smmu_driver);
 
-IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1");
-IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2");
-IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400");
-IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401");
-IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500");
-IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2");
-
 MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");
 MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 85879cfec52f..b128cb4372d3 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1390,5 +1390,3 @@  static int __init exynos_iommu_init(void)
 	return ret;
 }
 core_initcall(exynos_iommu_init);
-
-IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu");
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 40ae6e87cb88..f026aa16d5f1 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1108,9 +1108,6 @@  static void __exit ipmmu_exit(void)
 subsys_initcall(ipmmu_init);
 module_exit(ipmmu_exit);
 
-IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");
-IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");
-
 MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");
 MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 0d3350463a3f..27377742600d 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -877,7 +877,5 @@  static void __exit msm_iommu_driver_exit(void)
 subsys_initcall(msm_iommu_driver_init);
 module_exit(msm_iommu_driver_exit);
 
-IOMMU_OF_DECLARE(msm_iommu_of, "qcom,apq8064-iommu");
-
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Stepan Moskovchenko <stepanm@codeaurora.org>");
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 2aac8387717c..1904ccf9fc4e 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -27,9 +27,6 @@ 
 
 #define NO_IOMMU	1
 
-static const struct of_device_id __iommu_of_table_sentinel
-	__used __section(__iommu_of_table_end);
-
 /**
  * of_get_dma_window - Parse *dma-window property and returns 0 if found.
  *
@@ -98,19 +95,6 @@  int of_get_dma_window(struct device_node *dn, const char *prefix, int index,
 }
 EXPORT_SYMBOL_GPL(of_get_dma_window);
 
-static bool of_iommu_driver_present(struct device_node *np)
-{
-	/*
-	 * If the IOMMU still isn't ready by the time we reach init, assume
-	 * it never will be. We don't want to defer indefinitely, nor attempt
-	 * to dereference __iommu_of_table after it's been freed.
-	 */
-	if (system_state >= SYSTEM_RUNNING)
-		return false;
-
-	return of_match_node(&__iommu_of_table, np);
-}
-
 static int of_iommu_xlate(struct device *dev,
 			  struct of_phandle_args *iommu_spec)
 {
@@ -120,8 +104,7 @@  static int of_iommu_xlate(struct device *dev,
 
 	ops = iommu_ops_from_fwnode(fwnode);
 	if ((ops && !ops->of_xlate) ||
-	    !of_device_is_available(iommu_spec->np) ||
-	    (!ops && !of_iommu_driver_present(iommu_spec->np)))
+	    !of_device_is_available(iommu_spec->np))
 		return NO_IOMMU;
 
 	err = iommu_fwspec_init(dev, &iommu_spec->np->fwnode, ops);
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index 65b9c99707f8..fa0f6c39a144 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -947,7 +947,5 @@  static void __exit qcom_iommu_exit(void)
 module_init(qcom_iommu_init);
 module_exit(qcom_iommu_exit);
 
-IOMMU_OF_DECLARE(qcom_iommu_dev, "qcom,msm-iommu-v1");
-
 MODULE_DESCRIPTION("IOMMU API for QCOM IOMMU v1 implementations");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 0468acfa131f..90d37f29c24c 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1284,8 +1284,6 @@  static int __init rk_iommu_init(void)
 }
 subsys_initcall(rk_iommu_init);
 
-IOMMU_OF_DECLARE(rk_iommu_of, "rockchip,iommu");
-
 MODULE_DESCRIPTION("IOMMU API for Rockchip");
 MODULE_AUTHOR("Simon Xue <xxm@rock-chips.com> and Daniel Kurtz <djkurtz@chromium.org>");
 MODULE_ALIAS("platform:rockchip-iommu");
diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h
index 4fa654e4b5a9..f3d40dd7bb66 100644
--- a/include/linux/of_iommu.h
+++ b/include/linux/of_iommu.h
@@ -32,8 +32,4 @@  static inline const struct iommu_ops *of_iommu_configure(struct device *dev,
 
 #endif	/* CONFIG_OF_IOMMU */
 
-extern struct of_device_id __iommu_of_table;
-
-#define IOMMU_OF_DECLARE(name, compat)	OF_DECLARE_1(iommu, name, compat, NULL)
-
 #endif /* __OF_IOMMU_H */