[PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[Anshuman Khandual]

This moves remaining AMBA ACPI devices into respective platform drivers for
enabling ACPI based power management support. This series applies on kernel
v6.8-rc5 release. This series has been built, and boot tested on a DT based
(RB5) and ACPI supported coresight platform (N1SDP).

https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (amba_other_acpi_migration_v5)

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: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.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
Cc: linux-stm32@st-md-mailman.stormreply.com

Changes in V5:

- Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba()
- Dropped custom masks such as STM_AMBA_MASK and TMC_AMBA_MASK
- Modified tmc_etr_setup_caps() to accept struct csdev_access argument
- Reverted back tmc_etr_setup_caps() call site position in tmc_probe()
- Changed replicator and funnel devices to use the new helpers earlier in series
- Updated the commit messages regarding xxx_probe() refactoring and renaming

Changes in V4:

https://lore.kernel.org/all/20240123054608.1790189-1-anshuman.khandual@arm.com/

- Fixed PM imbalance in etm4_probe() error path with pm_runtime_disable()
- Restored back the pm_runtime_disable() on platform probe error paths
  in replicator, funnel, catu, tpiu, tmc and stm devices
- Dropped dev_caps argument from __tmc_probe()
- Changed xxxx_platform_remove() for platform_driver->remove_new() callback

Changes in V3:

https://lore.kernel.org/all/20231208053939.42901-1-anshuman.khandual@arm.com/

- Split coresight_init_driver/remove_driver() helpers into a separate patch
- Added 'drvdata->pclk' comments in replicator, funnel, tpiu, tmc, and stm devices
- Updated funnel, and replicator drivers to use these new helpers
- Check for drvdata instead of drvdata->pclk in suspend and resume paths in catu,
  tmc and debug devices
- Added patch to extract device name from AMBA pid based table lookup for stm
- Added patch to extract device properties from AMBA pid based table look for tmc
- Dropped pm_runtime_put() from common __probe() functions
- Handled pm_runtime_put() in AMBA driver in success path
- Handled pm_runtime_put() in platform driver in both success and error paths

Changes in V2:

https://lore.kernel.org/all/20231201062053.1268492-1-anshuman.khandual@arm.com/

- Dropped redundant devm_ioremap_resource() hunk from tmc_platform_probe()
- Defined coresight_[init|remove]_driver() for both AMBA/platform drivers
- Changed catu, tmc, tpiu, stm and debug coresight drivers to use the new
  helpers avoiding build issues arising from module_amba_driver(), and
  module_platform_driver() being on the same file

Changes in V1:

https://lore.kernel.org/all/20231027072943.3418997-1-anshuman.khandual@arm.com/

- Replaced all IS_ERR() instances with IS_ERR_OR_NULL() as per Suzuki

Changes in RFC:

https://lore.kernel.org/all/20230921042040.1334641-1-anshuman.khandual@arm.com/

Anshuman Khandual (11):
  coresight: etm4x: Fix unbalanced pm_runtime_enable()
  coresight: stm: Extract device name from AMBA pid based table lookup
  coresight: tmc: Extract device properties from AMBA pid based table lookup
  coresight: Add helpers registering/removing both AMBA and platform drivers
  coresight: replicator: Move ACPI support from AMBA driver to platform driver
  coresight: funnel: Move ACPI support from AMBA driver to platform driver
  coresight: catu: Move ACPI support from AMBA driver to platform driver
  coresight: tpiu: Move ACPI support from AMBA driver to platform driver
  coresight: tmc: Move ACPI support from AMBA driver to platform driver
  coresight: stm: Move ACPI support from AMBA driver to platform driver
  coresight: debug: Move ACPI support from AMBA driver to platform driver

 drivers/acpi/arm64/amba.c                     |   8 -
 drivers/hwtracing/coresight/coresight-catu.c  | 142 +++++++++++++---
 drivers/hwtracing/coresight/coresight-catu.h  |   1 +
 drivers/hwtracing/coresight/coresight-core.c  |  29 ++++
 .../hwtracing/coresight/coresight-cpu-debug.c | 141 ++++++++++++++--
 .../coresight/coresight-etm4x-core.c          |   3 +
 .../hwtracing/coresight/coresight-funnel.c    |  86 +++++-----
 drivers/hwtracing/coresight/coresight-priv.h  |  10 ++
 .../coresight/coresight-replicator.c          |  81 +++++-----
 drivers/hwtracing/coresight/coresight-stm.c   | 115 +++++++++++--
 .../hwtracing/coresight/coresight-tmc-core.c  | 153 +++++++++++++++---
 drivers/hwtracing/coresight/coresight-tmc.h   |   2 +
 drivers/hwtracing/coresight/coresight-tpiu.c  | 102 ++++++++++--
 include/linux/coresight.h                     |   7 +
 14 files changed, 721 insertions(+), 159 deletions(-)

-- 
2.25.1

[PATCH V5 01/11] coresight: etm4x: Fix unbalanced pm_runtime_enable()

[Anshuman Khandual]

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;
 }
 
-- 
2.25.1

[PATCH V5 02/11] coresight: stm: Extract device name from AMBA pid based table lookup

[Anshuman Khandual]

Instead of using AMBA private data field, extract the device name from AMBA
pid based table lookup using new coresight_get_uci_data_from_amba() helper.

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
Cc: linux-stm32@st-md-mailman.stormreply.com
Reviewed-by: James Clark <james.clark@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
Changes in V5:

- Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba()
- Dropped custom mask STM_AMBA_MASK

 drivers/hwtracing/coresight/coresight-priv.h | 10 ++++++++++
 drivers/hwtracing/coresight/coresight-stm.c  | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h
index 767076e07970..a17b92787d50 100644
--- a/drivers/hwtracing/coresight/coresight-priv.h
+++ b/drivers/hwtracing/coresight/coresight-priv.h
@@ -221,6 +221,16 @@ static inline void *coresight_get_uci_data(const struct amba_id *id)
 	return uci_id->data;
 }
 
+static inline void *coresight_get_uci_data_from_amba(const struct amba_id *table, u32 pid)
+{
+	while (table->mask) {
+		if ((pid & table->mask) == table->id)
+			return coresight_get_uci_data(table);
+		table++;
+	};
+	return NULL;
+}
+
 void coresight_release_platform_data(struct coresight_device *csdev,
 				     struct device *dev,
 				     struct coresight_platform_data *pdata);
diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index a1c27c901ad1..6737e7b5bfca 100644
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -804,6 +804,16 @@ static void stm_init_generic_data(struct stm_drvdata *drvdata,
 	drvdata->stm.set_options = stm_generic_set_options;
 }
 
