On Fri, 25 Jul 2025 at 11:08, Jie Gan jie.gan@oss.qualcomm.com wrote:
Remove ctcu_get_active_port from CTCU module and add it to the core framework.
The port number is crucial for the CTCU device to identify which ETR it serves. With the port number we can correctly get required parameters of the CTCU device in TMC module.
Signed-off-by: Jie Gan jie.gan@oss.qualcomm.com
drivers/hwtracing/coresight/coresight-core.c | 24 +++++++++++++++++++ .../hwtracing/coresight/coresight-ctcu-core.c | 19 +-------------- drivers/hwtracing/coresight/coresight-priv.h | 2 ++ 3 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 1accd7cbd54b..042c4fa39e55 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -580,6 +580,30 @@ struct coresight_device *coresight_get_sink(struct coresight_path *path) } EXPORT_SYMBOL_GPL(coresight_get_sink);
+/**
- coresight_get_in_port_dest: get the in-port number of the dest device
- that is connected to the src device.
- @src: csdev of the source device.
- @dest: csdev of the destination device.
- Return: port number upon success or -EINVAL for fail.
- */
+int coresight_get_in_port_dest(struct coresight_device *src,
struct coresight_device *dest)+{
struct coresight_platform_data *pdata = dest->pdata;int i;for (i = 0; i < pdata->nr_inconns; ++i) {if (pdata->in_conns[i]->src_dev == src)return pdata->in_conns[i]->dest_port;}return -EINVAL;+} +EXPORT_SYMBOL_GPL(coresight_get_in_port_dest);
u32 coresight_get_sink_id(struct coresight_device *csdev) { if (!csdev->ea) diff --git a/drivers/hwtracing/coresight/coresight-ctcu-core.c b/drivers/hwtracing/coresight/coresight-ctcu-core.c index c6bafc96db96..3bdedf041390 100644 --- a/drivers/hwtracing/coresight/coresight-ctcu-core.c +++ b/drivers/hwtracing/coresight/coresight-ctcu-core.c @@ -118,23 +118,6 @@ static int __ctcu_set_etr_traceid(struct coresight_device *csdev, u8 traceid, in return 0; }
-/*
- Searching the sink device from helper's view in case there are multiple helper devices
- connected to the sink device.
- */
-static int ctcu_get_active_port(struct coresight_device *sink, struct coresight_device *helper) -{
struct coresight_platform_data *pdata = helper->pdata;int i;for (i = 0; i < pdata->nr_inconns; ++i) {if (pdata->in_conns[i]->src_dev == sink)return pdata->in_conns[i]->dest_port;}return -EINVAL;-}
static int ctcu_set_etr_traceid(struct coresight_device *csdev, struct coresight_path *path, bool enable) { @@ -147,7 +130,7 @@ static int ctcu_set_etr_traceid(struct coresight_device *csdev, struct coresight return -EINVAL; }
port_num = ctcu_get_active_port(sink, csdev);
port_num = coresight_get_in_port_dest(sink, csdev); if (port_num < 0) return -EINVAL;diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 33e22b1ba043..e51b22b8ebde 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -156,6 +156,8 @@ void coresight_remove_links(struct coresight_device *orig, u32 coresight_get_sink_id(struct coresight_device *csdev); void coresight_path_assign_trace_id(struct coresight_path *path, enum cs_mode mode); +int coresight_get_in_port_dest(struct coresight_device *src,
struct coresight_device *dest);#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) int etm_readl_cp14(u32 off, unsigned int *val); -- 2.34.1
Reviewed by: Mike Leach mike.leach@linaro.org