[PATCH v6 16/25] coresight: allow funnel and replicator drivers to be built as modules
Mike Leach
mike.leach at linaro.org
Mon Aug 3 13:11:55 EDT 2020
On Fri, 31 Jul 2020 at 07:42, Tingwei Zhang <tingwei at codeaurora.org> wrote:
>
> From: Kim Phillips <kim.phillips at arm.com>
>
> Allow to build coresight-funnel and coresight-replicator as modules,
> for ease of development.
>
> - Kconfig becomes a tristate, to allow =m
> - add funnel_remove and replicator_remove functions,
> for module unload
> - add a MODULE_DEVICE_TABLE for autoloading on boot
>
> Cc: Mathieu Poirier <mathieu.poirier at linaro.org>
> Cc: Leo Yan <leo.yan at linaro.org>
> Cc: Alexander Shishkin <alexander.shishkin at linux.intel.com>
> Cc: Randy Dunlap <rdunlap at infradead.org>
> Cc: Suzuki K Poulose <Suzuki.Poulose at arm.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Russell King <linux at armlinux.org.uk>
> Signed-off-by: Kim Phillips <kim.phillips at arm.com>
> Signed-off-by: Tingwei Zhang <tingwei at codeaurora.org>
> ---
> drivers/hwtracing/coresight/Kconfig | 5 ++-
> .../hwtracing/coresight/coresight-funnel.c | 32 ++++++++++++++++++
> .../coresight/coresight-replicator.c | 33 +++++++++++++++++++
> 3 files changed, 69 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig
> index fc48ae086746..f31778dd0b5d 100644
> --- a/drivers/hwtracing/coresight/Kconfig
> +++ b/drivers/hwtracing/coresight/Kconfig
> @@ -17,13 +17,16 @@ menuconfig CORESIGHT
>
> if CORESIGHT
> config CORESIGHT_LINKS_AND_SINKS
> - bool "CoreSight Link and Sink drivers"
> + tristate "CoreSight Link and Sink drivers"
> help
> This enables support for CoreSight link and sink drivers that are
> responsible for transporting and collecting the trace data
> respectively. Link and sinks are dynamically aggregated with a trace
> entity at run time to form a complete trace path.
>
> + To compile these drivers as modules, choose M here: the
> + modules will be called coresight-funnel and coresight-replicator.
> +
> config CORESIGHT_LINK_AND_SINK_TMC
> tristate "Coresight generic TMC driver"
>
> diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
> index 46b277ed8606..062694ef9879 100644
> --- a/drivers/hwtracing/coresight/coresight-funnel.c
> +++ b/drivers/hwtracing/coresight/coresight-funnel.c
> @@ -274,6 +274,15 @@ static int funnel_probe(struct device *dev, struct resource *res)
> return ret;
> }
>
> +static int __exit funnel_remove(struct device *dev)
> +{
> + struct funnel_drvdata *drvdata = dev_get_drvdata(dev);
> +
> + coresight_unregister(drvdata->csdev);
> +
> + return 0;
> +}
> +
> #ifdef CONFIG_PM
> static int funnel_runtime_suspend(struct device *dev)
> {
> @@ -319,20 +328,31 @@ static int static_funnel_probe(struct platform_device *pdev)
> return ret;
> }
>
> +static int __exit static_funnel_remove(struct platform_device *pdev)
> +{
> + funnel_remove(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
> + return 0;
> +}
> +
> static const struct of_device_id static_funnel_match[] = {
> {.compatible = "arm,coresight-static-funnel"},
> {}
> };
>
> +MODULE_DEVICE_TABLE(of, static_funnel_match);
> +
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id static_funnel_ids[] = {
> {"ARMHC9FE", 0},
> {},
> };
> +MODULE_DEVICE_TABLE(acpi, static_funnel_ids);
> #endif
>
> static struct platform_driver static_funnel_driver = {
> .probe = static_funnel_probe,
> + .probe = static_funnel_remove,
> .driver = {
> .name = "coresight-static-funnel",
> .of_match_table = static_funnel_match,
> @@ -348,6 +368,11 @@ static int dynamic_funnel_probe(struct amba_device *adev,
> return funnel_probe(&adev->dev, &adev->res);
> }
>
> +static int __exit dynamic_funnel_remove(struct amba_device *adev)
> +{
> + return funnel_remove(&adev->dev);
> +}
> +
> static const struct amba_id dynamic_funnel_ids[] = {
> {
> .id = 0x000bb908,
> @@ -361,6 +386,8 @@ static const struct amba_id dynamic_funnel_ids[] = {
> { 0, 0},
> };
>
> +MODULE_DEVICE_TABLE(amba, dynamic_funnel_ids);
> +
> static struct amba_driver dynamic_funnel_driver = {
> .drv = {
> .name = "coresight-dynamic-funnel",
> @@ -369,6 +396,7 @@ static struct amba_driver dynamic_funnel_driver = {
> .suppress_bind_attrs = true,
> },
> .probe = dynamic_funnel_probe,
> + .remove = dynamic_funnel_remove,
> .id_table = dynamic_funnel_ids,
> };
>
> @@ -399,3 +427,7 @@ static void __exit funnel_exit(void)
>
> module_init(funnel_init);
> module_exit(funnel_exit);
> +
> +MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier at linaro.org>");
> +MODULE_DESCRIPTION("Arm CoreSight Funnel Driver");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
> index 6b30bcee7458..05db434c79d0 100644
> --- a/drivers/hwtracing/coresight/coresight-replicator.c
> +++ b/drivers/hwtracing/coresight/coresight-replicator.c
> @@ -291,6 +291,14 @@ static int replicator_probe(struct device *dev, struct resource *res)
> return ret;
> }
>
> +static int __exit replicator_remove(struct device *dev)
> +{
> + struct replicator_drvdata *drvdata = dev_get_drvdata(dev);
> +
> + coresight_unregister(drvdata->csdev);
> + return 0;
> +}
> +
> static int static_replicator_probe(struct platform_device *pdev)
> {
> int ret;
> @@ -310,6 +318,13 @@ static int static_replicator_probe(struct platform_device *pdev)
> return ret;
> }
>
> +static int __exit static_replicator_remove(struct platform_device *pdev)
> +{
> + replicator_remove(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
> + return 0;
> +}
> +
> #ifdef CONFIG_PM
> static int replicator_runtime_suspend(struct device *dev)
> {
> @@ -342,18 +357,22 @@ static const struct of_device_id static_replicator_match[] = {
> {.compatible = "arm,coresight-static-replicator"},
> {}
> };
> +MODULE_DEVICE_TABLE(of, static_replicator_match);
>
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id static_replicator_acpi_ids[] = {
> {"ARMHC985", 0}, /* ARM CoreSight Static Replicator */
> {}
> };
> +MODULE_DEVICE_TABLE(acpi, static_replicator_acpi_ids);
> #endif
>
> static struct platform_driver static_replicator_driver = {
> .probe = static_replicator_probe,
> + .remove = static_replicator_remove,
> .driver = {
> .name = "coresight-static-replicator",
> + .owner = THIS_MODULE,
> .of_match_table = of_match_ptr(static_replicator_match),
> .acpi_match_table = ACPI_PTR(static_replicator_acpi_ids),
> .pm = &replicator_dev_pm_ops,
> @@ -367,19 +386,28 @@ static int dynamic_replicator_probe(struct amba_device *adev,
> return replicator_probe(&adev->dev, &adev->res);
> }
>
> +static int __exit dynamic_replicator_remove(struct amba_device *adev)
> +{
> + return replicator_remove(&adev->dev);
> +}
> +
> static const struct amba_id dynamic_replicator_ids[] = {
> CS_AMBA_ID(0x000bb909),
> CS_AMBA_ID(0x000bb9ec), /* Coresight SoC-600 */
> {},
> };
>
> +MODULE_DEVICE_TABLE(amba, dynamic_replicator_ids);
> +
> static struct amba_driver dynamic_replicator_driver = {
> .drv = {
> .name = "coresight-dynamic-replicator",
> .pm = &replicator_dev_pm_ops,
> + .owner = THIS_MODULE,
> .suppress_bind_attrs = true,
> },
> .probe = dynamic_replicator_probe,
> + .remove = dynamic_replicator_remove,
> .id_table = dynamic_replicator_ids,
> };
>
> @@ -410,3 +438,8 @@ static void __exit replicator_exit(void)
>
> module_init(replicator_init);
> module_exit(replicator_exit);
> +
> +MODULE_AUTHOR("Pratik Patel <pratikp at codeaurora.org>");
> +MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier at linaro.org>");
> +MODULE_DESCRIPTION("Arm CoreSight Replicator Driver");
> +MODULE_LICENSE("GPL v2");
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
Tested by: Mike Leach <mike.leach at linaro.org>
--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK
More information about the linux-arm-kernel
mailing list