The "config:" string construction in format_attr_contextid_show() can be
removed because it either showed the existing context1 or context2
formats which have already been generated, so can be called themselves.

The other conversions are straightforward replacements.

Signed-off-by: James Clark <james.clark@linaro.org>
---
 drivers/hwtracing/coresight/coresight-etm-perf.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index d19e2568a0d1..7272e758aebf 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -80,12 +80,11 @@ static ssize_t format_attr_contextid_show(struct device *dev,
 					  struct device_attribute *attr,
 					  char *page)
 {
-	int pid_fmt = ETM_OPT_CTXTID;
-
 #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)
-	pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;
+	if (is_kernel_in_hyp_mode())
+		return contextid2_show(dev, attr, page);
 #endif
-	return sprintf(page, "config:%d\n", pid_fmt);
+	return contextid1_show(dev, attr, page);
 }
 
 static struct device_attribute format_attr_contextid =
@@ -334,7 +333,7 @@ static bool sinks_compatible(struct coresight_device *a,
 static void *etm_setup_aux(struct perf_event *event, void **pages,
 			   int nr_pages, bool overwrite)
 {
-	u32 id, cfg_hash;
+	u32 sink_hash, cfg_hash;
 	int cpu = event->cpu;
 	cpumask_t *mask;
 	struct coresight_device *sink = NULL;
@@ -347,13 +346,12 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
 	INIT_WORK(&event_data->work, free_event_data);
 
 	/* First get the selected sink from user space. */
-	if (event->attr.config2 & GENMASK_ULL(31, 0)) {
-		id = (u32)event->attr.config2;
-		sink = user_sink = coresight_get_sink_by_id(id);
-	}
+	sink_hash = ATTR_CFG_GET_FLD(&event->attr, sinkid);
+	if (sink_hash)
+		sink = user_sink = coresight_get_sink_by_id(sink_hash);
 
 	/* check if user wants a coresight configuration selected */
-	cfg_hash = (u32)((event->attr.config2 & GENMASK_ULL(63, 32)) >> 32);
+	cfg_hash = ATTR_CFG_GET_FLD(&event->attr, configid);
 	if (cfg_hash) {
 		if (cscfg_activate_config(cfg_hash))
 			goto err;

-- 
2.34.1

On Wed, Nov 12, 2025 at 03:22:14PM +0000, James Clark wrote:
> The "config:" string construction in format_attr_contextid_show() can be
> removed because it either showed the existing context1 or context2
> formats which have already been generated, so can be called themselves.
> 
> The other conversions are straightforward replacements.
> 
> Signed-off-by: James Clark <james.clark@linaro.org>
> ---
>  drivers/hwtracing/coresight/coresight-etm-perf.c | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
> index d19e2568a0d1..7272e758aebf 100644
> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c
> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
> @@ -80,12 +80,11 @@ static ssize_t format_attr_contextid_show(struct device *dev,
>  					  struct device_attribute *attr,
>  					  char *page)
>  {
> -	int pid_fmt = ETM_OPT_CTXTID;
> -
>  #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)
> -	pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;
> +	if (is_kernel_in_hyp_mode())
> +		return contextid2_show(dev, attr, page);
>  #endif

As said, this function now is only used for ETM4, we can remove "#if
IS_ENABLED(...)".

Otherwise, LGTM:

Reviewed-by: Leo Yan <leo.yan@arm.com>

On 14/11/2025 3:30 pm, Leo Yan wrote:
> On Wed, Nov 12, 2025 at 03:22:14PM +0000, James Clark wrote:
>> The "config:" string construction in format_attr_contextid_show() can be
>> removed because it either showed the existing context1 or context2
>> formats which have already been generated, so can be called themselves.
>>
>> The other conversions are straightforward replacements.
>>
>> Signed-off-by: James Clark <james.clark@linaro.org>
>> ---
>>   drivers/hwtracing/coresight/coresight-etm-perf.c | 18 ++++++++----------
>>   1 file changed, 8 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
>> index d19e2568a0d1..7272e758aebf 100644
>> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c
>> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
>> @@ -80,12 +80,11 @@ static ssize_t format_attr_contextid_show(struct device *dev,
>>   					  struct device_attribute *attr,
>>   					  char *page)
>>   {
>> -	int pid_fmt = ETM_OPT_CTXTID;
>> -
>>   #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)
>> -	pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;
>> +	if (is_kernel_in_hyp_mode())
>> +		return contextid2_show(dev, attr, page);
>>   #endif
> 
> As said, this function now is only used for ETM4, we can remove "#if
> IS_ENABLED(...)".
> 
> Otherwise, LGTM:
> 
> Reviewed-by: Leo Yan <leo.yan@arm.com>

Unfortunately it's still needed to make the build work. 
is_kernel_in_hyp_mode() results in an undefined symbol when building for 
arm32 so it needs to be ifdef'd out. I can add a comment though.

On Fri, Nov 14, 2025 at 03:34:32PM +0000, James Clark wrote:

[...]

> > > @@ -80,12 +80,11 @@ static ssize_t format_attr_contextid_show(struct device *dev,
> > >   					  struct device_attribute *attr,
> > >   					  char *page)
> > >   {
> > > -	int pid_fmt = ETM_OPT_CTXTID;
> > > -
> > >   #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)
> > > -	pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;
> > > +	if (is_kernel_in_hyp_mode())
> > > +		return contextid2_show(dev, attr, page);
> > >   #endif
> > 
> > As said, this function now is only used for ETM4, we can remove "#if
> > IS_ENABLED(...)".
> > 
> > Otherwise, LGTM:
> > 
> > Reviewed-by: Leo Yan <leo.yan@arm.com>
> 
> Unfortunately it's still needed to make the build work.
> is_kernel_in_hyp_mode() results in an undefined symbol when building for
> arm32 so it needs to be ifdef'd out. I can add a comment though.

Maybe "#ifdef CONFIG_ARM64" is more suitable?