There is an unbalanced pm_runtime_enable() in etm4_probe_platform_dev() when etm4_probe() fails. This problem can be observed via the coresight etm4 module's (load -> unload -> load) sequence when etm4_probe() fails in etm4_probe_platform_dev().

[ 63.379943] coresight-etm4x 7040000.etm: Unbalanced pm_runtime_enable! [ 63.393630] coresight-etm4x 7140000.etm: Unbalanced pm_runtime_enable! [ 63.407455] coresight-etm4x 7240000.etm: Unbalanced pm_runtime_enable! [ 63.420983] coresight-etm4x 7340000.etm: Unbalanced pm_runtime_enable! [ 63.420999] coresight-etm4x 7440000.etm: Unbalanced pm_runtime_enable! [ 63.441209] coresight-etm4x 7540000.etm: Unbalanced pm_runtime_enable! [ 63.454689] coresight-etm4x 7640000.etm: Unbalanced pm_runtime_enable! [ 63.474982] coresight-etm4x 7740000.etm: Unbalanced pm_runtime_enable!

This fixes the above problem - with an explicit pm_runtime_disable() call when etm4_probe() fails during etm4_probe_platform_dev().

Cc: Lorenzo Pieralisi lpieralisi@kernel.org Cc: Hanjun Guo guohanjun@huawei.com Cc: Sudeep Holla sudeep.holla@arm.com Cc: "Rafael J. Wysocki" rafael@kernel.org Cc: Len Brown lenb@kernel.org Cc: Suzuki K Poulose suzuki.poulose@arm.com Cc: Mike Leach mike.leach@linaro.org Cc: James Clark james.clark@arm.com Cc: Leo Yan leo.yan@linaro.org Cc: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: coresight@lists.linaro.org Fixes: 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Added "Fixes:" tag

drivers/hwtracing/coresight/coresight-etm4x-core.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index ce1995a2827f..7c693b45ac05 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -2217,6 +2217,9 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) ret = etm4_probe(&pdev->dev);

pm_runtime_put(&pdev->dev); + if (ret) + pm_runtime_disable(&pdev->dev); + return ret; }

This extracts device properties from AMBA pid based table lookup. But first this modifies tmc_etr_setup_caps() to accept csdev access.

Cc: Suzuki K Poulose suzuki.poulose@arm.com Cc: Mike Leach mike.leach@linaro.org Cc: James Clark james.clark@arm.com Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Modified tmc_etr_setup_caps() to accept struct csdev_access argument - Reverted back tmc_etr_setup_caps() call site position in tmc_probe() - Dropped custom mask TMC_AMBA_MASK

drivers/hwtracing/coresight/coresight-tmc-core.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index 7ec5365e2b64..43874fa4def0 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -370,16 +370,23 @@ static inline bool tmc_etr_has_non_secure_access(struct tmc_drvdata *drvdata) return (auth & TMC_AUTH_NSID_MASK) == 0x3; }

+static const struct amba_id tmc_ids[]; + /* Detect and initialise the capabilities of a TMC ETR */ -static int tmc_etr_setup_caps(struct device *parent, u32 devid, void *dev_caps) +static int tmc_etr_setup_caps(struct device *parent, u32 devid, + struct csdev_access *access) { int rc; - u32 dma_mask = 0; + u32 tmc_pid, dma_mask = 0; struct tmc_drvdata *drvdata = dev_get_drvdata(parent); + void *dev_caps;

if (!tmc_etr_has_non_secure_access(drvdata)) return -EACCES;

+ tmc_pid = coresight_get_pid(access); + dev_caps = coresight_get_uci_data_from_amba(tmc_ids, tmc_pid); + /* Set the unadvertised capabilities */ tmc_etr_init_caps(drvdata, (u32)(unsigned long)dev_caps);

@@ -497,8 +504,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) desc.type = CORESIGHT_DEV_TYPE_SINK; desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_SYSMEM; desc.ops = &tmc_etr_cs_ops; - ret = tmc_etr_setup_caps(dev, devid, - coresight_get_uci_data(id)); + ret = tmc_etr_setup_caps(dev, devid, &desc.access); if (ret) goto out; idr_init(&drvdata->idr);

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 replicator 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. But first this refactors replicator_probe() making sure it can be used both for platform and AMBA drivers, by moving the pm_runtime_put() to the callers.

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 Tested-by: Sudeep Holla sudeep.holla@arm.com # Boot and driver probe only Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Updated the commit message regarding replicator_probe() refactoring - coresight_[init|remove]_driver() replacement has been folded earlier

drivers/acpi/arm64/amba.c | 1 - .../coresight/coresight-replicator.c | 67 ++++++++++++------- 2 files changed, 43 insertions(+), 25 deletions(-)

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 b82cf9906cfb..9b5f52725f43 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. @@ -38,6 +39,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 +245,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 @@ -285,7 +291,6 @@ static int replicator_probe(struct device *dev, struct resource *res) }

replicator_reset(drvdata); - pm_runtime_put(dev);

out_disable_clk: if (ret && !IS_ERR_OR_NULL(drvdata->atclk)) @@ -301,29 +306,33 @@ 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); - - if (ret) { - pm_runtime_put_noidle(&pdev->dev); + ret = replicator_probe(&pdev->dev, res); + pm_runtime_put(&pdev->dev); + if (ret) pm_runtime_disable(&pdev->dev); - }

return ret; }

-static void static_replicator_remove(struct platform_device *pdev) +static void replicator_platform_remove(struct platform_device *pdev) { - replicator_remove(&pdev->dev); + struct replicator_drvdata *drvdata = dev_get_drvdata(&pdev->dev); + + if (drvdata) + replicator_remove(&pdev->dev); + pm_runtime_disable(&pdev->dev); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_put(drvdata->pclk); }

#ifdef CONFIG_PM @@ -334,6 +343,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; }

