commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream.
The variable 'traceid_list' is defined in the header file cs-etm.h,
if multiple C files include cs-etm.h the compiler might complaint for
multiple definition of 'traceid_list'.
To fix multiple definition error, move the definition of 'traceid_list'
into cs-etm.c.
Fixes: cd8bfd8c97
("perf tools: Add processing of coresight metadata")
Reported-by: Thomas Backlund <tmb@mageia.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Thomas Backlund <tmb@mageia.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Tor Jeremiassen <tor@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
|
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
*/
|
|
|
|
#ifndef INCLUDE__UTIL_PERF_CS_ETM_H__
|
|
#define INCLUDE__UTIL_PERF_CS_ETM_H__
|
|
|
|
#include "util/event.h"
|
|
#include "util/session.h"
|
|
|
|
/* Versionning header in case things need tro change in the future. That way
|
|
* decoding of old snapshot is still possible.
|
|
*/
|
|
enum {
|
|
/* Starting with 0x0 */
|
|
CS_HEADER_VERSION_0,
|
|
/* PMU->type (32 bit), total # of CPUs (32 bit) */
|
|
CS_PMU_TYPE_CPUS,
|
|
CS_ETM_SNAPSHOT,
|
|
CS_HEADER_VERSION_0_MAX,
|
|
};
|
|
|
|
/* Beginning of header common to both ETMv3 and V4 */
|
|
enum {
|
|
CS_ETM_MAGIC,
|
|
CS_ETM_CPU,
|
|
};
|
|
|
|
/* ETMv3/PTM metadata */
|
|
enum {
|
|
/* Dynamic, configurable parameters */
|
|
CS_ETM_ETMCR = CS_ETM_CPU + 1,
|
|
CS_ETM_ETMTRACEIDR,
|
|
/* RO, taken from sysFS */
|
|
CS_ETM_ETMCCER,
|
|
CS_ETM_ETMIDR,
|
|
CS_ETM_PRIV_MAX,
|
|
};
|
|
|
|
/* ETMv4 metadata */
|
|
enum {
|
|
/* Dynamic, configurable parameters */
|
|
CS_ETMV4_TRCCONFIGR = CS_ETM_CPU + 1,
|
|
CS_ETMV4_TRCTRACEIDR,
|
|
/* RO, taken from sysFS */
|
|
CS_ETMV4_TRCIDR0,
|
|
CS_ETMV4_TRCIDR1,
|
|
CS_ETMV4_TRCIDR2,
|
|
CS_ETMV4_TRCIDR8,
|
|
CS_ETMV4_TRCAUTHSTATUS,
|
|
CS_ETMV4_PRIV_MAX,
|
|
};
|
|
|
|
#define KiB(x) ((x) * 1024)
|
|
#define MiB(x) ((x) * 1024 * 1024)
|
|
|
|
#define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))
|
|
|
|
static const u64 __perf_cs_etmv3_magic = 0x3030303030303030ULL;
|
|
static const u64 __perf_cs_etmv4_magic = 0x4040404040404040ULL;
|
|
#define CS_ETMV3_PRIV_SIZE (CS_ETM_PRIV_MAX * sizeof(u64))
|
|
#define CS_ETMV4_PRIV_SIZE (CS_ETMV4_PRIV_MAX * sizeof(u64))
|
|
|
|
#ifdef HAVE_CSTRACE_SUPPORT
|
|
int cs_etm__process_auxtrace_info(union perf_event *event,
|
|
struct perf_session *session);
|
|
#else
|
|
static inline int
|
|
cs_etm__process_auxtrace_info(union perf_event *event __maybe_unused,
|
|
struct perf_session *session __maybe_unused)
|
|
{
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
#endif
|