+static const struct amba_id stm_ids[];
+
+static char *stm_csdev_name(struct coresight_device *csdev)
+{
+	u32 stm_pid = coresight_get_pid(&csdev->access);
+	void *uci_data = coresight_get_uci_data_from_amba(stm_ids, stm_pid);
+
+	return uci_data ? (char *)uci_data : "STM";
+}
+
 static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	int ret, trace_id;
@@ -900,7 +910,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 	pm_runtime_put(&adev->dev);
 
 	dev_info(&drvdata->csdev->dev, "%s initialized\n",
-		 (char *)coresight_get_uci_data(id));
+		 stm_csdev_name(drvdata->csdev));
 	return 0;
 
 cs_unregister:
-- 
2.25.1

[PATCH V5 03/11] coresight: tmc: Extract device properties from AMBA pid based table lookup

[Anshuman Khandual]

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);
-- 
2.25.1

[PATCH V5 04/11] coresight: Add helpers registering/removing both AMBA and platform drivers

[Anshuman Khandual]

This adds two different helpers i.e coresight_init_driver()/remove_driver()
enabling coresight devices to register or remove AMBA and platform drivers.
This changes replicator and funnel devices to use above new helpers.

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: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: coresight@lists.linaro.org
Reviewed-by: James Clark <james.clark@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
Changes in V5:

- Changed replicator and funnel devices to use the new helpers

 drivers/hwtracing/coresight/coresight-core.c  | 29 +++++++++++++++++++
 .../hwtracing/coresight/coresight-funnel.c    | 19 ++----------
 .../coresight/coresight-replicator.c          | 20 ++-----------
 include/linux/coresight.h                     |  7 +++++
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index d7f0e231feb9..4e897cc5da81 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -1836,6 +1836,35 @@ static void __exit coresight_exit(void)
 module_init(coresight_init);
 module_exit(coresight_exit);
 
+int coresight_init_driver(const char *drv, struct amba_driver *amba_drv,
+			  struct platform_driver *pdev_drv)
+{
+	int ret;
+
+	ret = amba_driver_register(amba_drv);
+	if (ret) {
+		pr_err("%s: error registering AMBA driver\n", drv);
+		return ret;
+	}
+
+	ret = platform_driver_register(pdev_drv);
+	if (!ret)
+		return 0;
+
+	pr_err("%s: error registering platform driver\n", drv);
+	amba_driver_unregister(amba_drv);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(coresight_init_driver);
+
+void coresight_remove_driver(struct amba_driver *amba_drv,
+			     struct platform_driver *pdev_drv)
+{
+	amba_driver_unregister(amba_drv);
+	platform_driver_unregister(pdev_drv);
+}
+EXPORT_SYMBOL_GPL(coresight_remove_driver);
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Pratik Patel <pratikp@codeaurora.org>");
 MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index a5b1fc787766..004cb63f9cbc 100644
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -410,27 +410,12 @@ static struct 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;
+	return coresight_init_driver("funnel", &dynamic_funnel_driver, &static_funnel_driver);
 }
 
 static void __exit funnel_exit(void)
 {
-	platform_driver_unregister(&static_funnel_driver);
-	amba_driver_unregister(&dynamic_funnel_driver);
+	coresight_remove_driver(&dynamic_funnel_driver, &static_funnel_driver);
 }
 
 module_init(funnel_init);
diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index 91d93060dda5..b82cf9906cfb 100644
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -416,27 +416,13 @@ static struct amba_driver dynamic_replicator_driver = {
 
 static int __init replicator_init(void)
 {
-	int ret;
-
-	ret = platform_driver_register(&static_replicator_driver);
-	if (ret) {
-		pr_info("Error registering platform driver\n");
-		return ret;
-	}
-
-	ret = amba_driver_register(&dynamic_replicator_driver);
-	if (ret) {
-		pr_info("Error registering amba driver\n");
-		platform_driver_unregister(&static_replicator_driver);
-	}
-
-	return ret;
+	return coresight_init_driver("replicator", &dynamic_replicator_driver,
+				     &static_replicator_driver);
 }
 
 static void __exit replicator_exit(void)
 {
-	platform_driver_unregister(&static_replicator_driver);
-	amba_driver_unregister(&dynamic_replicator_driver);
+	coresight_remove_driver(&dynamic_replicator_driver, &static_replicator_driver);
 }
 
 module_init(replicator_init);
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index a4cb7dd6ca23..7e1646d4863c 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -12,6 +12,8 @@
 #include <linux/io.h>
 #include <linux/perf_event.h>
 #include <linux/sched.h>
+#include <linux/amba/bus.h>
+#include <linux/platform_device.h>
 
 /* Peripheral id registers (0xFD0-0xFEC) */
 #define CORESIGHT_PERIPHIDR4	0xfd0
@@ -598,6 +600,11 @@ void coresight_relaxed_write64(struct coresight_device *csdev,
 			       u64 val, u32 offset);
 void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset);
 
+int coresight_init_driver(const char *drv, struct amba_driver *amba_drv,
+			  struct platform_driver *pdev_drv);
+
+void coresight_remove_driver(struct amba_driver *amba_drv,
+			     struct platform_driver *pdev_drv);
 #else
 static inline struct coresight_device *
 coresight_register(struct coresight_desc *desc) { return NULL; }
-- 
2.25.1

[PATCH V5 05/11] coresight: replicator: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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);
-- 
2.25.1

[PATCH V5 06/11] coresight: funnel: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

Add support for the dynamic funnel device in the platform driver, which can
then be used on ACPI based platforms. This change would allow runtime power
management for 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
funnels. But first this refactors funnel_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 funnel_probe() refactoring
- coresight_[init|remove]_driver() replacement has been folded earlier

 drivers/acpi/arm64/amba.c                     |  1 -
 .../hwtracing/coresight/coresight-funnel.c    | 71 ++++++++++++-------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c
