Commit b945d367 authored by James Clark's avatar James Clark Committed by Suzuki K Poulose
Browse files

coresight: Interpret perf config with ATTR_CFG_GET_FLD() 



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.

Tested-by: default avatarLeo Yan <leo.yan@arm.com>
Signed-off-by: default avatarJames Clark <james.clark@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20251128-james-cs-syncfreq-v8-8-4d319764cc58@linaro.org
parent d633fd22

drivers/hwtracing/coresight/coresight-etm-perf.c

+8 −10
Original line number Diff line number Diff line
@@ -77,10 +77,9 @@ static ssize_t format_attr_contextid_show(struct device *dev, 
					  struct device_attribute *attr,

					  char *page)

{

	int pid_fmt = ETM_OPT_CTXTID;



	pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;

	return sprintf(page, "config:%d\n", pid_fmt);

	if (is_kernel_in_hyp_mode())

		return contextid2_show(dev, attr, page);

	return contextid1_show(dev, attr, page);

}



static struct device_attribute format_attr_contextid =
@@ -319,7 +318,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;
@@ -332,13 +331,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;