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

coresight: Define format attributes with GEN_PMU_FORMAT_ATTR() 



This allows us to define and consume them in a unified way in later
commits.

A lot of the existing code has open coded bit shifts or direct usage of
whole config values which is error prone and hides which bits are in use
and which are free.

Reviewed-by: default avatarLeo Yan <leo.yan@arm.com>
Reviewed-by: default avatarMike Leach <mike.leach@linaro.org>
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-5-4d319764cc58@linaro.org
parent 20bc2ea2

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

+11 −10
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/mm.h>

#include <linux/init.h>

#include <linux/perf_event.h>

#include <linux/perf/arm_pmu.h>

#include <linux/percpu-defs.h>

#include <linux/slab.h>

#include <linux/stringhash.h>
@@ -50,22 +51,22 @@ struct etm_ctxt { 
static DEFINE_PER_CPU(struct etm_ctxt, etm_ctxt);

static DEFINE_PER_CPU(struct coresight_device *, csdev_src);



PMU_FORMAT_ATTR(cycacc,		"config:" __stringify(ETM_OPT_CYCACC));

PMU_FORMAT_ATTR(timestamp,	"config:" __stringify(ETM_OPT_TS));

PMU_FORMAT_ATTR(retstack,	"config:" __stringify(ETM_OPT_RETSTK));

PMU_FORMAT_ATTR(sinkid,		"config2:0-31");

GEN_PMU_FORMAT_ATTR(cycacc);

GEN_PMU_FORMAT_ATTR(timestamp);

GEN_PMU_FORMAT_ATTR(retstack);

GEN_PMU_FORMAT_ATTR(sinkid);



#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)

PMU_FORMAT_ATTR(branch_broadcast, "config:"__stringify(ETM_OPT_BRANCH_BROADCAST));

GEN_PMU_FORMAT_ATTR(branch_broadcast);

/* contextid1 enables tracing CONTEXTIDR_EL1*/

PMU_FORMAT_ATTR(contextid1,	"config:" __stringify(ETM_OPT_CTXTID));

GEN_PMU_FORMAT_ATTR(contextid1);

/* contextid2 enables tracing CONTEXTIDR_EL2*/

PMU_FORMAT_ATTR(contextid2,	"config:" __stringify(ETM_OPT_CTXTID2));

GEN_PMU_FORMAT_ATTR(contextid2);

/* preset - if sink ID is used as a configuration selector */

PMU_FORMAT_ATTR(preset,		"config:0-3");

GEN_PMU_FORMAT_ATTR(preset);

/* config ID - set if a system configuration is selected */

PMU_FORMAT_ATTR(configid,	"config2:32-63");

PMU_FORMAT_ATTR(cc_threshold,	"config3:0-11");

GEN_PMU_FORMAT_ATTR(configid);

GEN_PMU_FORMAT_ATTR(cc_threshold);



/*

 * contextid always traces the "PID".  The PID is in CONTEXTIDR_EL1

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

+31 −0
Original line number Diff line number Diff line
@@ -20,6 +20,37 @@ struct cscfg_config_desc; 
 */

#define ETM_ADDR_CMP_MAX	8



#define ATTR_CFG_FLD_preset_CFG			config

#define ATTR_CFG_FLD_preset_LO			0

#define ATTR_CFG_FLD_preset_HI			3

#define ATTR_CFG_FLD_branch_broadcast_CFG	config

#define ATTR_CFG_FLD_branch_broadcast_LO	8

#define ATTR_CFG_FLD_branch_broadcast_HI	8

#define ATTR_CFG_FLD_cycacc_CFG			config

#define ATTR_CFG_FLD_cycacc_LO			12

#define ATTR_CFG_FLD_cycacc_HI			12

#define ATTR_CFG_FLD_contextid1_CFG		config

#define ATTR_CFG_FLD_contextid1_LO		14

#define ATTR_CFG_FLD_contextid1_HI		14

#define ATTR_CFG_FLD_contextid2_CFG		config

#define ATTR_CFG_FLD_contextid2_LO		15

#define ATTR_CFG_FLD_contextid2_HI		15

#define ATTR_CFG_FLD_timestamp_CFG		config

#define ATTR_CFG_FLD_timestamp_LO		28

#define ATTR_CFG_FLD_timestamp_HI		28

#define ATTR_CFG_FLD_retstack_CFG		config

#define ATTR_CFG_FLD_retstack_LO		29

#define ATTR_CFG_FLD_retstack_HI		29

#define ATTR_CFG_FLD_sinkid_CFG			config2

#define ATTR_CFG_FLD_sinkid_LO			0

#define ATTR_CFG_FLD_sinkid_HI			31

#define ATTR_CFG_FLD_configid_CFG		config2

#define ATTR_CFG_FLD_configid_LO		32

#define ATTR_CFG_FLD_configid_HI		63

#define ATTR_CFG_FLD_cc_threshold_CFG		config3

#define ATTR_CFG_FLD_cc_threshold_LO		0

#define ATTR_CFG_FLD_cc_threshold_HI		11



/**

 * struct etm_filter - single instruction range or start/stop configuration.

 * @start_addr:	The address to start tracing on.