index 270f4e3819a2..afb6afb66967 100644
--- a/drivers/acpi/arm64/amba.c
+++ b/drivers/acpi/arm64/amba.c
@@ -28,7 +28,6 @@ static const struct acpi_device_id amba_id_list[] = {
 	{"ARMHC979", 0}, /* ARM CoreSight TPIU */
 	{"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */
 	{"ARMHC9CA", 0}, /* ARM CoreSight CATU */
-	{"ARMHC9FF", 0}, /* ARM CoreSight Dynamic Funnel */
 	{"", 0},
 };
 
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index 004cb63f9cbc..88147465b129 100644
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -36,6 +36,7 @@ DEFINE_CORESIGHT_DEVLIST(funnel_devs, "funnel");
  * struct funnel_drvdata - specifics associated to a funnel component
  * @base:	memory mapped base address for this component.
  * @atclk:	optional clock for the core parts of the funnel.
+ * @pclk:	APB clock if present, otherwise NULL
  * @csdev:	component vitals needed by the framework.
  * @priority:	port selection order.
  * @spinlock:	serialize enable/disable operations.
@@ -43,6 +44,7 @@ DEFINE_CORESIGHT_DEVLIST(funnel_devs, "funnel");
 struct funnel_drvdata {
 	void __iomem		*base;
 	struct clk		*atclk;
+	struct clk		*pclk;
 	struct coresight_device	*csdev;
 	unsigned long		priority;
 	spinlock_t		spinlock;
@@ -236,6 +238,10 @@ static int funnel_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-funnel, which has been
 	 * validated by AMBA core.
@@ -272,7 +278,6 @@ static int funnel_probe(struct device *dev, struct resource *res)
 		goto out_disable_clk;
 	}
 
-	pm_runtime_put(dev);
 	ret = 0;
 
 out_disable_clk:
@@ -298,6 +303,9 @@ static int funnel_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;
 }
 
@@ -308,6 +316,8 @@ static int funnel_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
@@ -316,55 +326,60 @@ static const struct dev_pm_ops funnel_dev_pm_ops = {
 	SET_RUNTIME_PM_OPS(funnel_runtime_suspend, funnel_runtime_resume, NULL)
 };
 
-static int static_funnel_probe(struct platform_device *pdev)
+static int funnel_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 funnel do not have programming base */
-	ret = funnel_probe(&pdev->dev, NULL);
-
-	if (ret) {
-		pm_runtime_put_noidle(&pdev->dev);
+	ret = funnel_probe(&pdev->dev, res);
+	pm_runtime_put(&pdev->dev);
+	if (ret)
 		pm_runtime_disable(&pdev->dev);
-	}
 
 	return ret;
 }
 
-static void static_funnel_remove(struct platform_device *pdev)
+static void funnel_platform_remove(struct platform_device *pdev)
 {
-	funnel_remove(&pdev->dev);
+	struct funnel_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
+
+	if (drvdata)
+		funnel_remove(&pdev->dev);
+
 	pm_runtime_disable(&pdev->dev);
+	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
+		clk_put(drvdata->pclk);
 }
 
-static const struct of_device_id static_funnel_match[] = {
+static const struct of_device_id funnel_match[] = {
 	{.compatible = "arm,coresight-static-funnel"},
 	{}
 };
 
-MODULE_DEVICE_TABLE(of, static_funnel_match);
+MODULE_DEVICE_TABLE(of, funnel_match);
 
 #ifdef CONFIG_ACPI
-static const struct acpi_device_id static_funnel_ids[] = {
-	{"ARMHC9FE", 0},
+static const struct acpi_device_id funnel_acpi_ids[] = {
+	{"ARMHC9FE", 0}, /* ARM Coresight Static Funnel */
+	{"ARMHC9FF", 0}, /* ARM CoreSight Dynamic Funnel */
 	{},
 };
 
-MODULE_DEVICE_TABLE(acpi, static_funnel_ids);
+MODULE_DEVICE_TABLE(acpi, funnel_acpi_ids);
 #endif
 
-static struct platform_driver static_funnel_driver = {
-	.probe          = static_funnel_probe,
-	.remove_new      = static_funnel_remove,
-	.driver         = {
-		.name   = "coresight-static-funnel",
+static struct platform_driver funnel_driver = {
+	.probe		= funnel_platform_probe,
+	.remove_new	= funnel_platform_remove,
+	.driver		= {
+		.name   = "coresight-funnel",
 		/* THIS_MODULE is taken care of by platform_driver_register() */
-		.of_match_table = static_funnel_match,
-		.acpi_match_table = ACPI_PTR(static_funnel_ids),
+		.of_match_table = funnel_match,
+		.acpi_match_table = ACPI_PTR(funnel_acpi_ids),
 		.pm	= &funnel_dev_pm_ops,
 		.suppress_bind_attrs = true,
 	},
@@ -373,7 +388,13 @@ static struct platform_driver static_funnel_driver = {
 static int dynamic_funnel_probe(struct amba_device *adev,
 				const struct amba_id *id)
 {
-	return funnel_probe(&adev->dev, &adev->res);
+	int ret;
+
+	ret = funnel_probe(&adev->dev, &adev->res);
+	if (!ret)
+		pm_runtime_put(&adev->dev);
+
+	return ret;
 }
 
 static void dynamic_funnel_remove(struct amba_device *adev)
@@ -410,12 +431,12 @@ static struct amba_driver dynamic_funnel_driver = {
 
 static int __init funnel_init(void)
 {
-	return coresight_init_driver("funnel", &dynamic_funnel_driver, &static_funnel_driver);
+	return coresight_init_driver("funnel", &dynamic_funnel_driver, &funnel_driver);
 }
 
 static void __exit funnel_exit(void)
 {
-	coresight_remove_driver(&dynamic_funnel_driver, &static_funnel_driver);
+	coresight_remove_driver(&dynamic_funnel_driver, &funnel_driver);
 }
 
 module_init(funnel_init);
-- 
2.25.1

[PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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;
-- 
2.25.1

[PATCH V5 08/11] coresight: tpiu: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

Add support for the tpiu device 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 tpiu_probe()
and tpiu_remove(), making sure it can be used both for platform and AMBA
drivers. This also moves pm_runtime_put() from tpiu_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 commit message regarding tpiu_probe/remove() refactoring and renaming

 drivers/acpi/arm64/amba.c                    |   1 -
 drivers/hwtracing/coresight/coresight-tpiu.c | 102 +++++++++++++++++--
 2 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c
index 587061b0fd2f..6d24a8f7914b 100644
--- a/drivers/acpi/arm64/amba.c
+++ b/drivers/acpi/arm64/amba.c
@@ -25,7 +25,6 @@ static const struct acpi_device_id amba_id_list[] = {
 	{"ARMHC501", 0}, /* ARM CoreSight ETR */
 	{"ARMHC502", 0}, /* ARM CoreSight STM */
 	{"ARMHC503", 0}, /* ARM CoreSight Debug */
-	{"ARMHC979", 0}, /* ARM CoreSight TPIU */
 	{"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */
 	{"", 0},
 };
diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c
index 59eac93fd6bb..7a76bbd610bf 100644
--- a/drivers/hwtracing/coresight/coresight-tpiu.c
+++ b/drivers/hwtracing/coresight/coresight-tpiu.c
@@ -5,6 +5,8 @@
  * Description: CoreSight Trace Port Interface Unit driver
  */
 
+#include <linux/platform_device.h>
+#include <linux/acpi.h>
 #include <linux/atomic.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -52,11 +54,13 @@ DEFINE_CORESIGHT_DEVLIST(tpiu_devs, "tpiu");
 /*
  * @base:	memory mapped base address for this component.
  * @atclk:	optional clock for the core parts of the TPIU.
+ * @pclk:	APB clock if present, otherwise NULL
  * @csdev:	component vitals needed by the framework.
  */
 struct tpiu_drvdata {
 	void __iomem		*base;
 	struct clk		*atclk;
+	struct clk		*pclk;
 	struct coresight_device	*csdev;
 };
 
@@ -114,14 +118,12 @@ static const struct coresight_ops tpiu_cs_ops = {
 	.sink_ops	= &tpiu_sink_ops,
 };
 
-static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
+static int __tpiu_probe(struct device *dev, struct resource *res)
 {
 	int ret;
 	void __iomem *base;
-	struct device *dev = &adev->dev;
 	struct coresight_platform_data *pdata = NULL;
 	struct tpiu_drvdata *drvdata;
-	struct resource *res = &adev->res;
 	struct coresight_desc desc = { 0 };
 
 	desc.name = coresight_alloc_device_name(&tpiu_devs, dev);
@@ -132,12 +134,16 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
 	if (!drvdata)
 		return -ENOMEM;
 
-	drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */
+	drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */
 	if (!IS_ERR(drvdata->atclk)) {
 		ret = clk_prepare_enable(drvdata->atclk);
 		if (ret)
 			return ret;
 	}
+
+	drvdata->pclk = coresight_get_enable_apb_pclk(dev);
+	if (IS_ERR(drvdata->pclk))
+		return -ENODEV;
 	dev_set_drvdata(dev, drvdata);
 
 	/* Validity for the resource is already checked by the AMBA core */
@@ -163,21 +169,34 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
 	desc.dev = dev;
 	drvdata->csdev = coresight_register(&desc);
 
-	if (!IS_ERR(drvdata->csdev)) {
-		pm_runtime_put(&adev->dev);
+	if (!IS_ERR(drvdata->csdev))
 		return 0;
-	}
 
 	return PTR_ERR(drvdata->csdev);
 }
 
-static void tpiu_remove(struct amba_device *adev)
+static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
 {
-	struct tpiu_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+	int ret;
+
+	ret = __tpiu_probe(&adev->dev, &adev->res);
+	if (!ret)
+		pm_runtime_put(&adev->dev);
+	return ret;
+}
+
+static void __tpiu_remove(struct device *dev)
+{
+	struct tpiu_drvdata *drvdata = dev_get_drvdata(dev);
 
 	coresight_unregister(drvdata->csdev);
 }
 
+static void tpiu_remove(struct amba_device *adev)
+{
+	__tpiu_remove(&adev->dev);
+}
+
 #ifdef CONFIG_PM
 static int tpiu_runtime_suspend(struct device *dev)
 {
@@ -186,6 +205,8 @@ static int tpiu_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;
 }
 
@@ -196,6 +217,8 @@ static int tpiu_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
@@ -235,7 +258,66 @@ static struct amba_driver tpiu_driver = {
 	.id_table	= tpiu_ids,
 };
 
-module_amba_driver(tpiu_driver);
+static int tpiu_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);
+
+	ret = __tpiu_probe(&pdev->dev, res);
+	pm_runtime_put(&pdev->dev);
+	if (ret)
+		pm_runtime_disable(&pdev->dev);
+
+	return ret;
+}
+
+static int tpiu_platform_remove(struct platform_device *pdev)
+{
+	struct tpiu_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
+
+	if (drvdata)
+		__tpiu_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 tpiu_acpi_ids[] = {
+	{"ARMHC979", 0}, /* ARM CoreSight TPIU */
+	{}
+};
+MODULE_DEVICE_TABLE(acpi, tpiu_acpi_ids);
+#endif
+
+static struct platform_driver tpiu_platform_driver = {
+	.probe	= tpiu_platform_probe,
+	.remove	= tpiu_platform_remove,
+	.driver = {
+		.name			= "coresight-tpiu-platform",
+		.acpi_match_table	= ACPI_PTR(tpiu_acpi_ids),
+		.suppress_bind_attrs	= true,
+		.pm			= &tpiu_dev_pm_ops,
+	},
+};
+
+static int __init tpiu_init(void)
+{
+	return coresight_init_driver("tpiu", &tpiu_driver, &tpiu_platform_driver);
+}
+
+static void __exit tpiu_exit(void)
+{
+	coresight_remove_driver(&tpiu_driver, &tpiu_platform_driver);
+}
+module_init(tpiu_init);
+module_exit(tpiu_exit);
 
 MODULE_AUTHOR("Pratik Patel <pratikp@codeaurora.org>");
 MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
-- 
2.25.1

[PATCH V5 09/11] coresight: tmc: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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;
-- 
2.25.1

[PATCH V5 10/11] coresight: stm: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

Add support for the stm 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 stm_probe()
and stm_remove(), making sure it can be used both for platform and AMBA
drivers. Also this moves pm_runtime_put() from stm_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: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.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
Cc: linux-stm32@st-md-mailman.stormreply.com
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 commit message regarding stm_probe/remove() refactoring and renaming

 drivers/acpi/arm64/amba.c                   |   1 -
 drivers/hwtracing/coresight/coresight-stm.c | 103 ++++++++++++++++++--
 2 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c
index d3c1defa7bc8..bec0976541da 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 */
-	{"ARMHC502", 0}, /* ARM CoreSight STM */
 	{"ARMHC503", 0}, /* ARM CoreSight Debug */
 	{"", 0},
 };
diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index 6737e7b5bfca..13f9c7d10270 100644
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -29,6 +29,8 @@
 #include <linux/perf_event.h>
 #include <linux/pm_runtime.h>
 #include <linux/stm.h>
+#include <linux/platform_device.h>
+#include <linux/acpi.h>
 
 #include "coresight-priv.h"
 #include "coresight-trace-id.h"
@@ -115,6 +117,7 @@ DEFINE_CORESIGHT_DEVLIST(stm_devs, "stm");
  * struct stm_drvdata - specifics associated to an STM component
  * @base:		memory mapped base address for this component.
  * @atclk:		optional clock for the core parts of the STM.
+ * @pclk:		APB clock if present, otherwise NULL
  * @csdev:		component vitals needed by the framework.
  * @spinlock:		only one at a time pls.
  * @chs:		the channels accociated to this STM.
@@ -132,6 +135,7 @@ DEFINE_CORESIGHT_DEVLIST(stm_devs, "stm");
 struct stm_drvdata {
 	void __iomem		*base;
 	struct clk		*atclk;
+	struct clk		*pclk;
 	struct coresight_device	*csdev;
 	spinlock_t		spinlock;
 	struct channel_space	chs;
@@ -814,14 +818,12 @@ static char *stm_csdev_name(struct coresight_device *csdev)
 	return uci_data ? (char *)uci_data : "STM";
 }
 
-static int stm_probe(struct amba_device *adev, const struct amba_id *id)
+static int __stm_probe(struct device *dev, struct resource *res)
 {
 	int ret, trace_id;
 	void __iomem *base;
-	struct device *dev = &adev->dev;
 	struct coresight_platform_data *pdata = NULL;
 	struct stm_drvdata *drvdata;
-	struct resource *res = &adev->res;
 	struct resource ch_res;
 	struct coresight_desc desc = { 0 };
 
@@ -833,12 +835,16 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 	if (!drvdata)
 		return -ENOMEM;
 
-	drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */
+	drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */
 	if (!IS_ERR(drvdata->atclk)) {
 		ret = clk_prepare_enable(drvdata->atclk);
 		if (ret)
 			return ret;
 	}
+
+	drvdata->pclk = coresight_get_enable_apb_pclk(dev);
+	if (IS_ERR(drvdata->pclk))
+		return -ENODEV;
 	dev_set_drvdata(dev, drvdata);
 
 	base = devm_ioremap_resource(dev, res);
@@ -886,7 +892,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 		ret = PTR_ERR(pdata);
 		goto stm_unregister;
 	}
-	adev->dev.platform_data = pdata;
+	dev->platform_data = pdata;
 
 	desc.type = CORESIGHT_DEV_TYPE_SOURCE;
 	desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_SOFTWARE;
@@ -907,8 +913,6 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 	}
 	drvdata->traceid = (u8)trace_id;
 
-	pm_runtime_put(&adev->dev);
-
 	dev_info(&drvdata->csdev->dev, "%s initialized\n",
 		 stm_csdev_name(drvdata->csdev));
 	return 0;
@@ -921,9 +925,20 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 	return ret;
 }
 
-static void stm_remove(struct amba_device *adev)
+static int stm_probe(struct amba_device *adev, const struct amba_id *id)
+{
+	int ret;
+
+	ret = __stm_probe(&adev->dev, &adev->res);
+	if (!ret)
+		pm_runtime_put(&adev->dev);
+
+	return ret;
+}
+
+static void __stm_remove(struct device *dev)
 {
-	struct stm_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+	struct stm_drvdata *drvdata = dev_get_drvdata(dev);
 
 	coresight_trace_id_put_system_id(drvdata->traceid);
 	coresight_unregister(drvdata->csdev);
@@ -931,6 +946,11 @@ static void stm_remove(struct amba_device *adev)
 	stm_unregister_device(&drvdata->stm);
 }
 
+static void stm_remove(struct amba_device *adev)
+{
+	__stm_remove(&adev->dev);
+}
+
 #ifdef CONFIG_PM
 static int stm_runtime_suspend(struct device *dev)
 {
@@ -939,6 +959,8 @@ static int stm_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;
 }
 
@@ -949,6 +971,8 @@ static int stm_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
@@ -977,7 +1001,66 @@ static struct amba_driver stm_driver = {
 	.id_table	= stm_ids,
 };
 
-module_amba_driver(stm_driver);
+static int stm_platform_probe(struct platform_device *pdev)
+{
+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	int ret = 0;
+
+	pm_runtime_get_noresume(&pdev->dev);
+	pm_runtime_set_active(&pdev->dev);
+	pm_runtime_enable(&pdev->dev);
+
+	ret = __stm_probe(&pdev->dev, res);
+	pm_runtime_put(&pdev->dev);
+	if (ret)
+		pm_runtime_disable(&pdev->dev);
+
+	return ret;
+}
+
+static int stm_platform_remove(struct platform_device *pdev)
+{
+	struct stm_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
+
+	if (drvdata)
+		__stm_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 stm_acpi_ids[] = {
+	{"ARMHC502", 0}, /* ARM CoreSight STM */
+	{},
+};
+MODULE_DEVICE_TABLE(acpi, stm_acpi_ids);
+#endif
+
+static struct platform_driver stm_platform_driver = {
+	.probe	= stm_platform_probe,
+	.remove	= stm_platform_remove,
+	.driver	= {
+		.name			= "coresight-stm-platform",
+		.acpi_match_table	= ACPI_PTR(stm_acpi_ids),
+		.suppress_bind_attrs	= true,
+		.pm			= &stm_dev_pm_ops,
+	},
+};
+
+static int __init stm_init(void)
+{
+	return coresight_init_driver("stm", &stm_driver, &stm_platform_driver);
+}
+
+static void __exit stm_exit(void)
+{
+	coresight_remove_driver(&stm_driver, &stm_platform_driver);
+}
+module_init(stm_init);
+module_exit(stm_exit);
 
 MODULE_AUTHOR("Pratik Patel <pratikp@codeaurora.org>");
 MODULE_DESCRIPTION("Arm CoreSight System Trace Macrocell driver");
-- 
2.25.1

[PATCH V5 11/11] coresight: debug: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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");
-- 
2.25.1

Re: [PATCH V5 03/11] coresight: tmc: Extract device properties from AMBA pid based table lookup

[Suzuki K Poulose]

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:

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);

Re: [PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Suzuki K Poulose]

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;

Re: [PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[Suzuki K Poulose]

On 22/02/2024 08:21, Anshuman Khandual wrote:
> This moves remaining AMBA ACPI devices into respective platform drivers for
> enabling ACPI based power management support. This series applies on kernel
> v6.8-rc5 release. This series has been built, and boot tested on a DT based
> (RB5) and ACPI supported coresight platform (N1SDP).

Please rebase your series on coresight next and fix build failures with 
the extra warnings turned ON (should be on by default with next).


Suzuki

> 
> https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (amba_other_acpi_migration_v5)
> 
> 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: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Cc: Alexandre Torgue <alexandre.torgue@foss.st.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
> Cc: linux-stm32@st-md-mailman.stormreply.com
> 
> Changes in V5:
> 
> - Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba()
> - Dropped custom masks such as STM_AMBA_MASK and TMC_AMBA_MASK
> - Modified tmc_etr_setup_caps() to accept struct csdev_access argument
> - Reverted back tmc_etr_setup_caps() call site position in tmc_probe()
> - Changed replicator and funnel devices to use the new helpers earlier in series
> - Updated the commit messages regarding xxx_probe() refactoring and renaming
> 
> Changes in V4:
> 
> https://lore.kernel.org/all/20240123054608.1790189-1-anshuman.khandual@arm.com/
> 
> - Fixed PM imbalance in etm4_probe() error path with pm_runtime_disable()
> - Restored back the pm_runtime_disable() on platform probe error paths
>    in replicator, funnel, catu, tpiu, tmc and stm devices
> - Dropped dev_caps argument from __tmc_probe()
> - Changed xxxx_platform_remove() for platform_driver->remove_new() callback
> 
> Changes in V3:
> 
> https://lore.kernel.org/all/20231208053939.42901-1-anshuman.khandual@arm.com/
> 
> - Split coresight_init_driver/remove_driver() helpers into a separate patch
> - Added 'drvdata->pclk' comments in replicator, funnel, tpiu, tmc, and stm devices
> - Updated funnel, and replicator drivers to use these new helpers
> - Check for drvdata instead of drvdata->pclk in suspend and resume paths in catu,
>    tmc and debug devices
> - Added patch to extract device name from AMBA pid based table lookup for stm
> - Added patch to extract device properties from AMBA pid based table look for tmc
> - Dropped pm_runtime_put() from common __probe() functions
> - Handled pm_runtime_put() in AMBA driver in success path
> - Handled pm_runtime_put() in platform driver in both success and error paths
> 
> Changes in V2:
> 
> https://lore.kernel.org/all/20231201062053.1268492-1-anshuman.khandual@arm.com/
> 
> - Dropped redundant devm_ioremap_resource() hunk from tmc_platform_probe()
> - Defined coresight_[init|remove]_driver() for both AMBA/platform drivers
> - Changed catu, tmc, tpiu, stm and debug coresight drivers to use the new
>    helpers avoiding build issues arising from module_amba_driver(), and
>    module_platform_driver() being on the same file
> 
> Changes in V1:
> 
> https://lore.kernel.org/all/20231027072943.3418997-1-anshuman.khandual@arm.com/
> 
> - Replaced all IS_ERR() instances with IS_ERR_OR_NULL() as per Suzuki
> 
> Changes in RFC:
> 
> https://lore.kernel.org/all/20230921042040.1334641-1-anshuman.khandual@arm.com/
> 
> Anshuman Khandual (11):
>    coresight: etm4x: Fix unbalanced pm_runtime_enable()
>    coresight: stm: Extract device name from AMBA pid based table lookup
>    coresight: tmc: Extract device properties from AMBA pid based table lookup
>    coresight: Add helpers registering/removing both AMBA and platform drivers
>    coresight: replicator: Move ACPI support from AMBA driver to platform driver
>    coresight: funnel: Move ACPI support from AMBA driver to platform driver
>    coresight: catu: Move ACPI support from AMBA driver to platform driver
>    coresight: tpiu: Move ACPI support from AMBA driver to platform driver
>    coresight: tmc: Move ACPI support from AMBA driver to platform driver
>    coresight: stm: Move ACPI support from AMBA driver to platform driver
>    coresight: debug: Move ACPI support from AMBA driver to platform driver
> 
>   drivers/acpi/arm64/amba.c                     |   8 -
>   drivers/hwtracing/coresight/coresight-catu.c  | 142 +++++++++++++---
>   drivers/hwtracing/coresight/coresight-catu.h  |   1 +
>   drivers/hwtracing/coresight/coresight-core.c  |  29 ++++
>   .../hwtracing/coresight/coresight-cpu-debug.c | 141 ++++++++++++++--
>   .../coresight/coresight-etm4x-core.c          |   3 +
>   .../hwtracing/coresight/coresight-funnel.c    |  86 +++++-----
>   drivers/hwtracing/coresight/coresight-priv.h  |  10 ++
>   .../coresight/coresight-replicator.c          |  81 +++++-----
>   drivers/hwtracing/coresight/coresight-stm.c   | 115 +++++++++++--
>   .../hwtracing/coresight/coresight-tmc-core.c  | 153 +++++++++++++++---
>   drivers/hwtracing/coresight/coresight-tmc.h   |   2 +
>   drivers/hwtracing/coresight/coresight-tpiu.c  | 102 ++++++++++--
>   include/linux/coresight.h                     |   7 +
>   14 files changed, 721 insertions(+), 159 deletions(-)
> 

Re: [PATCH V5 03/11] coresight: tmc: Extract device properties from AMBA pid based table lookup

[Anshuman Khandual]

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);
> 

Re: [PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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.

> 
>> +

>> +    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.

> 
> 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;
> 

Re: [PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Suzuki K Poulose]

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;
>>

Re: [PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Anshuman Khandual]

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.

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.

> 
> 
> 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;
>>>
> 

Re: [PATCH V5 07/11] coresight: catu: Move ACPI support from AMBA driver to platform driver

[Suzuki K Poulose]

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;
>>>>
>>

Re: [PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[Anshuman Khandual]

On 3/5/24 23:55, Suzuki K Poulose wrote:
> On 22/02/2024 08:21, Anshuman Khandual wrote:
>> This moves remaining AMBA ACPI devices into respective platform drivers for
>> enabling ACPI based power management support. This series applies on kernel
>> v6.8-rc5 release. This series has been built, and boot tested on a DT based
>> (RB5) and ACPI supported coresight platform (N1SDP).
> 
> Please rebase your series on coresight next and fix build failures with the extra warnings turned ON (should be on by default with next).

I did rebase the series (which required some rebase related changes for some) on
coresight next i.e with the following commit as HEAD.

a4f3057d19ff ("coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits")

Although did not see any warning either with = m or = y based coresight options.
Is there any other particular config which needs to be enabled for these warnings
to come up ?

> 
> 
> Suzuki
> 
>>
>> https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (amba_other_acpi_migration_v5)
>>
>> 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: Maxime Coquelin <mcoquelin.stm32@gmail.com>
>> Cc: Alexandre Torgue <alexandre.torgue@foss.st.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
>> Cc: linux-stm32@st-md-mailman.stormreply.com
>>
>> Changes in V5:
>>
>> - Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba()
>> - Dropped custom masks such as STM_AMBA_MASK and TMC_AMBA_MASK
>> - Modified tmc_etr_setup_caps() to accept struct csdev_access argument
>> - Reverted back tmc_etr_setup_caps() call site position in tmc_probe()
>> - Changed replicator and funnel devices to use the new helpers earlier in series
>> - Updated the commit messages regarding xxx_probe() refactoring and renaming
>>
>> Changes in V4:
>>
>> https://lore.kernel.org/all/20240123054608.1790189-1-anshuman.khandual@arm.com/
>>
>> - Fixed PM imbalance in etm4_probe() error path with pm_runtime_disable()
>> - Restored back the pm_runtime_disable() on platform probe error paths
>>    in replicator, funnel, catu, tpiu, tmc and stm devices
>> - Dropped dev_caps argument from __tmc_probe()
>> - Changed xxxx_platform_remove() for platform_driver->remove_new() callback
>>
>> Changes in V3:
>>
>> https://lore.kernel.org/all/20231208053939.42901-1-anshuman.khandual@arm.com/
>>
>> - Split coresight_init_driver/remove_driver() helpers into a separate patch
>> - Added 'drvdata->pclk' comments in replicator, funnel, tpiu, tmc, and stm devices
>> - Updated funnel, and replicator drivers to use these new helpers
>> - Check for drvdata instead of drvdata->pclk in suspend and resume paths in catu,
>>    tmc and debug devices
>> - Added patch to extract device name from AMBA pid based table lookup for stm
>> - Added patch to extract device properties from AMBA pid based table look for tmc
>> - Dropped pm_runtime_put() from common __probe() functions
>> - Handled pm_runtime_put() in AMBA driver in success path
>> - Handled pm_runtime_put() in platform driver in both success and error paths
>>
>> Changes in V2:
>>
>> https://lore.kernel.org/all/20231201062053.1268492-1-anshuman.khandual@arm.com/
>>
>> - Dropped redundant devm_ioremap_resource() hunk from tmc_platform_probe()
>> - Defined coresight_[init|remove]_driver() for both AMBA/platform drivers
>> - Changed catu, tmc, tpiu, stm and debug coresight drivers to use the new
>>    helpers avoiding build issues arising from module_amba_driver(), and
>>    module_platform_driver() being on the same file
>>
>> Changes in V1:
>>
>> https://lore.kernel.org/all/20231027072943.3418997-1-anshuman.khandual@arm.com/
>>
>> - Replaced all IS_ERR() instances with IS_ERR_OR_NULL() as per Suzuki
>>
>> Changes in RFC:
>>
>> https://lore.kernel.org/all/20230921042040.1334641-1-anshuman.khandual@arm.com/
>>
>> Anshuman Khandual (11):
>>    coresight: etm4x: Fix unbalanced pm_runtime_enable()
>>    coresight: stm: Extract device name from AMBA pid based table lookup
>>    coresight: tmc: Extract device properties from AMBA pid based table lookup
>>    coresight: Add helpers registering/removing both AMBA and platform drivers
>>    coresight: replicator: Move ACPI support from AMBA driver to platform driver
>>    coresight: funnel: Move ACPI support from AMBA driver to platform driver
>>    coresight: catu: Move ACPI support from AMBA driver to platform driver
>>    coresight: tpiu: Move ACPI support from AMBA driver to platform driver
>>    coresight: tmc: Move ACPI support from AMBA driver to platform driver
>>    coresight: stm: Move ACPI support from AMBA driver to platform driver
>>    coresight: debug: Move ACPI support from AMBA driver to platform driver
>>
>>   drivers/acpi/arm64/amba.c                     |   8 -
>>   drivers/hwtracing/coresight/coresight-catu.c  | 142 +++++++++++++---
>>   drivers/hwtracing/coresight/coresight-catu.h  |   1 +
>>   drivers/hwtracing/coresight/coresight-core.c  |  29 ++++
>>   .../hwtracing/coresight/coresight-cpu-debug.c | 141 ++++++++++++++--
>>   .../coresight/coresight-etm4x-core.c          |   3 +
>>   .../hwtracing/coresight/coresight-funnel.c    |  86 +++++-----
>>   drivers/hwtracing/coresight/coresight-priv.h  |  10 ++
>>   .../coresight/coresight-replicator.c          |  81 +++++-----
>>   drivers/hwtracing/coresight/coresight-stm.c   | 115 +++++++++++--
>>   .../hwtracing/coresight/coresight-tmc-core.c  | 153 +++++++++++++++---
>>   drivers/hwtracing/coresight/coresight-tmc.h   |   2 +
>>   drivers/hwtracing/coresight/coresight-tpiu.c  | 102 ++++++++++--
>>   include/linux/coresight.h                     |   7 +
>>   14 files changed, 721 insertions(+), 159 deletions(-)
>>
> 

Re: [PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[James Clark]

On 11/03/2024 06:04, Anshuman Khandual wrote:
> 
> 
> On 3/5/24 23:55, Suzuki K Poulose wrote:
>> On 22/02/2024 08:21, Anshuman Khandual wrote:
>>> This moves remaining AMBA ACPI devices into respective platform drivers for
>>> enabling ACPI based power management support. This series applies on kernel
>>> v6.8-rc5 release. This series has been built, and boot tested on a DT based
>>> (RB5) and ACPI supported coresight platform (N1SDP).
>>
>> Please rebase your series on coresight next and fix build failures with the extra warnings turned ON (should be on by default with next).
> 
> I did rebase the series (which required some rebase related changes for some) on
> coresight next i.e with the following commit as HEAD.
> 
> a4f3057d19ff ("coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits")
> 
> Although did not see any warning either with = m or = y based coresight options.
> Is there any other particular config which needs to be enabled for these warnings
> to come up ?
> 

It doesn't apply cleanly on a4f305 for me, maybe you sent an old version
after rebasing?

This change in patch 5 is a warning for example, because not all members
of the struct are initialised. No special config is required:

+	{"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */"


>>
>>
>> Suzuki
>>
>>>
>>> https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (amba_other_acpi_migration_v5)
>>>
>>> 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: Maxime Coquelin <mcoquelin.stm32@gmail.com>
>>> Cc: Alexandre Torgue <alexandre.torgue@foss.st.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
>>> Cc: linux-stm32@st-md-mailman.stormreply.com
>>>
>>> Changes in V5:
>>>
>>> - Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba()
>>> - Dropped custom masks such as STM_AMBA_MASK and TMC_AMBA_MASK
>>> - Modified tmc_etr_setup_caps() to accept struct csdev_access argument
>>> - Reverted back tmc_etr_setup_caps() call site position in tmc_probe()
>>> - Changed replicator and funnel devices to use the new helpers earlier in series
>>> - Updated the commit messages regarding xxx_probe() refactoring and renaming
>>>
>>> Changes in V4:
>>>
>>> https://lore.kernel.org/all/20240123054608.1790189-1-anshuman.khandual@arm.com/
>>>
>>> - Fixed PM imbalance in etm4_probe() error path with pm_runtime_disable()
>>> - Restored back the pm_runtime_disable() on platform probe error paths
>>>    in replicator, funnel, catu, tpiu, tmc and stm devices
>>> - Dropped dev_caps argument from __tmc_probe()
>>> - Changed xxxx_platform_remove() for platform_driver->remove_new() callback
>>>
>>> Changes in V3:
>>>
>>> https://lore.kernel.org/all/20231208053939.42901-1-anshuman.khandual@arm.com/
>>>
>>> - Split coresight_init_driver/remove_driver() helpers into a separate patch
>>> - Added 'drvdata->pclk' comments in replicator, funnel, tpiu, tmc, and stm devices
>>> - Updated funnel, and replicator drivers to use these new helpers
>>> - Check for drvdata instead of drvdata->pclk in suspend and resume paths in catu,
>>>    tmc and debug devices
>>> - Added patch to extract device name from AMBA pid based table lookup for stm
>>> - Added patch to extract device properties from AMBA pid based table look for tmc
>>> - Dropped pm_runtime_put() from common __probe() functions
>>> - Handled pm_runtime_put() in AMBA driver in success path
>>> - Handled pm_runtime_put() in platform driver in both success and error paths
>>>
>>> Changes in V2:
>>>
>>> https://lore.kernel.org/all/20231201062053.1268492-1-anshuman.khandual@arm.com/
>>>
>>> - Dropped redundant devm_ioremap_resource() hunk from tmc_platform_probe()
>>> - Defined coresight_[init|remove]_driver() for both AMBA/platform drivers
>>> - Changed catu, tmc, tpiu, stm and debug coresight drivers to use the new
>>>    helpers avoiding build issues arising from module_amba_driver(), and
>>>    module_platform_driver() being on the same file
>>>
>>> Changes in V1:
>>>
>>> https://lore.kernel.org/all/20231027072943.3418997-1-anshuman.khandual@arm.com/
>>>
>>> - Replaced all IS_ERR() instances with IS_ERR_OR_NULL() as per Suzuki
>>>
>>> Changes in RFC:
>>>
>>> https://lore.kernel.org/all/20230921042040.1334641-1-anshuman.khandual@arm.com/
>>>
>>> Anshuman Khandual (11):
>>>    coresight: etm4x: Fix unbalanced pm_runtime_enable()
>>>    coresight: stm: Extract device name from AMBA pid based table lookup
>>>    coresight: tmc: Extract device properties from AMBA pid based table lookup
>>>    coresight: Add helpers registering/removing both AMBA and platform drivers
>>>    coresight: replicator: Move ACPI support from AMBA driver to platform driver
>>>    coresight: funnel: Move ACPI support from AMBA driver to platform driver
>>>    coresight: catu: Move ACPI support from AMBA driver to platform driver
>>>    coresight: tpiu: Move ACPI support from AMBA driver to platform driver
>>>    coresight: tmc: Move ACPI support from AMBA driver to platform driver
>>>    coresight: stm: Move ACPI support from AMBA driver to platform driver
>>>    coresight: debug: Move ACPI support from AMBA driver to platform driver
>>>
>>>   drivers/acpi/arm64/amba.c                     |   8 -
>>>   drivers/hwtracing/coresight/coresight-catu.c  | 142 +++++++++++++---
>>>   drivers/hwtracing/coresight/coresight-catu.h  |   1 +
>>>   drivers/hwtracing/coresight/coresight-core.c  |  29 ++++
>>>   .../hwtracing/coresight/coresight-cpu-debug.c | 141 ++++++++++++++--
>>>   .../coresight/coresight-etm4x-core.c          |   3 +
>>>   .../hwtracing/coresight/coresight-funnel.c    |  86 +++++-----
>>>   drivers/hwtracing/coresight/coresight-priv.h  |  10 ++
>>>   .../coresight/coresight-replicator.c          |  81 +++++-----
>>>   drivers/hwtracing/coresight/coresight-stm.c   | 115 +++++++++++--
>>>   .../hwtracing/coresight/coresight-tmc-core.c  | 153 +++++++++++++++---
>>>   drivers/hwtracing/coresight/coresight-tmc.h   |   2 +
>>>   drivers/hwtracing/coresight/coresight-tpiu.c  | 102 ++++++++++--
>>>   include/linux/coresight.h                     |   7 +
>>>   14 files changed, 721 insertions(+), 159 deletions(-)
>>>
>>

Re: [PATCH V5 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

[Anshuman Khandual]

On 3/11/24 14:55, James Clark wrote:
> 
> On 11/03/2024 06:04, Anshuman Khandual wrote:
>>
>> On 3/5/24 23:55, Suzuki K Poulose wrote:
>>> On 22/02/2024 08:21, Anshuman Khandual wrote:
>>>> This moves remaining AMBA ACPI devices into respective platform drivers for
>>>> enabling ACPI based power management support. This series applies on kernel
>>>> v6.8-rc5 release. This series has been built, and boot tested on a DT based
>>>> (RB5) and ACPI supported coresight platform (N1SDP).
>>> Please rebase your series on coresight next and fix build failures with the extra warnings turned ON (should be on by default with next).
>> I did rebase the series (which required some rebase related changes for some) on
>> coresight next i.e with the following commit as HEAD.
>>
>> a4f3057d19ff ("coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits")
>>
>> Although did not see any warning either with = m or = y based coresight options.
>> Is there any other particular config which needs to be enabled for these warnings
>> to come up ?
>>
> It doesn't apply cleanly on a4f305 for me, maybe you sent an old version
> after rebasing?

Ohh, I was not clear enough earlier. This series is NOT rebased against coresight next.
I am preparing V6 series respin which is rebased against the above mentioned commit on
coresight next branch instead.

> 
> This change in patch 5 is a warning for example, because not all members
> of the struct are initialised. No special config is required:
> 
> +	{"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */"

Right, will change the above as follows and fix other affected places as well.

	{"ARMHC98D", 0, 0, 0}, /* ARM CoreSight Dynamic Replicator */