@@ -344,6 +355,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 @@ -353,31 +366,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_new = static_replicator_remove, +static struct platform_driver replicator_driver = { + .probe = replicator_platform_probe, + .remove_new = 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, }, @@ -386,7 +400,13 @@ static struct platform_driver static_replicator_driver = { static int dynamic_replicator_probe(struct amba_device *adev, const struct amba_id *id) { - return replicator_probe(&adev->dev, &adev->res); + int ret; + + ret = replicator_probe(&adev->dev, &adev->res); + if (!ret) + pm_runtime_put(&adev->dev); + + return ret; }

static void dynamic_replicator_remove(struct amba_device *adev) @@ -416,13 +436,12 @@ static struct amba_driver dynamic_replicator_driver = {

static int __init replicator_init(void) { - return coresight_init_driver("replicator", &dynamic_replicator_driver, - &static_replicator_driver); + return coresight_init_driver("replicator", &dynamic_replicator_driver, &replicator_driver); }

static void __exit replicator_exit(void) { - coresight_remove_driver(&dynamic_replicator_driver, &static_replicator_driver); + coresight_remove_driver(&dynamic_replicator_driver, &replicator_driver); }

module_init(replicator_init);

Add support for the catu devices in a new platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors catu_probe() and catu_remove(), making sure it can be used both for platform and AMBA drivers. This also moves pm_runtime_put() from catu_probe() to the callers.

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 Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Updated commit message regarding catu_probe/remove() refactoring and renaming

drivers/acpi/arm64/amba.c | 1 - drivers/hwtracing/coresight/coresight-catu.c | 142 ++++++++++++++++--- drivers/hwtracing/coresight/coresight-catu.h | 1 + 3 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index afb6afb66967..587061b0fd2f 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 */ - {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ {"", 0}, };

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 3949ded0d4fa..a3ea46b53898 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -7,6 +7,8 @@ * Author: Suzuki K Poulose suzuki.poulose@arm.com */

+#include <linux/platform_device.h> +#include <linux/acpi.h> #include <linux/amba/bus.h> #include <linux/device.h> #include <linux/dma-mapping.h> @@ -502,28 +504,20 @@ static const struct coresight_ops catu_ops = { .helper_ops = &catu_helper_ops, };

-static int catu_probe(struct amba_device *adev, const struct amba_id *id) +static int __catu_probe(struct device *dev, struct resource *res) { int ret = 0; u32 dma_mask; - struct catu_drvdata *drvdata; + struct catu_drvdata *drvdata = dev_get_drvdata(dev); struct coresight_desc catu_desc; struct coresight_platform_data *pdata = NULL; - struct device *dev = &adev->dev; void __iomem *base;

catu_desc.name = coresight_alloc_device_name(&catu_devs, dev); if (!catu_desc.name) return -ENOMEM;

- drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) { - ret = -ENOMEM; - goto out; - } - - dev_set_drvdata(dev, drvdata); - base = devm_ioremap_resource(dev, &adev->res); + base = devm_ioremap_resource(dev, res); if (IS_ERR(base)) { ret = PTR_ERR(base); goto out; @@ -567,19 +561,39 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) drvdata->csdev = coresight_register(&catu_desc); if (IS_ERR(drvdata->csdev)) ret = PTR_ERR(drvdata->csdev); - else - pm_runtime_put(&adev->dev); out: return ret; }

-static void catu_remove(struct amba_device *adev) +static int catu_probe(struct amba_device *adev, const struct amba_id *id) { - struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev); + struct catu_drvdata *drvdata; + int ret; + + drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + amba_set_drvdata(adev, drvdata); + ret = __catu_probe(&adev->dev, &adev->res); + if (!ret) + pm_runtime_put(&adev->dev); + + return ret; +} + +static void __catu_remove(struct device *dev) +{ + struct catu_drvdata *drvdata = dev_get_drvdata(dev);

coresight_unregister(drvdata->csdev); }

+static void catu_remove(struct amba_device *adev) +{ + __catu_remove(&adev->dev); +} + static struct amba_id catu_ids[] = { CS_AMBA_ID(0x000bb9ee), {}, @@ -598,13 +612,103 @@ static struct amba_driver catu_driver = { .id_table = catu_ids, };

+static int catu_platform_probe(struct platform_device *pdev) +{ + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + struct catu_drvdata *drvdata; + int ret = 0; + + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev); + if (IS_ERR(drvdata->pclk)) + return -ENODEV; + + if (res) { + drvdata->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(drvdata->base)) { + clk_put(drvdata->pclk); + return PTR_ERR(drvdata->base); + } + } + + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + dev_set_drvdata(&pdev->dev, drvdata); + ret = __catu_probe(&pdev->dev, res); + pm_runtime_put(&pdev->dev); + if (ret) + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static int catu_platform_remove(struct platform_device *pdev) +{ + struct catu_drvdata *drvdata = dev_get_drvdata(&pdev->dev); + + if (drvdata) + __catu_remove(&pdev->dev); + + pm_runtime_disable(&pdev->dev); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_put(drvdata->pclk); + return 0; +} + +#ifdef CONFIG_PM +static int catu_runtime_suspend(struct device *dev) +{ + struct catu_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_disable_unprepare(drvdata->pclk); + return 0; +} + +static int catu_runtime_resume(struct device *dev) +{ + struct catu_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_prepare_enable(drvdata->pclk); + return 0; +} +#endif + +static const struct dev_pm_ops catu_dev_pm_ops = { + SET_RUNTIME_PM_OPS(catu_runtime_suspend, catu_runtime_resume, NULL) +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id catu_acpi_ids[] = { + {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ + {}, +}; + +MODULE_DEVICE_TABLE(acpi, catu_acpi_ids); +#endif + +static struct platform_driver catu_platform_driver = { + .probe = catu_platform_probe, + .remove = catu_platform_remove, + .driver = { + .name = "coresight-catu-platform", + .acpi_match_table = ACPI_PTR(catu_acpi_ids), + .suppress_bind_attrs = true, + .pm = &catu_dev_pm_ops, + }, +}; + static int __init catu_init(void) { int ret;

- ret = amba_driver_register(&catu_driver); - if (ret) - pr_info("Error registering catu driver\n"); + ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver); tmc_etr_set_catu_ops(&etr_catu_buf_ops); return ret; } @@ -612,7 +716,7 @@ static int __init catu_init(void) static void __exit catu_exit(void) { tmc_etr_remove_catu_ops(); - amba_driver_unregister(&catu_driver); + coresight_remove_driver(&catu_driver, &catu_platform_driver); }

module_init(catu_init); diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h index 442e034bbfba..141feac1c14b 100644 --- a/drivers/hwtracing/coresight/coresight-catu.h +++ b/drivers/hwtracing/coresight/coresight-catu.h @@ -61,6 +61,7 @@ #define CATU_IRQEN_OFF 0x0

