Re: [PATCH] perf cs-etm: Copy kernel coresight-pmu.h header

[Mike Leach]

On Mon, 22 May 2023 at 11:26, James Clark <james.clark@xxxxxxx> wrote:
>
> 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: James Clark <james.clark@xxxxxxx>
> ---
>  tools/include/linux/coresight-pmu.h | 13 -------------
>  tools/perf/util/cs-etm.h            | 13 +++++++++++++
>  2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/tools/include/linux/coresight-pmu.h b/tools/include/linux/coresight-pmu.h
> index cef3b1c25335..51ac441a37c3 100644
> --- a/tools/include/linux/coresight-pmu.h
> +++ b/tools/include/linux/coresight-pmu.h
> @@ -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.
> diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
> index 70cac0375b34..ecca40787ac9 100644
> --- a/tools/perf/util/cs-etm.h
> +++ b/tools/perf/util/cs-etm.h
> @@ -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);
> --
> 2.34.1
>
Reviewed-by: Mike Leach <mike.leach@xxxxxxxxxx>

-- 
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK