Re: [PATCH v2 06/13] coresight: etmX.X: stm: Remove unused legacy source Trace ID ops

[Suzuki K Poulose <suzuki.poulose@arm.com>]

Hi Mike

Nice diff stat !

Also minor nit on subject:

coresight: source: Remove trace_id() call back


On 04/07/2022 09:11, Mike Leach wrote:
> 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>
> ---
>   drivers/hwtracing/coresight/coresight-etm.h   |  1 -
>   .../coresight/coresight-etm3x-core.c          | 37 -------------------
>   .../coresight/coresight-etm4x-core.c          |  8 ----
>   drivers/hwtracing/coresight/coresight-stm.c   |  8 ----
>   include/linux/coresight.h                     |  3 --
>   5 files changed, 57 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h
> index 3667428d38b6..9a0d08b092ae 100644
> --- 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 273f37be322b..911d961dd736 100644
> --- 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;
> @@ -731,7 +695,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 3f4f7ddd14ec..b7c7980cc71c 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -228,13 +228,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;
> @@ -998,7 +991,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 9ef3e923a930..f4b4232614b0 100644
> --- 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 9f445f09fcfe..247147c11231 100644
> --- 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,


Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>