struct catu_drvdata { + struct clk *pclk; void __iomem *base; struct coresight_device *csdev; int irq;

Add support for the tmc devices in the platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors tmc_probe() and tmc_remove(), making sure it can be used both for platform and AMBA drivers. This also moves pm_runtime_put() from tmc_probe() to the callers.

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 Tested-by: Sudeep Holla sudeep.holla@arm.com # Boot and driver probe only Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Updated the commit message regarding tmc_probe/remove() refactoring and renaming

drivers/acpi/arm64/amba.c | 2 - .../hwtracing/coresight/coresight-tmc-core.c | 139 ++++++++++++++++-- drivers/hwtracing/coresight/coresight-tmc.h | 2 + 3 files changed, 126 insertions(+), 17 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index 6d24a8f7914b..d3c1defa7bc8 100644 --- a/drivers/acpi/arm64/amba.c +++ b/drivers/acpi/arm64/amba.c @@ -22,10 +22,8 @@ static const struct acpi_device_id amba_id_list[] = { {"ARMH0061", 0}, /* PL061 GPIO Device */ {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */ - {"ARMHC501", 0}, /* ARM CoreSight ETR */ {"ARMHC502", 0}, /* ARM CoreSight STM */ {"ARMHC503", 0}, /* ARM CoreSight Debug */ - {"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */ {"", 0}, };

diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index 43874fa4def0..9711fdd74a15 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -24,6 +24,8 @@ #include <linux/of.h> #include <linux/coresight.h> #include <linux/amba/bus.h> +#include <linux/platform_device.h> +#include <linux/acpi.h>

#include "coresight-priv.h" #include "coresight-tmc.h" @@ -444,24 +446,17 @@ static u32 tmc_etr_get_max_burst_size(struct device *dev) return burst_size; }

-static int tmc_probe(struct amba_device *adev, const struct amba_id *id) +static int __tmc_probe(struct device *dev, struct resource *res) { int ret = 0; u32 devid; void __iomem *base; - struct device *dev = &adev->dev; struct coresight_platform_data *pdata = NULL; - struct tmc_drvdata *drvdata; - struct resource *res = &adev->res; + struct tmc_drvdata *drvdata = dev_get_drvdata(dev); struct coresight_desc desc = { 0 }; struct coresight_dev_list *dev_list = NULL;

ret = -ENOMEM; - drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) - goto out; - - dev_set_drvdata(dev, drvdata);

/* Validity for the resource is already checked by the AMBA core */ base = devm_ioremap_resource(dev, res); @@ -536,7 +531,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) ret = PTR_ERR(pdata); goto out; } - adev->dev.platform_data = pdata; + dev->platform_data = pdata; desc.pdata = pdata;

drvdata->csdev = coresight_register(&desc); @@ -551,12 +546,27 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) ret = misc_register(&drvdata->miscdev); if (ret) coresight_unregister(drvdata->csdev); - else - pm_runtime_put(&adev->dev); out: return ret; }

+static int tmc_probe(struct amba_device *adev, const struct amba_id *id) +{ + struct tmc_drvdata *drvdata; + int ret; + + drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + amba_set_drvdata(adev, drvdata); + ret = __tmc_probe(&adev->dev, &adev->res); + if (!ret) + pm_runtime_put(&adev->dev); + + return ret; +} + static void tmc_shutdown(struct amba_device *adev) { unsigned long flags; @@ -579,9 +589,9 @@ static void tmc_shutdown(struct amba_device *adev) spin_unlock_irqrestore(&drvdata->spinlock, flags); }

