From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 08/12] iommu/arm-smmu: Clean up early-probing workarounds
Date: Thu, 19 Jan 2017 16:50:53 +0000 [thread overview]
Message-ID: <20170119165053.GC28483@red-moon> (raw)
In-Reply-To: <1484838356-24962-9-git-send-email-sricharan@codeaurora.org>
On Thu, Jan 19, 2017 at 08:35:52PM +0530, Sricharan R wrote:
> From: Robin Murphy <robin.murphy@arm.com>
>
> Now that the appropriate ordering is enforced via profe-deferral of
> masters in core code, rip it all out and bask in the simplicity.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> [Sricharan: Rebased on top of ACPI IORT SMMU series]
> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> ---
> * No change
Well, a tad too early on the series for ACPI, aka if we bisect the
series here you would break ACPI.
Totally agree on the patch, but you should move it to the end of the
series.
Lorenzo
> drivers/iommu/arm-smmu-v3.c | 46 ++---------------------------------
> drivers/iommu/arm-smmu.c | 58 +++++++--------------------------------------
> 2 files changed, 10 insertions(+), 94 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> index 7d45d8b..7fc4e5f 100644
> --- a/drivers/iommu/arm-smmu-v3.c
> +++ b/drivers/iommu/arm-smmu-v3.c
> @@ -2724,51 +2724,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
> .probe = arm_smmu_device_probe,
> .remove = arm_smmu_device_remove,
> };
> +module_platform_driver(arm_smmu_driver);
>
> -static int __init arm_smmu_init(void)
> -{
> - static bool registered;
> - int ret = 0;
> -
> - if (!registered) {
> - ret = platform_driver_register(&arm_smmu_driver);
> - registered = !ret;
> - }
> - return ret;
> -}
> -
> -static void __exit arm_smmu_exit(void)
> -{
> - return platform_driver_unregister(&arm_smmu_driver);
> -}
> -
> -subsys_initcall(arm_smmu_init);
> -module_exit(arm_smmu_exit);
> -
> -static int __init arm_smmu_of_init(struct device_node *np)
> -{
> - int ret = arm_smmu_init();
> -
> - if (ret)
> - return ret;
> -
> - if (!of_platform_device_create(np, NULL, platform_bus_type.dev_root))
> - return -ENODEV;
> -
> - return 0;
> -}
> -IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3", arm_smmu_of_init);
> -
> -#ifdef CONFIG_ACPI
> -static int __init acpi_smmu_v3_init(struct acpi_table_header *table)
> -{
> - if (iort_node_match(ACPI_IORT_NODE_SMMU_V3))
> - return arm_smmu_init();
> -
> - return 0;
> -}
> -IORT_ACPI_DECLARE(arm_smmu_v3, ACPI_SIG_IORT, acpi_smmu_v3_init);
> -#endif
> +IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3", NULL);
>
> MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");
> MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index 73a0a25..c86ae5f 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -2134,56 +2134,14 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
> .probe = arm_smmu_device_probe,
> .remove = arm_smmu_device_remove,
> };
> -
> -static int __init arm_smmu_init(void)
> -{
> - static bool registered;
> - int ret = 0;
> -
> - if (!registered) {
> - ret = platform_driver_register(&arm_smmu_driver);
> - registered = !ret;
> - }
> - return ret;
> -}
> -
> -static void __exit arm_smmu_exit(void)
> -{
> - return platform_driver_unregister(&arm_smmu_driver);
> -}
> -
> -subsys_initcall(arm_smmu_init);
> -module_exit(arm_smmu_exit);
> -
> -static int __init arm_smmu_of_init(struct device_node *np)
> -{
> - int ret = arm_smmu_init();
> -
> - if (ret)
> - return ret;
> -
> - if (!of_platform_device_create(np, NULL, platform_bus_type.dev_root))
> - return -ENODEV;
> -
> - return 0;
> -}
> -IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1", arm_smmu_of_init);
> -IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2", arm_smmu_of_init);
> -IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400", arm_smmu_of_init);
> -IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401", arm_smmu_of_init);
> -IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500", arm_smmu_of_init);
> -IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2", arm_smmu_of_init);
> -
> -#ifdef CONFIG_ACPI
> -static int __init arm_smmu_acpi_init(struct acpi_table_header *table)
> -{
> - if (iort_node_match(ACPI_IORT_NODE_SMMU))
> - return arm_smmu_init();
> -
> - return 0;
> -}
> -IORT_ACPI_DECLARE(arm_smmu, ACPI_SIG_IORT, arm_smmu_acpi_init);
> -#endif
> +module_platform_driver(arm_smmu_driver);
> +
> +IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1", NULL);
> +IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2", NULL);
> +IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400", NULL);
> +IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401", NULL);
> +IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500", NULL);
> +IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2", NULL);
>
> MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");
> MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
>
next prev parent reply other threads:[~2017-01-19 16:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 15:05 [PATCH V5 00/12] IOMMU probe deferral support Sricharan R
2017-01-19 15:05 ` [PATCH V5 01/12] iommu/of: Refactor of_iommu_configure() for error handling Sricharan R
2017-01-19 15:05 ` [PATCH V5 02/12] iommu/of: Prepare for deferred IOMMU configuration Sricharan R
2017-01-19 15:05 ` [PATCH V5 03/12] of: dma: Move range size workaround to of_dma_get_range() Sricharan R
2017-01-19 15:05 ` [PATCH V5 04/12] of: dma: Make of_dma_deconfigure() public Sricharan R
2017-01-19 15:05 ` [PATCH V5 05/12] drivers: platform: Configure dma operations at probe time Sricharan R
2017-01-19 16:48 ` Lorenzo Pieralisi
2017-01-20 5:34 ` Sricharan
2017-01-19 17:49 ` Robin Murphy
2017-01-19 19:02 ` Lorenzo Pieralisi
2017-01-20 6:25 ` Sricharan
2017-01-20 6:18 ` Sricharan
2017-01-19 15:05 ` [PATCH V5 06/12] iommu: of: Handle IOMMU lookup failure with deferred probing or error Sricharan R
2017-01-19 15:05 ` [PATCH V5 07/12] arm64: dma-mapping: Remove the notifier trick to handle early setting of dma_ops Sricharan R
2017-01-19 16:20 ` Will Deacon
2017-01-19 15:05 ` [PATCH V5 08/12] iommu/arm-smmu: Clean up early-probing workarounds Sricharan R
2017-01-19 16:18 ` Will Deacon
2017-01-20 19:20 ` Sricharan
2017-01-19 16:50 ` Lorenzo Pieralisi [this message]
2017-01-19 17:58 ` Robin Murphy
2017-01-20 6:32 ` Sricharan
2017-01-19 15:05 ` [PATCH V5 09/12] ACPI/IORT: Add function to check SMMUs drivers presence Sricharan R
2017-01-19 15:05 ` [PATCH V5 10/12] drivers: acpi: Configure acpi devices dma operation at probe time Sricharan R
2017-01-19 16:42 ` Lorenzo Pieralisi
2017-01-20 5:31 ` Sricharan
2017-01-19 15:05 ` [PATCH V5 11/12] drivers: acpi: Handle IOMMU lookup failure with deferred probing or error Sricharan R
2017-01-19 15:05 ` [PATCH V5 12/12] ACPI/IORT: Remove linker section for IORT entries probing Sricharan R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170119165053.GC28483@red-moon \
--to=lorenzo.pieralisi@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).