| Message ID | 20200807111153.7784-15-tingwei@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | coresight: allow to build coresight as modules | expand |
On Fri, Aug 07, 2020 at 07:11:43PM +0800, Tingwei Zhang wrote: > From: Kim Phillips <kim.phillips@arm.com> > > Allow to build coresight-funnel as module, for ease of development. > > - combine static and dynamic funnel init into single > module_init/exit call > - add funnel_remove functions, for module unload > - add a MODULE_DEVICE_TABLE for autoloading on boot > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > Cc: Leo Yan <leo.yan@linaro.org> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Randy Dunlap <rdunlap@infradead.org> > Cc: Suzuki K Poulose <Suzuki.Poulose@arm.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Russell King <linux@armlinux.org.uk> > Co-developed-by: Mian Yousaf Kaukab <ykaukab@suse.de> > Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> > Signed-off-by: Kim Phillips <kim.phillips@arm.com> > Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org> > Tested-by: Mike Leach <mike.leach@linaro.org> > --- > .../hwtracing/coresight/coresight-funnel.c | 62 ++++++++++++++++++- > 1 file changed, 60 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c > index 900690a9f7f0..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}, > {}, > }; Add extra line to be consistent with the rest of your patchset. With the that: Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > +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, > @@ -341,7 +361,6 @@ static struct platform_driver static_funnel_driver = { > .suppress_bind_attrs = true, > }, > }; > -builtin_platform_driver(static_funnel_driver); > > static int dynamic_funnel_probe(struct amba_device *adev, > const struct amba_id *id) > @@ -349,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, > @@ -362,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", > @@ -370,6 +396,38 @@ static struct amba_driver dynamic_funnel_driver = { > .suppress_bind_attrs = true, > }, > .probe = dynamic_funnel_probe, > + .remove = dynamic_funnel_remove, > .id_table = dynamic_funnel_ids, > }; > -builtin_amba_driver(dynamic_funnel_driver); > + > +static int __init funnel_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&static_funnel_driver); > + if (ret) { > + pr_info("Error registering platform driver\n"); > + return ret; > + } > + > + ret = amba_driver_register(&dynamic_funnel_driver); > + if (ret) { > + pr_info("Error registering amba driver\n"); > + platform_driver_unregister(&static_funnel_driver); > + } > + > + return ret; > +} > + > +static void __exit funnel_exit(void) > +{ > + platform_driver_unregister(&static_funnel_driver); > + amba_driver_unregister(&dynamic_funnel_driver); > +} > + > +module_init(funnel_init); > +module_exit(funnel_exit); > + > +MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>"); > +MODULE_DESCRIPTION("Arm CoreSight Funnel Driver"); > +MODULE_LICENSE("GPL v2"); > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 900690a9f7f0..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, @@ -341,7 +361,6 @@ static struct platform_driver static_funnel_driver = { .suppress_bind_attrs = true, }, }; -builtin_platform_driver(static_funnel_driver); static int dynamic_funnel_probe(struct amba_device *adev, const struct amba_id *id) @@ -349,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, @@ -362,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", @@ -370,6 +396,38 @@ static struct amba_driver dynamic_funnel_driver = { .suppress_bind_attrs = true, }, .probe = dynamic_funnel_probe, + .remove = dynamic_funnel_remove, .id_table = dynamic_funnel_ids, }; -builtin_amba_driver(dynamic_funnel_driver); + +static int __init funnel_init(void) +{ + int ret; + + ret = platform_driver_register(&static_funnel_driver); + if (ret) { + pr_info("Error registering platform driver\n"); + return ret; + } + + ret = amba_driver_register(&dynamic_funnel_driver); + if (ret) { + pr_info("Error registering amba driver\n"); + platform_driver_unregister(&static_funnel_driver); + } + + return ret; +} + +static void __exit funnel_exit(void) +{ + platform_driver_unregister(&static_funnel_driver); + amba_driver_unregister(&dynamic_funnel_driver); +} + +module_init(funnel_init); +module_exit(funnel_exit); + +MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>"); +MODULE_DESCRIPTION("Arm CoreSight Funnel Driver"); +MODULE_LICENSE("GPL v2");