coresight: etmX.X: stm: Remove trace_id() callback

CoreSight sources provide a callback (.trace_id) in the standard source
ops which returns the ID to the core code. This was used to check that
sources all had a unique Trace ID.

Uniqueness is now gauranteed by the Trace ID allocation system, and the
check code has been removed from the core.

This patch removes the unneeded and unused .trace_id source ops
from the ops structure and implementations in etm3x, etm4x and stm.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230116124928.5440-8-mike.leach@linaro.org

diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h
index 3667428d38b6bc64b3b86c728088799ef6dc4b4e..9a0d08b092ae7f5a26a515d89428be4c00f1cac1 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm.h
+++ b/drivers/hwtracing/coresight/coresight-etm.h
@@ -283,7 +283,6 @@ static inline unsigned int etm_readl(struct etm_drvdata *drvdata, u32 off)
 }
 
 extern const struct attribute_group *coresight_etm_groups[];
-int etm_get_trace_id(struct etm_drvdata *drvdata);
 void etm_set_default(struct etm_config *config);
 void etm_config_trace_mode(struct etm_config *config);
 struct etm_config *get_etm_config(struct etm_drvdata *drvdata);

diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c
index 090b6fbf6305335a50a68bc7bbe31ed20ab727d1..afc57195ee525a178c063d2274efd5c2a153c8b5 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm3x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c
@@ -455,42 +455,6 @@ static int etm_cpu_id(struct coresight_device *csdev)
        return drvdata->cpu;
 }
 
-int etm_get_trace_id(struct etm_drvdata *drvdata)
-{
-       unsigned long flags;
-       int trace_id = -1;
-       struct device *etm_dev;
-
-       if (!drvdata)
-               goto out;
-
-       etm_dev = drvdata->csdev->dev.parent;
-       if (!local_read(&drvdata->mode))
-               return drvdata->traceid;
-
-       pm_runtime_get_sync(etm_dev);
-
-       spin_lock_irqsave(&drvdata->spinlock, flags);
-
-       CS_UNLOCK(drvdata->base);
-       trace_id = (etm_readl(drvdata, ETMTRACEIDR) & ETM_TRACEID_MASK);
-       CS_LOCK(drvdata->base);
-
-       spin_unlock_irqrestore(&drvdata->spinlock, flags);
-       pm_runtime_put(etm_dev);
-
-out:
-       return trace_id;
-
-}
-
-static int etm_trace_id(struct coresight_device *csdev)
-{
-       struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-
-       return etm_get_trace_id(drvdata);
-}
-
 int etm_read_alloc_trace_id(struct etm_drvdata *drvdata)
 {
        int trace_id;
@@ -737,7 +701,6 @@ static void etm_disable(struct coresight_device *csdev,
 
 static const struct coresight_ops_source etm_source_ops = {
        .cpu_id         = etm_cpu_id,
-       .trace_id       = etm_trace_id,
        .enable         = etm_enable,
        .disable        = etm_disable,
 };

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 346c0c37c17704d495b79ead6b69711ed9c768bb..1ea8f173cca0d9d4561fae5b2e885f581ff6f31c 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -231,13 +231,6 @@ static int etm4_cpu_id(struct coresight_device *csdev)
        return drvdata->cpu;
 }
 
-static int etm4_trace_id(struct coresight_device *csdev)
-{
-       struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-
-       return drvdata->trcid;
-}
-
 int etm4_read_alloc_trace_id(struct etmv4_drvdata *drvdata)
 {
        int trace_id;
@@ -1023,7 +1016,6 @@ static void etm4_disable(struct coresight_device *csdev,
 
 static const struct coresight_ops_source etm4_source_ops = {
        .cpu_id         = etm4_cpu_id,
-       .trace_id       = etm4_trace_id,
        .enable         = etm4_enable,
        .disable        = etm4_disable,
 };

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index 6af1b996af6fa3640e70308282d42c79e2df5b31..66a614c5492c99699f11add12aaa78d659fcb1fb 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -281,15 +281,7 @@ static void stm_disable(struct coresight_device *csdev,
        }
 }
 
-static int stm_trace_id(struct coresight_device *csdev)
-{
-       struct stm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-
-       return drvdata->traceid;
-}
-
 static const struct coresight_ops_source stm_source_ops = {
-       .trace_id       = stm_trace_id,
        .enable         = stm_enable,
        .disable        = stm_disable,
 };

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 1554021231f9c17680284cc93c3881f35189b488..e241eb88dfb91be219775cbf97f96bc612f0bdda 100644 (file)
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -314,14 +314,11 @@ struct coresight_ops_link {
  * Operations available for sources.
  * @cpu_id:    returns the value of the CPU number this component
  *             is associated to.
- * @trace_id:  returns the value of the component's trace ID as known
- *             to the HW.
  * @enable:    enables tracing for a source.
  * @disable:   disables tracing for a source.
  */
 struct coresight_ops_source {
        int (*cpu_id)(struct coresight_device *csdev);
-       int (*trace_id)(struct coresight_device *csdev);
        int (*enable)(struct coresight_device *csdev,
                      struct perf_event *event,  u32 mode);
        void (*disable)(struct coresight_device *csdev,