-static void tmc_remove(struct amba_device *adev) +static void __tmc_remove(struct device *dev) { - struct tmc_drvdata *drvdata = dev_get_drvdata(&adev->dev); + struct tmc_drvdata *drvdata = dev_get_drvdata(dev);

/* * Since misc_open() holds a refcount on the f_ops, which is @@ -592,6 +602,11 @@ static void tmc_remove(struct amba_device *adev) coresight_unregister(drvdata->csdev); }

+static void tmc_remove(struct amba_device *adev) +{ + __tmc_remove(&adev->dev); +} + static const struct amba_id tmc_ids[] = { CS_AMBA_ID(0x000bb961), /* Coresight SoC 600 TMC-ETR/ETS */ @@ -617,7 +632,101 @@ static struct amba_driver tmc_driver = { .id_table = tmc_ids, };

-module_amba_driver(tmc_driver); +static int tmc_platform_probe(struct platform_device *pdev) +{ + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + struct tmc_drvdata *drvdata; + int ret = 0; + + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev); + if (IS_ERR(drvdata->pclk)) + return -ENODEV; + + dev_set_drvdata(&pdev->dev, drvdata); + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + ret = __tmc_probe(&pdev->dev, res); + pm_runtime_put(&pdev->dev); + if (ret) + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static int tmc_platform_remove(struct platform_device *pdev) +{ + struct tmc_drvdata *drvdata = dev_get_drvdata(&pdev->dev); + + if (drvdata) + __tmc_remove(&pdev->dev); + + pm_runtime_disable(&pdev->dev); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_put(drvdata->pclk); + return 0; +} + +#ifdef CONFIG_PM +static int tmc_runtime_suspend(struct device *dev) +{ + struct tmc_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_disable_unprepare(drvdata->pclk); + return 0; +} + +static int tmc_runtime_resume(struct device *dev) +{ + struct tmc_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_prepare_enable(drvdata->pclk); + return 0; +} +#endif + +static const struct dev_pm_ops tmc_dev_pm_ops = { + SET_RUNTIME_PM_OPS(tmc_runtime_suspend, tmc_runtime_resume, NULL) +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id tmc_acpi_ids[] = { + {"ARMHC501", 0}, /* ARM CoreSight ETR */ + {"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */ + {}, +}; +MODULE_DEVICE_TABLE(acpi, tmc_acpi_ids); +#endif + +static struct platform_driver tmc_platform_driver = { + .probe = tmc_platform_probe, + .remove = tmc_platform_remove, + .driver = { + .name = "coresight-tmc-platform", + .acpi_match_table = ACPI_PTR(tmc_acpi_ids), + .suppress_bind_attrs = true, + .pm = &tmc_dev_pm_ops, + }, +}; + +static int __init tmc_init(void) +{ + return coresight_init_driver("tmc", &tmc_driver, &tmc_platform_driver); +} + +static void __exit tmc_exit(void) +{ + coresight_remove_driver(&tmc_driver, &tmc_platform_driver); +} +module_init(tmc_init); +module_exit(tmc_exit);

MODULE_AUTHOR("Pratik Patel pratikp@codeaurora.org"); MODULE_DESCRIPTION("Arm CoreSight Trace Memory Controller driver"); diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h index 8dcb426ac3e7..cb5a0920c203 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.h +++ b/drivers/hwtracing/coresight/coresight-tmc.h @@ -166,6 +166,7 @@ struct etr_buf {

/** * struct tmc_drvdata - specifics associated to an TMC component + * @pclk: APB clock if present, otherwise NULL * @base: memory mapped base address for this component. * @csdev: component vitals needed by the framework. * @miscdev: specifics to handle "/dev/xyz.tmc" entry. @@ -190,6 +191,7 @@ struct etr_buf { * @perf_buf: PERF buffer for ETR. */ struct tmc_drvdata { + struct clk *pclk; void __iomem *base; struct coresight_device *csdev; struct miscdevice miscdev;

Add support for the cpu debug devices in a new platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors debug_probe() and debug_remove(), making sure they can be used both for platform and AMBA drivers.

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 Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com --- Changes in V5:

- Updated commit message regarding debug_probe/remove() refactoring - Replaced device name s/tmc/debug in coresight_init_driver()

drivers/acpi/arm64/amba.c | 1 - .../hwtracing/coresight/coresight-cpu-debug.c | 141 ++++++++++++++++-- 2 files changed, 127 insertions(+), 15 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index bec0976541da..e1f0bbb8f393 100644 --- a/drivers/acpi/arm64/amba.c +++ b/drivers/acpi/arm64/amba.c @@ -22,7 +22,6 @@ static const struct acpi_device_id amba_id_list[] = { {"ARMH0061", 0}, /* PL061 GPIO Device */ {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */ - {"ARMHC503", 0}, /* ARM CoreSight Debug */ {"", 0}, };

diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c index 1874df7c6a73..e56a4b9ebd22 100644 --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c @@ -23,6 +23,8 @@ #include <linux/smp.h> #include <linux/types.h> #include <linux/uaccess.h> +#include <linux/platform_device.h> +#include <linux/acpi.h>

#include "coresight-priv.h"

@@ -84,6 +86,7 @@ #define DEBUG_WAIT_TIMEOUT 32000

struct debug_drvdata { + struct clk *pclk; void __iomem *base; struct device *dev; int cpu; @@ -557,18 +560,12 @@ static void debug_func_exit(void) debugfs_remove_recursive(debug_debugfs_dir); }

-static int debug_probe(struct amba_device *adev, const struct amba_id *id) +static int __debug_probe(struct device *dev, struct resource *res) { + struct debug_drvdata *drvdata = dev_get_drvdata(dev); void __iomem *base; - struct device *dev = &adev->dev; - struct debug_drvdata *drvdata; - struct resource *res = &adev->res; int ret;

- drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) - return -ENOMEM; - drvdata->cpu = coresight_get_cpu(dev); if (drvdata->cpu < 0) return drvdata->cpu; @@ -579,8 +576,7 @@ static int debug_probe(struct amba_device *adev, const struct amba_id *id) return -EBUSY; }

- drvdata->dev = &adev->dev; - amba_set_drvdata(adev, drvdata); + drvdata->dev = dev;

/* Validity for the resource is already checked by the AMBA core */ base = devm_ioremap_resource(dev, res); @@ -629,10 +625,21 @@ static int debug_probe(struct amba_device *adev, const struct amba_id *id) return ret; }

-static void debug_remove(struct amba_device *adev) +static int debug_probe(struct amba_device *adev, const struct amba_id *id) +{ + struct debug_drvdata *drvdata; + + drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + amba_set_drvdata(adev, drvdata); + return __debug_probe(&adev->dev, &adev->res); +} + +static void __debug_remove(struct device *dev) { - struct device *dev = &adev->dev; - struct debug_drvdata *drvdata = amba_get_drvdata(adev); + struct debug_drvdata *drvdata = dev_get_drvdata(dev);

per_cpu(debug_drvdata, drvdata->cpu) = NULL;

@@ -646,6 +653,11 @@ static void debug_remove(struct amba_device *adev) debug_func_exit(); }

+static void debug_remove(struct amba_device *adev) +{ + __debug_remove(&adev->dev); +} + static const struct amba_cs_uci_id uci_id_debug[] = { { /* CPU Debug UCI data */ @@ -677,7 +689,108 @@ static struct amba_driver debug_driver = { .id_table = debug_ids, };

-module_amba_driver(debug_driver); +static int debug_platform_probe(struct platform_device *pdev) +{ + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + struct debug_drvdata *drvdata; + int ret = 0; + + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev); + if (IS_ERR(drvdata->pclk)) + return -ENODEV; + + if (res) { + drvdata->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(drvdata->base)) { + clk_put(drvdata->pclk); + return PTR_ERR(drvdata->base); + } + } + + dev_set_drvdata(&pdev->dev, drvdata); + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + ret = __debug_probe(&pdev->dev, res); + if (ret) { + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + } + return ret; +} + +static int debug_platform_remove(struct platform_device *pdev) +{ + struct debug_drvdata *drvdata = dev_get_drvdata(&pdev->dev); + + if (drvdata) + __debug_remove(&pdev->dev); + + pm_runtime_disable(&pdev->dev); + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_put(drvdata->pclk); + return 0; +} + +#ifdef CONFIG_ACPI +static const struct acpi_device_id debug_platform_ids[] = { + {"ARMHC503", 0}, /* ARM CoreSight Debug */ + {}, +}; +MODULE_DEVICE_TABLE(acpi, debug_platform_ids); +#endif + +#ifdef CONFIG_PM +static int debug_runtime_suspend(struct device *dev) +{ + struct debug_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_disable_unprepare(drvdata->pclk); + return 0; +} + +static int debug_runtime_resume(struct device *dev) +{ + struct debug_drvdata *drvdata = dev_get_drvdata(dev); + + if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) + clk_prepare_enable(drvdata->pclk); + return 0; +} +#endif + +static const struct dev_pm_ops debug_dev_pm_ops = { + SET_RUNTIME_PM_OPS(debug_runtime_suspend, debug_runtime_resume, NULL) +}; + +static struct platform_driver debug_platform_driver = { + .probe = debug_platform_probe, + .remove = debug_platform_remove, + .driver = { + .name = "coresight-debug-platform", + .acpi_match_table = ACPI_PTR(debug_platform_ids), + .suppress_bind_attrs = true, + .pm = &debug_dev_pm_ops, + }, +}; + +static int __init debug_init(void) +{ + return coresight_init_driver("debug", &debug_driver, &debug_platform_driver); +} + +static void __exit debug_exit(void) +{ + coresight_remove_driver(&debug_driver, &debug_platform_driver); +} +module_init(debug_init); +module_exit(debug_exit);

MODULE_AUTHOR("Leo Yan leo.yan@linaro.org"); MODULE_DESCRIPTION("ARM Coresight CPU Debug Driver");

On 22/02/2024 08:21, Anshuman Khandual wrote:

Add support for the catu devices in a new platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors catu_probe() and catu_remove(), making sure it can be used both for platform and AMBA drivers. This also moves pm_runtime_put() from catu_probe() to the callers.

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 Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com

---

Changes in V5:

• Updated commit message regarding catu_probe/remove() refactoring and renaming

  drivers/acpi/arm64/amba.c | 1 - drivers/hwtracing/coresight/coresight-catu.c | 142 ++++++++++++++++--- drivers/hwtracing/coresight/coresight-catu.h | 1 + 3 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index afb6afb66967..587061b0fd2f 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 */

• {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ {"", 0}, };

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 3949ded0d4fa..a3ea46b53898 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -7,6 +7,8 @@

• Author: Suzuki K Poulose suzuki.poulose@arm.com

*/ +#include <linux/platform_device.h> +#include <linux/acpi.h> #include <linux/amba/bus.h> #include <linux/device.h> #include <linux/dma-mapping.h> @@ -502,28 +504,20 @@ static const struct coresight_ops catu_ops = { .helper_ops = &catu_helper_ops, }; -static int catu_probe(struct amba_device *adev, const struct amba_id *id) +static int __catu_probe(struct device *dev, struct resource *res) { int ret = 0; u32 dma_mask;

• struct catu_drvdata *drvdata;

• struct catu_drvdata *drvdata = dev_get_drvdata(dev); struct coresight_desc catu_desc; struct coresight_platform_data *pdata = NULL;

• struct device *dev = &adev->dev; void __iomem *base;

catu_desc.name = coresight_alloc_device_name(&catu_devs, dev); if (!catu_desc.name) return -ENOMEM;

• drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
• if (!drvdata) {

• ret = -ENOMEM;
  

• goto out;
  

• }
• dev_set_drvdata(dev, drvdata);
• base = devm_ioremap_resource(dev, &adev->res);

• base = devm_ioremap_resource(dev, res); if (IS_ERR(base)) { ret = PTR_ERR(base); goto out;

@@ -567,19 +561,39 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) drvdata->csdev = coresight_register(&catu_desc); if (IS_ERR(drvdata->csdev)) ret = PTR_ERR(drvdata->csdev);

• else

• pm_runtime_put(&adev->dev);
  

  out: return ret; }

-static void catu_remove(struct amba_device *adev) +static int catu_probe(struct amba_device *adev, const struct amba_id *id) {

• struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev);

• struct catu_drvdata *drvdata;
• int ret;
• drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL);
• if (!drvdata)

