| Message ID | 20231201062053.1268492-2-anshuman.khandual@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | coresight: Move remaining AMBA ACPI devices into platform driver | expand |
On Fri, Dec 01, 2023 at 11:50:47AM +0530, Anshuman Khandual wrote: > Add support for the dynamic replicator device in the platform driver, which > can then be used on ACPI based platforms. This change would now allow > runtime power management for repliacator devices on ACPI based systems. > > The driver would try to enable the APB clock if available. Also, rename the > code to reflect the fact that it now handles both static and dynamic > replicators. > > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: Sudeep Holla <sudeep.holla@arm.com> Except the minor nit below which may apply also for few other patches in the series Acked-by: Sudeep Holla <sudeep.holla@arm.com> # For ACPI related changes Tested-by: Sudeep Holla <sudeep.holla@arm.com> # Boot and driver probe only [...] > diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c > index b6be73034996..64de0bee02ec 100644 > --- a/drivers/hwtracing/coresight/coresight-replicator.c > +++ b/drivers/hwtracing/coresight/coresight-replicator.c > @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); > struct replicator_drvdata { > void __iomem *base; > struct clk *atclk; > + struct clk *pclk; [minor nit] Perhaps can be documented as well ?
On 12/1/23 18:05, Sudeep Holla wrote: > On Fri, Dec 01, 2023 at 11:50:47AM +0530, Anshuman Khandual wrote: >> Add support for the dynamic replicator device in the platform driver, which >> can then be used on ACPI based platforms. This change would now allow >> runtime power management for repliacator devices on ACPI based systems. >> >> The driver would try to enable the APB clock if available. Also, rename the >> code to reflect the fact that it now handles both static and dynamic >> replicators. >> >> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> >> Cc: Sudeep Holla <sudeep.holla@arm.com> > > Except the minor nit below which may apply also for few other patches > in the series > > Acked-by: Sudeep Holla <sudeep.holla@arm.com> # For ACPI related changes > Tested-by: Sudeep Holla <sudeep.holla@arm.com> # Boot and driver probe only > > [...] > >> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >> index b6be73034996..64de0bee02ec 100644 >> --- a/drivers/hwtracing/coresight/coresight-replicator.c >> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >> @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); >> struct replicator_drvdata { >> void __iomem *base; >> struct clk *atclk; >> + struct clk *pclk; > > [minor nit] Perhaps can be documented as well ? Sure, will add the following comment above the structure. @pclk: optional clock for the core parts of the replicator.
On 12/4/23 09:56, Anshuman Khandual wrote: > > > On 12/1/23 18:05, Sudeep Holla wrote: >> On Fri, Dec 01, 2023 at 11:50:47AM +0530, Anshuman Khandual wrote: >>> Add support for the dynamic replicator device in the platform driver, which >>> can then be used on ACPI based platforms. This change would now allow >>> runtime power management for repliacator devices on ACPI based systems. >>> >>> The driver would try to enable the APB clock if available. Also, rename the >>> code to reflect the fact that it now handles both static and dynamic >>> replicators. >>> >>> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> >>> Cc: Sudeep Holla <sudeep.holla@arm.com> >> >> Except the minor nit below which may apply also for few other patches >> in the series >> >> Acked-by: Sudeep Holla <sudeep.holla@arm.com> # For ACPI related changes >> Tested-by: Sudeep Holla <sudeep.holla@arm.com> # Boot and driver probe only >> >> [...] >> >>> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >>> index b6be73034996..64de0bee02ec 100644 >>> --- a/drivers/hwtracing/coresight/coresight-replicator.c >>> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >>> @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); >>> struct replicator_drvdata { >>> void __iomem *base; >>> struct clk *atclk; >>> + struct clk *pclk; >> >> [minor nit] Perhaps can be documented as well ? > > Sure, will add the following comment above the structure. > > @pclk: optional clock for the core parts of the replicator. My bad, this will be the following instead. diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 64de0bee02ec..44b9a77ec8aa 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -31,6 +31,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); * @base: memory mapped base address for this component. Also indicates * whether this one is programmable or not. * @atclk: optional clock for the core parts of the replicator. + * @pclk: APB clock if present, otherwise NULL * @csdev: component vitals needed by the framework * @spinlock: serialize enable/disable operations. * @check_idfilter_val: check if the context is lost upon clock removal. I will update replicator, tpiu, tmc, and stm devices. struct catu_drvdata and debug_drvdata do not have the comment section itself.
On 04/12/2023 04:48, Anshuman Khandual wrote: > > > On 12/4/23 09:56, Anshuman Khandual wrote: >> >> >> On 12/1/23 18:05, Sudeep Holla wrote: >>> On Fri, Dec 01, 2023 at 11:50:47AM +0530, Anshuman Khandual wrote: >>>> Add support for the dynamic replicator device in the platform driver, which >>>> can then be used on ACPI based platforms. This change would now allow >>>> runtime power management for repliacator devices on ACPI based systems. >>>> >>>> The driver would try to enable the APB clock if available. Also, rename the >>>> code to reflect the fact that it now handles both static and dynamic >>>> replicators. >>>> >>>> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> >>>> Cc: Sudeep Holla <sudeep.holla@arm.com> >>> >>> Except the minor nit below which may apply also for few other patches >>> in the series >>> >>> Acked-by: Sudeep Holla <sudeep.holla@arm.com> # For ACPI related changes >>> Tested-by: Sudeep Holla <sudeep.holla@arm.com> # Boot and driver probe only >>> >>> [...] >>> >>>> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >>>> index b6be73034996..64de0bee02ec 100644 >>>> --- a/drivers/hwtracing/coresight/coresight-replicator.c >>>> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >>>> @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); >>>> struct replicator_drvdata { >>>> void __iomem *base; >>>> struct clk *atclk; >>>> + struct clk *pclk; >>> >>> [minor nit] Perhaps can be documented as well ? >> >> Sure, will add the following comment above the structure. >> >> @pclk: optional clock for the core parts of the replicator. > > My bad, this will be the following instead. > > diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c > index 64de0bee02ec..44b9a77ec8aa 100644 > --- a/drivers/hwtracing/coresight/coresight-replicator.c > +++ b/drivers/hwtracing/coresight/coresight-replicator.c > @@ -31,6 +31,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); > * @base: memory mapped base address for this component. Also indicates > * whether this one is programmable or not. > * @atclk: optional clock for the core parts of the replicator. > + * @pclk: APB clock if present, otherwise NULL > * @csdev: component vitals needed by the framework > * @spinlock: serialize enable/disable operations. > * @check_idfilter_val: check if the context is lost upon clock removal. > > I will update replicator, tpiu, tmc, and stm devices. > funnel is missing it as well. If you build with W=1 it shows up. > struct catu_drvdata and debug_drvdata do not have the comment section itself. > _______________________________________________ > CoreSight mailing list -- coresight@lists.linaro.org > To unsubscribe send an email to coresight-leave@lists.linaro.org
On 12/4/23 15:27, James Clark wrote: > > On 04/12/2023 04:48, Anshuman Khandual wrote: >> >> On 12/4/23 09:56, Anshuman Khandual wrote: >>> >>> On 12/1/23 18:05, Sudeep Holla wrote: >>>> On Fri, Dec 01, 2023 at 11:50:47AM +0530, Anshuman Khandual wrote: >>>>> Add support for the dynamic replicator device in the platform driver, which >>>>> can then be used on ACPI based platforms. This change would now allow >>>>> runtime power management for repliacator devices on ACPI based systems. >>>>> >>>>> The driver would try to enable the APB clock if available. Also, rename the >>>>> code to reflect the fact that it now handles both static and dynamic >>>>> replicators. >>>>> >>>>> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> >>>>> Cc: Sudeep Holla <sudeep.holla@arm.com> >>>> Except the minor nit below which may apply also for few other patches >>>> in the series >>>> >>>> Acked-by: Sudeep Holla <sudeep.holla@arm.com> # For ACPI related changes >>>> Tested-by: Sudeep Holla <sudeep.holla@arm.com> # Boot and driver probe only >>>> >>>> [...] >>>> >>>>> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >>>>> index b6be73034996..64de0bee02ec 100644 >>>>> --- a/drivers/hwtracing/coresight/coresight-replicator.c >>>>> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >>>>> @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); >>>>> struct replicator_drvdata { >>>>> void __iomem *base; >>>>> struct clk *atclk; >>>>> + struct clk *pclk; >>>> [minor nit] Perhaps can be documented as well ? >>> Sure, will add the following comment above the structure. >>> >>> @pclk: optional clock for the core parts of the replicator. >> My bad, this will be the following instead. >> >> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >> index 64de0bee02ec..44b9a77ec8aa 100644 >> --- a/drivers/hwtracing/coresight/coresight-replicator.c >> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >> @@ -31,6 +31,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); >> * @base: memory mapped base address for this component. Also indicates >> * whether this one is programmable or not. >> * @atclk: optional clock for the core parts of the replicator. >> + * @pclk: APB clock if present, otherwise NULL >> * @csdev: component vitals needed by the framework >> * @spinlock: serialize enable/disable operations. >> * @check_idfilter_val: check if the context is lost upon clock removal. >> >> I will update replicator, tpiu, tmc, and stm devices. >> > funnel is missing it as well. If you build with W=1 it shows up. Updated, done.
diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index 171b5c2c7edd..270f4e3819a2 100644 --- a/drivers/acpi/arm64/amba.c +++ b/drivers/acpi/arm64/amba.c @@ -27,7 +27,6 @@ static const struct acpi_device_id amba_id_list[] = { {"ARMHC503", 0}, /* ARM CoreSight Debug */ {"ARMHC979", 0}, /* ARM CoreSight TPIU */ {"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */ - {"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */ {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ {"ARMHC9FF", 0}, /* ARM CoreSight Dynamic Funnel */ {"", 0}, diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index b6be73034996..64de0bee02ec 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -38,6 +38,7 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator"); struct replicator_drvdata { void __iomem *base; struct clk *atclk; + struct clk *pclk; struct coresight_device *csdev; spinlock_t spinlock; bool check_idfilter_val; @@ -243,6 +244,10 @@ static int replicator_probe(struct device *dev, struct resource *res) return ret; } + drvdata->pclk = coresight_get_enable_apb_pclk(dev); + if (IS_ERR(drvdata->pclk)) + return -ENODEV; + /* * Map the device base for dynamic-replicator, which has been * validated by AMBA core @@ -301,16 +306,16 @@ static int replicator_remove(struct device *dev) return 0; } -static int static_replicator_probe(struct platform_device *pdev) +static int replicator_platform_probe(struct platform_device *pdev) { + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); int ret; pm_runtime_get_noresume(&pdev->dev); pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); - /* Static replicators do not have programming base */ - ret = replicator_probe(&pdev->dev, NULL); + ret = replicator_probe(&pdev->dev, res); if (ret) { pm_runtime_put_noidle(&pdev->dev); @@ -320,7 +325,7 @@ static int static_replicator_probe(struct platform_device *pdev) return ret; } -static int static_replicator_remove(struct platform_device *pdev) +static int replicator_platform_remove(struct platform_device *pdev) { replicator_remove(&pdev->dev); pm_runtime_disable(&pdev->dev); @@ -335,6 +340,8 @@ static int replicator_runtime_suspend(struct device *dev) if (drvdata && !IS_ERR(drvdata->atclk)) clk_disable_unprepare(drvdata->atclk); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_disable_unprepare(drvdata->pclk); return 0; } @@ -345,6 +352,8 @@ static int replicator_runtime_resume(struct device *dev) if (drvdata && !IS_ERR(drvdata->atclk)) clk_prepare_enable(drvdata->atclk); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_prepare_enable(drvdata->pclk); return 0; } #endif @@ -354,31 +363,32 @@ static const struct dev_pm_ops replicator_dev_pm_ops = { replicator_runtime_resume, NULL) }; -static const struct of_device_id static_replicator_match[] = { +static const struct of_device_id replicator_match[] = { {.compatible = "arm,coresight-replicator"}, {.compatible = "arm,coresight-static-replicator"}, {} }; -MODULE_DEVICE_TABLE(of, static_replicator_match); +MODULE_DEVICE_TABLE(of, replicator_match); #ifdef CONFIG_ACPI -static const struct acpi_device_id static_replicator_acpi_ids[] = { +static const struct acpi_device_id replicator_acpi_ids[] = { {"ARMHC985", 0}, /* ARM CoreSight Static Replicator */ + {"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */ {} }; -MODULE_DEVICE_TABLE(acpi, static_replicator_acpi_ids); +MODULE_DEVICE_TABLE(acpi, replicator_acpi_ids); #endif -static struct platform_driver static_replicator_driver = { - .probe = static_replicator_probe, - .remove = static_replicator_remove, +static struct platform_driver replicator_driver = { + .probe = replicator_platform_probe, + .remove = replicator_platform_remove, .driver = { - .name = "coresight-static-replicator", + .name = "coresight-replicator", /* THIS_MODULE is taken care of by platform_driver_register() */ - .of_match_table = of_match_ptr(static_replicator_match), - .acpi_match_table = ACPI_PTR(static_replicator_acpi_ids), + .of_match_table = of_match_ptr(replicator_match), + .acpi_match_table = ACPI_PTR(replicator_acpi_ids), .pm = &replicator_dev_pm_ops, .suppress_bind_attrs = true, }, @@ -419,7 +429,7 @@ static int __init replicator_init(void) { int ret; - ret = platform_driver_register(&static_replicator_driver); + ret = platform_driver_register(&replicator_driver); if (ret) { pr_info("Error registering platform driver\n"); return ret; @@ -428,7 +438,7 @@ static int __init replicator_init(void) ret = amba_driver_register(&dynamic_replicator_driver); if (ret) { pr_info("Error registering amba driver\n"); - platform_driver_unregister(&static_replicator_driver); + platform_driver_unregister(&replicator_driver); } return ret; @@ -436,7 +446,7 @@ static int __init replicator_init(void) static void __exit replicator_exit(void) { - platform_driver_unregister(&static_replicator_driver); + platform_driver_unregister(&replicator_driver); amba_driver_unregister(&dynamic_replicator_driver); }
Add support for the dynamic replicator device in the platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for repliacator devices on ACPI based systems. The driver would try to enable the APB clock if available. Also, rename the code to reflect the fact that it now handles both static and dynamic replicators. Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Mike Leach <mike.leach@linaro.org> Cc: James Clark <james.clark@arm.com> Cc: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: coresight@lists.linaro.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- drivers/acpi/arm64/amba.c | 1 - .../coresight/coresight-replicator.c | 44 ++++++++++++------- 2 files changed, 27 insertions(+), 18 deletions(-)