Commit 15d4371b authored by James Clark's avatar James Clark Committed by Arnaldo Carvalho de Melo
Browse files

perf cs-etm: Copy kernel coresight-pmu.h header 



Copy the kernel version of the header to fix the header diff build
warning. Some new definitions were only added to the tools side header,
but these are only used in Perf so move them to a different header.

Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Reviewed-by: default avatarMike Leach <mike.leach@linaro.org>
Link: https://lore.kernel.org/r/20230522102604.1081416-1-james.clark@arm.com


Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: acme@kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: coresight@lists.linaro.org
Cc: siyanteng@loongson.cn
Cc: John Garry <john.g.garry@oracle.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-perf-users@vger.kernel.org
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 251c01e2

tools/include/linux/coresight-pmu.h

+0 −13
Original line number Diff line number Diff line
@@ -21,19 +21,6 @@ 
 */

#define CORESIGHT_LEGACY_CPU_TRACE_ID(cpu)  (0x10 + (cpu * 2))



/* CoreSight trace ID is currently the bottom 7 bits of the value */

#define CORESIGHT_TRACE_ID_VAL_MASK	GENMASK(6, 0)



/*

 * perf record will set the legacy meta data values as unused initially.

 * This allows perf report to manage the decoders created when dynamic

 * allocation in operation.

 */

#define CORESIGHT_TRACE_ID_UNUSED_FLAG	BIT(31)



/* Value to set for unused trace ID values */

#define CORESIGHT_TRACE_ID_UNUSED_VAL	0x7F



/*

 * Below are the definition of bit offsets for perf option, and works as

 * arbitrary values for all ETM versions.

tools/perf/util/cs-etm.h

+13 −0
Original line number Diff line number Diff line
@@ -227,6 +227,19 @@ struct cs_etm_packet_queue { 
#define INFO_HEADER_SIZE (sizeof(((struct perf_record_auxtrace_info *)0)->type) + \

			  sizeof(((struct perf_record_auxtrace_info *)0)->reserved__))



/* CoreSight trace ID is currently the bottom 7 bits of the value */

#define CORESIGHT_TRACE_ID_VAL_MASK	GENMASK(6, 0)



/*

 * perf record will set the legacy meta data values as unused initially.

 * This allows perf report to manage the decoders created when dynamic

 * allocation in operation.

 */

#define CORESIGHT_TRACE_ID_UNUSED_FLAG	BIT(31)



/* Value to set for unused trace ID values */

#define CORESIGHT_TRACE_ID_UNUSED_VAL	0x7F



int cs_etm__process_auxtrace_info(union perf_event *event,

				  struct perf_session *session);

struct perf_event_attr *cs_etm_get_default_config(struct perf_pmu *pmu);