• return -ENOMEM;
  

• amba_set_drvdata(adev, drvdata);
• ret = __catu_probe(&adev->dev, &adev->res);
• if (!ret)

• pm_runtime_put(&adev->dev);
  

• return ret;

+}

+static void __catu_remove(struct device *dev) +{

• struct catu_drvdata *drvdata = dev_get_drvdata(dev);

coresight_unregister(drvdata->csdev); } +static void catu_remove(struct amba_device *adev) +{

• __catu_remove(&adev->dev);

+}

• static struct amba_id catu_ids[] = { CS_AMBA_ID(0x000bb9ee), {},

@@ -598,13 +612,103 @@ static struct amba_driver catu_driver = { .id_table = catu_ids, }; +static int catu_platform_probe(struct platform_device *pdev) +{

• struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
• struct catu_drvdata *drvdata;
• int ret = 0;
• drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
• if (!drvdata)

• return -ENOMEM;
  

• drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev);
• if (IS_ERR(drvdata->pclk))

• return -ENODEV;
  

---8>---

• if (res) {

• drvdata->base = devm_ioremap_resource(&pdev->dev, res);
  

• if (IS_ERR(drvdata->base)) {
  

• 	clk_put(drvdata->pclk);
  

• 	return PTR_ERR(drvdata->base);
  

• }
  

• }

---<8---

The above section seems unncessary as we already try to map the base in __catu_probe ?

• pm_runtime_get_noresume(&pdev->dev);
• pm_runtime_set_active(&pdev->dev);
• pm_runtime_enable(&pdev->dev);
• dev_set_drvdata(&pdev->dev, drvdata);
• ret = __catu_probe(&pdev->dev, res);
• pm_runtime_put(&pdev->dev);
• if (ret)

• pm_runtime_disable(&pdev->dev);
  

• return ret;

+}

+static int catu_platform_remove(struct platform_device *pdev) +{

• struct catu_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
• if (drvdata)

• __catu_remove(&pdev->dev);
  

I don't understand the need for if () check here (and on all the other drivers). Even if we have a drvdata != NULL, what guarantees that the drvdata->csdev is valid (which is used in xx_remove) ?

Suzuki

• pm_runtime_disable(&pdev->dev);
• if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))

• clk_put(drvdata->pclk);
  

• return 0;

+}

+#ifdef CONFIG_PM +static int catu_runtime_suspend(struct device *dev) +{

• struct catu_drvdata *drvdata = dev_get_drvdata(dev);
• if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))

• clk_disable_unprepare(drvdata->pclk);
  

• return 0;

+}

+static int catu_runtime_resume(struct device *dev) +{

• struct catu_drvdata *drvdata = dev_get_drvdata(dev);
• if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))

• clk_prepare_enable(drvdata->pclk);
  

• return 0;

+} +#endif

+static const struct dev_pm_ops catu_dev_pm_ops = {

• SET_RUNTIME_PM_OPS(catu_runtime_suspend, catu_runtime_resume, NULL)

+};

+#ifdef CONFIG_ACPI +static const struct acpi_device_id catu_acpi_ids[] = {

• {"ARMHC9CA", 0}, /* ARM CoreSight CATU */
• {},

+};

+MODULE_DEVICE_TABLE(acpi, catu_acpi_ids); +#endif

+static struct platform_driver catu_platform_driver = {

• .probe = catu_platform_probe,
• .remove = catu_platform_remove,
• .driver = {

• .name			= "coresight-catu-platform",
  

• .acpi_match_table	= ACPI_PTR(catu_acpi_ids),
  

• .suppress_bind_attrs	= true,
  

• .pm			= &catu_dev_pm_ops,
  

• },

+};

• static int __init catu_init(void) { int ret;

• ret = amba_driver_register(&catu_driver);
• if (ret)

• pr_info("Error registering catu driver\n");
  

• ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver); tmc_etr_set_catu_ops(&etr_catu_buf_ops); return ret; }

@@ -612,7 +716,7 @@ static int __init catu_init(void) static void __exit catu_exit(void) { tmc_etr_remove_catu_ops();

• amba_driver_unregister(&catu_driver);

• coresight_remove_driver(&catu_driver, &catu_platform_driver); }

module_init(catu_init); diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h index 442e034bbfba..141feac1c14b 100644 --- a/drivers/hwtracing/coresight/coresight-catu.h +++ b/drivers/hwtracing/coresight/coresight-catu.h @@ -61,6 +61,7 @@ #define CATU_IRQEN_OFF 0x0 struct catu_drvdata {

• struct clk *pclk; void __iomem *base; struct coresight_device *csdev; int irq;

On 3/5/24 20:06, Suzuki K Poulose wrote:

On 22/02/2024 08:21, Anshuman Khandual wrote:

...

This extracts device properties from AMBA pid based table lookup. But first this modifies tmc_etr_setup_caps() to accept csdev access.

Cc: Suzuki K Poulose suzuki.poulose@arm.com Cc: Mike Leach mike.leach@linaro.org Cc: James Clark james.clark@arm.com Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: James Clark james.clark@arm.com

minor nit: Since there were significant changes from what James previously reviewed, it is a good idea to drop his Reviewed-by:

Sure, will do.

Otherwise, the changes look good to me.

Suzuki

...

Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com

Changes in V5:

• Modified tmc_etr_setup_caps() to accept struct csdev_access argument
• Reverted back tmc_etr_setup_caps() call site position in tmc_probe()
• Dropped custom mask TMC_AMBA_MASK

drivers/hwtracing/coresight/coresight-tmc-core.c | 14 ++++++++++----   1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index 7ec5365e2b64..43874fa4def0 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -370,16 +370,23 @@ static inline bool tmc_etr_has_non_secure_access(struct tmc_drvdata *drvdata)       return (auth & TMC_AUTH_NSID_MASK) == 0x3;   }   +static const struct amba_id tmc_ids[];

/* Detect and initialise the capabilities of a TMC ETR */ -static int tmc_etr_setup_caps(struct device *parent, u32 devid, void *dev_caps) +static int tmc_etr_setup_caps(struct device *parent, u32 devid, +                  struct csdev_access *access)   {       int rc; -    u32 dma_mask = 0; +    u32 tmc_pid, dma_mask = 0;       struct tmc_drvdata *drvdata = dev_get_drvdata(parent); +    void *dev_caps;         if (!tmc_etr_has_non_secure_access(drvdata))           return -EACCES;   +    tmc_pid = coresight_get_pid(access); +    dev_caps = coresight_get_uci_data_from_amba(tmc_ids, tmc_pid);

/* Set the unadvertised capabilities */       tmc_etr_init_caps(drvdata, (u32)(unsigned long)dev_caps);   @@ -497,8 +504,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)           desc.type = CORESIGHT_DEV_TYPE_SINK;           desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_SYSMEM;           desc.ops = &tmc_etr_cs_ops; -        ret = tmc_etr_setup_caps(dev, devid, -                     coresight_get_uci_data(id)); +        ret = tmc_etr_setup_caps(dev, devid, &desc.access);           if (ret)               goto out;           idr_init(&drvdata->idr);

On 06/03/2024 06:14, Anshuman Khandual wrote:

On 3/5/24 23:02, Suzuki K Poulose wrote:

...

On 22/02/2024 08:21, Anshuman Khandual wrote:

...

Add support for the catu devices in a new platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors catu_probe() and catu_remove(), making sure it can be used both for platform and AMBA drivers. This also moves pm_runtime_put() from catu_probe() to the callers.

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 Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com

---

Changes in V5:

• Updated commit message regarding catu_probe/remove() refactoring and renaming

drivers/acpi/arm64/amba.c                    |   1 -   drivers/hwtracing/coresight/coresight-catu.c | 142 ++++++++++++++++---   drivers/hwtracing/coresight/coresight-catu.h |   1 +   3 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index afb6afb66967..587061b0fd2f 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 */ -    {"ARMHC9CA", 0}, /* ARM CoreSight CATU */       {"", 0},   };   diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 3949ded0d4fa..a3ea46b53898 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -7,6 +7,8 @@    * Author: Suzuki K Poulose suzuki.poulose@arm.com    */   +#include <linux/platform_device.h> +#include <linux/acpi.h>   #include <linux/amba/bus.h>   #include <linux/device.h>   #include <linux/dma-mapping.h> @@ -502,28 +504,20 @@ static const struct coresight_ops catu_ops = {       .helper_ops = &catu_helper_ops,   };   -static int catu_probe(struct amba_device *adev, const struct amba_id *id) +static int __catu_probe(struct device *dev, struct resource *res)   {       int ret = 0;       u32 dma_mask; -    struct catu_drvdata *drvdata; +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);       struct coresight_desc catu_desc;       struct coresight_platform_data *pdata = NULL; -    struct device *dev = &adev->dev;       void __iomem *base;         catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);       if (!catu_desc.name)           return -ENOMEM;   -    drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); -    if (!drvdata) { -        ret = -ENOMEM; -        goto out; -    }

-    dev_set_drvdata(dev, drvdata); -    base = devm_ioremap_resource(dev, &adev->res); +    base = devm_ioremap_resource(dev, res);       if (IS_ERR(base)) {           ret = PTR_ERR(base);           goto out; @@ -567,19 +561,39 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)       drvdata->csdev = coresight_register(&catu_desc);       if (IS_ERR(drvdata->csdev))           ret = PTR_ERR(drvdata->csdev); -    else -        pm_runtime_put(&adev->dev);   out:       return ret;   }   -static void catu_remove(struct amba_device *adev) +static int catu_probe(struct amba_device *adev, const struct amba_id *id)   { -    struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev); +    struct catu_drvdata *drvdata; +    int ret;

+    drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL); +    if (!drvdata) +        return -ENOMEM;

+    amba_set_drvdata(adev, drvdata); +    ret = __catu_probe(&adev->dev, &adev->res); +    if (!ret) +        pm_runtime_put(&adev->dev);

+    return ret; +}

+static void __catu_remove(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);         coresight_unregister(drvdata->csdev);   }   +static void catu_remove(struct amba_device *adev) +{ +    __catu_remove(&adev->dev); +}

static struct amba_id catu_ids[] = {       CS_AMBA_ID(0x000bb9ee),       {}, @@ -598,13 +612,103 @@ static struct amba_driver catu_driver = {       .id_table            = catu_ids,   };   +static int catu_platform_probe(struct platform_device *pdev) +{ +    struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +    struct catu_drvdata *drvdata; +    int ret = 0;

+    drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); +    if (!drvdata) +        return -ENOMEM;

+    drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev); +    if (IS_ERR(drvdata->pclk)) +        return -ENODEV;

---8>---

...

+    if (res) { +        drvdata->base = devm_ioremap_resource(&pdev->dev, res); +        if (IS_ERR(drvdata->base)) { +            clk_put(drvdata->pclk); +            return PTR_ERR(drvdata->base); +        } +    }

---<8---

The above section seems unncessary as we already try to map the base in __catu_probe ?

Agreed, though it seems unnecessary, there is a small difference in there. In the platform driver case i.e catu_platform_probe(), clk_put() is called on platform clock drvdata->pclk (just enabled earlier) for cases when devm_ioremap_resource() fails.

To remove this redundancy, let's move devm_ioremap_resource() into it's AMBA caller i.e catu_probe() thus dropping struct resource argument from __catu_probe(). Similar situation is present in coresight-cpu-debug driver as well, will fix that.

But there are some other drivers in the series where coresight_get_enable_apb_pclk() called on 'drvdata->pclk' and devm_ioremap_resource() is attempted inside the factored __xxx_probe() function which is common for both AMBA and platform drivers.

Such drivers are ...

• tpiu
• tmc
• stm
• replicator

IMHO it would be better to follow same scheme for all drivers in the series. Please do let me know which method will be preferred.

Lets pass the "res" to the common probe and deal it there.

...

...

...

...

+    pm_runtime_get_noresume(&pdev->dev); +    pm_runtime_set_active(&pdev->dev); +    pm_runtime_enable(&pdev->dev);

+    dev_set_drvdata(&pdev->dev, drvdata); +    ret = __catu_probe(&pdev->dev, res); +    pm_runtime_put(&pdev->dev); +    if (ret) +        pm_runtime_disable(&pdev->dev);

+    return ret; +}

+static int catu_platform_remove(struct platform_device *pdev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(&pdev->dev);

+    if (drvdata) +        __catu_remove(&pdev->dev);

I don't understand the need for if () check here (and on all the other drivers). Even if we have a drvdata != NULL, what guarantees that the drvdata->csdev is valid (which is used in xx_remove) ?

Agreed, although drvdata is derived in __xxx_remove() functions, a pre-check here is not required - similar to the AMBA remove path. Sure, will drop them across drivers.

No, my point is : Is there a case where :

1) drvdata == NULL, but we have a device to do some cleanup ? 2) If drvdata != NULL, but drvdata->csdev is not valid, because we failed to register the coresight device ?

Suzuki

...

Suzuki

...

+    pm_runtime_disable(&pdev->dev); +    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_put(drvdata->pclk); +    return 0; +}

+#ifdef CONFIG_PM +static int catu_runtime_suspend(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);

+    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_disable_unprepare(drvdata->pclk); +    return 0; +}

+static int catu_runtime_resume(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);

+    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_prepare_enable(drvdata->pclk); +    return 0; +} +#endif

+static const struct dev_pm_ops catu_dev_pm_ops = { +    SET_RUNTIME_PM_OPS(catu_runtime_suspend, catu_runtime_resume, NULL) +};

+#ifdef CONFIG_ACPI +static const struct acpi_device_id catu_acpi_ids[] = { +    {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ +    {}, +};

+MODULE_DEVICE_TABLE(acpi, catu_acpi_ids); +#endif

+static struct platform_driver catu_platform_driver = { +    .probe    = catu_platform_probe, +    .remove    = catu_platform_remove, +    .driver    = { +        .name            = "coresight-catu-platform", +        .acpi_match_table    = ACPI_PTR(catu_acpi_ids), +        .suppress_bind_attrs    = true, +        .pm            = &catu_dev_pm_ops, +    }, +};

static int __init catu_init(void)   {       int ret;   -    ret = amba_driver_register(&catu_driver); -    if (ret) -        pr_info("Error registering catu driver\n"); +    ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver);       tmc_etr_set_catu_ops(&etr_catu_buf_ops);       return ret;   } @@ -612,7 +716,7 @@ static int __init catu_init(void)   static void __exit catu_exit(void)   {       tmc_etr_remove_catu_ops(); -    amba_driver_unregister(&catu_driver); +    coresight_remove_driver(&catu_driver, &catu_platform_driver);   }     module_init(catu_init); diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h index 442e034bbfba..141feac1c14b 100644 --- a/drivers/hwtracing/coresight/coresight-catu.h +++ b/drivers/hwtracing/coresight/coresight-catu.h @@ -61,6 +61,7 @@   #define CATU_IRQEN_OFF        0x0     struct catu_drvdata { +    struct clk *pclk;       void __iomem *base;       struct coresight_device *csdev;       int irq;

On 08/03/2024 04:25, Anshuman Khandual wrote:

On 3/6/24 22:51, Suzuki K Poulose wrote:

...

On 06/03/2024 06:14, Anshuman Khandual wrote:

...

On 3/5/24 23:02, Suzuki K Poulose wrote:

...

On 22/02/2024 08:21, Anshuman Khandual wrote:

...

Add support for the catu devices in a new platform driver, which can then be used on ACPI based platforms. This change would now allow runtime power management for ACPI based systems. The driver would try to enable the APB clock if available. But first this renames and then refactors catu_probe() and catu_remove(), making sure it can be used both for platform and AMBA drivers. This also moves pm_runtime_put() from catu_probe() to the callers.

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 Acked-by: Sudeep Holla sudeep.holla@arm.com # For ACPI related changes Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Anshuman Khandual anshuman.khandual@arm.com

---

Changes in V5:

• Updated commit message regarding catu_probe/remove() refactoring and renaming

drivers/acpi/arm64/amba.c                    |   1 -    drivers/hwtracing/coresight/coresight-catu.c | 142 ++++++++++++++++---    drivers/hwtracing/coresight/coresight-catu.h |   1 +    3 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index afb6afb66967..587061b0fd2f 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 */ -    {"ARMHC9CA", 0}, /* ARM CoreSight CATU */        {"", 0},    };    diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 3949ded0d4fa..a3ea46b53898 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -7,6 +7,8 @@     * Author: Suzuki K Poulose suzuki.poulose@arm.com     */    +#include <linux/platform_device.h> +#include <linux/acpi.h>    #include <linux/amba/bus.h>    #include <linux/device.h>    #include <linux/dma-mapping.h> @@ -502,28 +504,20 @@ static const struct coresight_ops catu_ops = {        .helper_ops = &catu_helper_ops,    };    -static int catu_probe(struct amba_device *adev, const struct amba_id *id) +static int __catu_probe(struct device *dev, struct resource *res)    {        int ret = 0;        u32 dma_mask; -    struct catu_drvdata *drvdata; +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);        struct coresight_desc catu_desc;        struct coresight_platform_data *pdata = NULL; -    struct device *dev = &adev->dev;        void __iomem *base;          catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);        if (!catu_desc.name)            return -ENOMEM;    -    drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); -    if (!drvdata) { -        ret = -ENOMEM; -        goto out; -    }

-    dev_set_drvdata(dev, drvdata); -    base = devm_ioremap_resource(dev, &adev->res); +    base = devm_ioremap_resource(dev, res);        if (IS_ERR(base)) {            ret = PTR_ERR(base);            goto out; @@ -567,19 +561,39 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)        drvdata->csdev = coresight_register(&catu_desc);        if (IS_ERR(drvdata->csdev))            ret = PTR_ERR(drvdata->csdev); -    else -        pm_runtime_put(&adev->dev);    out:        return ret;    }    -static void catu_remove(struct amba_device *adev) +static int catu_probe(struct amba_device *adev, const struct amba_id *id)    { -    struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev); +    struct catu_drvdata *drvdata; +    int ret;

+    drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL); +    if (!drvdata) +        return -ENOMEM;

+    amba_set_drvdata(adev, drvdata); +    ret = __catu_probe(&adev->dev, &adev->res); +    if (!ret) +        pm_runtime_put(&adev->dev);

+    return ret; +}

+static void __catu_remove(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);          coresight_unregister(drvdata->csdev);    }    +static void catu_remove(struct amba_device *adev) +{ +    __catu_remove(&adev->dev); +}

static struct amba_id catu_ids[] = {        CS_AMBA_ID(0x000bb9ee),        {}, @@ -598,13 +612,103 @@ static struct amba_driver catu_driver = {        .id_table            = catu_ids,    };    +static int catu_platform_probe(struct platform_device *pdev) +{ +    struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +    struct catu_drvdata *drvdata; +    int ret = 0;

+    drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); +    if (!drvdata) +        return -ENOMEM;

+    drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev); +    if (IS_ERR(drvdata->pclk)) +        return -ENODEV;

---8>---

...

+    if (res) { +        drvdata->base = devm_ioremap_resource(&pdev->dev, res); +        if (IS_ERR(drvdata->base)) { +            clk_put(drvdata->pclk); +            return PTR_ERR(drvdata->base); +        } +    }

---<8---

The above section seems unncessary as we already try to map the base in __catu_probe ?

Agreed, though it seems unnecessary, there is a small difference in there. In the platform driver case i.e catu_platform_probe(), clk_put() is called on platform clock drvdata->pclk (just enabled earlier) for cases when devm_ioremap_resource() fails.

To remove this redundancy, let's move devm_ioremap_resource() into it's AMBA caller i.e catu_probe() thus dropping struct resource argument from __catu_probe(). Similar situation is present in coresight-cpu-debug driver as well, will fix that.

But there are some other drivers in the series where coresight_get_enable_apb_pclk() called on 'drvdata->pclk' and devm_ioremap_resource() is attempted inside the factored __xxx_probe() function which is common for both AMBA and platform drivers.

Such drivers are ...

• tpiu
• tmc
• stm
• replicator

IMHO it would be better to follow same scheme for all drivers in the series. Please do let me know which method will be preferred.

Lets pass the "res" to the common probe and deal it there.

Sure, but then will have to deal with drvdata->pclk in the caller, where it was originally acquired, when the __xxxx_probe() fails. For example - in case with the debug cpu driver, following changes will be required.

Of course, why not. Because that is specific to the platform driver (for a reason). The whole point is, push everything that is common across AMBA or Platform to a common __xxx_probe()/remove() routine, rather than duplicating things around.

diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c index 68d077174a6a..2d77f9a17692 100644 --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c @@ -577,11 +577,11 @@ static int __debug_probe(struct device *dev, struct resource *res) } drvdata->dev = dev;

•   /* Validity for the resource is already checked by the AMBA core */
  

•   base = devm_ioremap_resource(dev, res);
  

•   if (IS_ERR(base))
  

•           return PTR_ERR(base);
  

•   if (res) {
  

•           base = devm_ioremap_resource(dev, res);
  

•           if (IS_ERR(base))
  

•                   return PTR_ERR(base);
  

•   }
  

drvdata->base = base; @@ -703,14 +703,6 @@ static int debug_platform_probe(struct platform_device *pdev) if (IS_ERR(drvdata->pclk)) return -ENODEV;

•   if (res) {
  

•           drvdata->base = devm_ioremap_resource(&pdev->dev, res);
  

•           if (IS_ERR(drvdata->base)) {
  

•                   clk_put(drvdata->pclk);
  

•                   return PTR_ERR(drvdata->base);
  

•           }
  

•   }
  

•    dev_set_drvdata(&pdev->dev, drvdata);
     pm_runtime_get_noresume(&pdev->dev);
     pm_runtime_set_active(&pdev->dev);
  

@@ -720,6 +712,8 @@ static int debug_platform_probe(struct platform_device *pdev) if (ret) { pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev);

•           if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
  

•                   clk_put(drvdata->pclk);
     }
     return ret;
  
  

...

...

...

...

...

...

+    pm_runtime_get_noresume(&pdev->dev); +    pm_runtime_set_active(&pdev->dev); +    pm_runtime_enable(&pdev->dev);

+    dev_set_drvdata(&pdev->dev, drvdata); +    ret = __catu_probe(&pdev->dev, res); +    pm_runtime_put(&pdev->dev); +    if (ret) +        pm_runtime_disable(&pdev->dev);

+    return ret; +}

+static int catu_platform_remove(struct platform_device *pdev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(&pdev->dev);

+    if (drvdata) +        __catu_remove(&pdev->dev);

I don't understand the need for if () check here (and on all the other drivers). Even if we have a drvdata != NULL, what guarantees that the drvdata->csdev is valid (which is used in xx_remove) ?

Agreed, although drvdata is derived in __xxx_remove() functions, a pre-check here is not required - similar to the AMBA remove path. Sure, will drop them across drivers.

No, my point is : Is there a case where :

1. drvdata == NULL, but we have a device to do some cleanup ?

NO, I don't believe there are any such cases.

...

2. If drvdata != NULL, but drvdata->csdev is not valid, because we failed to register the coresight device ?

I don't believe so. If drvdata->csdev is not valid because coresight_register() has failed, that would have also failed driver' probe() as well. Hence driver remove() could not have been called in such situations.

So, all of those seem to be cases we don't expect. To be on the safer side, add a if (WARN_ON(!drvdata)) and return. Deal the rest with drvdata and drvdata->csdev being valid.

Suzuki

...

Suzuki

...

...

Suzuki

...

+    pm_runtime_disable(&pdev->dev); +    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_put(drvdata->pclk); +    return 0; +}

+#ifdef CONFIG_PM +static int catu_runtime_suspend(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);

+    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_disable_unprepare(drvdata->pclk); +    return 0; +}

+static int catu_runtime_resume(struct device *dev) +{ +    struct catu_drvdata *drvdata = dev_get_drvdata(dev);

+    if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk)) +        clk_prepare_enable(drvdata->pclk); +    return 0; +} +#endif

+static const struct dev_pm_ops catu_dev_pm_ops = { +    SET_RUNTIME_PM_OPS(catu_runtime_suspend, catu_runtime_resume, NULL) +};

+#ifdef CONFIG_ACPI +static const struct acpi_device_id catu_acpi_ids[] = { +    {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ +    {}, +};

+MODULE_DEVICE_TABLE(acpi, catu_acpi_ids); +#endif

+static struct platform_driver catu_platform_driver = { +    .probe    = catu_platform_probe, +    .remove    = catu_platform_remove, +    .driver    = { +        .name            = "coresight-catu-platform", +        .acpi_match_table    = ACPI_PTR(catu_acpi_ids), +        .suppress_bind_attrs    = true, +        .pm            = &catu_dev_pm_ops, +    }, +};

static int __init catu_init(void)    {        int ret;    -    ret = amba_driver_register(&catu_driver); -    if (ret) -        pr_info("Error registering catu driver\n"); +    ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver);        tmc_etr_set_catu_ops(&etr_catu_buf_ops);        return ret;    } @@ -612,7 +716,7 @@ static int __init catu_init(void)    static void __exit catu_exit(void)    {        tmc_etr_remove_catu_ops(); -    amba_driver_unregister(&catu_driver); +    coresight_remove_driver(&catu_driver, &catu_platform_driver);    }      module_init(catu_init); diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h index 442e034bbfba..141feac1c14b 100644 --- a/drivers/hwtracing/coresight/coresight-catu.h +++ b/drivers/hwtracing/coresight/coresight-catu.h @@ -61,6 +61,7 @@    #define CATU_IRQEN_OFF        0x0      struct catu_drvdata { +    struct clk *pclk;        void __iomem *base;        struct coresight_device *csdev;        int irq;