Commit 2507a3d9 authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Arnaldo Carvalho de Melo
Browse files

perf cs-etm: Introducing function cs_etm__init_trace_params() 



The trace parameter initialisation code is repeated in two different
places, something that bloats the file and can lead to errors.  This
is fixed by introducing a helper function and calling the right
protocol initialisation code when required.

Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki K Poulouse <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20190212171618.25355-7-mathieu.poirier@linaro.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ae4d9f52

tools/perf/util/cs-etm.c

+56 −56
Original line number Original line Diff line number Diff line
@@ -136,6 +136,57 @@ static void cs_etm__packet_dump(const char *pkt_string) 
	fflush(stdout);

	fflush(stdout);

}

}





static void cs_etm__set_trace_param_etmv3(struct cs_etm_trace_params *t_params,

					  struct cs_etm_auxtrace *etm, int idx,

					  u32 etmidr)

{

	u64 **metadata = etm->metadata;



	t_params[idx].protocol = cs_etm__get_v7_protocol_version(etmidr);

	t_params[idx].etmv3.reg_ctrl = metadata[idx][CS_ETM_ETMCR];

	t_params[idx].etmv3.reg_trc_id = metadata[idx][CS_ETM_ETMTRACEIDR];

}



static void cs_etm__set_trace_param_etmv4(struct cs_etm_trace_params *t_params,

					  struct cs_etm_auxtrace *etm, int idx)

{

	u64 **metadata = etm->metadata;



	t_params[idx].protocol = CS_ETM_PROTO_ETMV4i;

	t_params[idx].etmv4.reg_idr0 = metadata[idx][CS_ETMV4_TRCIDR0];

	t_params[idx].etmv4.reg_idr1 = metadata[idx][CS_ETMV4_TRCIDR1];

	t_params[idx].etmv4.reg_idr2 = metadata[idx][CS_ETMV4_TRCIDR2];

	t_params[idx].etmv4.reg_idr8 = metadata[idx][CS_ETMV4_TRCIDR8];

	t_params[idx].etmv4.reg_configr = metadata[idx][CS_ETMV4_TRCCONFIGR];

	t_params[idx].etmv4.reg_traceidr = metadata[idx][CS_ETMV4_TRCTRACEIDR];

}



static int cs_etm__init_trace_params(struct cs_etm_trace_params *t_params,

				     struct cs_etm_auxtrace *etm)

{

	int i;

	u32 etmidr;

	u64 architecture;



	for (i = 0; i < etm->num_cpu; i++) {

		architecture = etm->metadata[i][CS_ETM_MAGIC];



		switch (architecture) {

		case __perf_cs_etmv3_magic:

			etmidr = etm->metadata[i][CS_ETM_ETMIDR];

			cs_etm__set_trace_param_etmv3(t_params, etm, i, etmidr);

			break;

		case __perf_cs_etmv4_magic:

			cs_etm__set_trace_param_etmv4(t_params, etm, i);

			break;

		default:

			return -EINVAL;

		}

	}



	return 0;

}



static int cs_etm__init_decoder_params(struct cs_etm_decoder_params *d_params,

static int cs_etm__init_decoder_params(struct cs_etm_decoder_params *d_params,

				       struct cs_etm_queue *etmq,

				       struct cs_etm_queue *etmq,

				       enum cs_etm_decoder_operation mode)

				       enum cs_etm_decoder_operation mode)
@@ -161,7 +212,7 @@ out: 
static void cs_etm__dump_event(struct cs_etm_auxtrace *etm,

static void cs_etm__dump_event(struct cs_etm_auxtrace *etm,

			       struct auxtrace_buffer *buffer)

			       struct auxtrace_buffer *buffer)

{

{

	int i, ret;

	int ret;

	const char *color = PERF_COLOR_BLUE;

	const char *color = PERF_COLOR_BLUE;

	struct cs_etm_decoder_params d_params;

	struct cs_etm_decoder_params d_params;

	struct cs_etm_trace_params *t_params;

	struct cs_etm_trace_params *t_params;
@@ -179,33 +230,8 @@ static void cs_etm__dump_event(struct cs_etm_auxtrace *etm, 
	if (!t_params)

	if (!t_params)

		return;

		return;





	for (i = 0; i < etm->num_cpu; i++) {

	if (cs_etm__init_trace_params(t_params, etm))

		if (etm->metadata[i][CS_ETM_MAGIC] == __perf_cs_etmv3_magic) {

		goto out_free;

			u32 etmidr = etm->metadata[i][CS_ETM_ETMIDR];



			t_params[i].protocol =

					cs_etm__get_v7_protocol_version(etmidr);

			t_params[i].etmv3.reg_ctrl =

					etm->metadata[i][CS_ETM_ETMCR];

			t_params[i].etmv3.reg_trc_id =

					etm->metadata[i][CS_ETM_ETMTRACEIDR];

		} else if (etm->metadata[i][CS_ETM_MAGIC] ==

						      __perf_cs_etmv4_magic) {

			t_params[i].protocol = CS_ETM_PROTO_ETMV4i;

			t_params[i].etmv4.reg_idr0 =

					etm->metadata[i][CS_ETMV4_TRCIDR0];

			t_params[i].etmv4.reg_idr1 =

					etm->metadata[i][CS_ETMV4_TRCIDR1];

			t_params[i].etmv4.reg_idr2 =

					etm->metadata[i][CS_ETMV4_TRCIDR2];

			t_params[i].etmv4.reg_idr8 =

					etm->metadata[i][CS_ETMV4_TRCIDR8];

			t_params[i].etmv4.reg_configr =

					etm->metadata[i][CS_ETMV4_TRCCONFIGR];

			t_params[i].etmv4.reg_traceidr =

					etm->metadata[i][CS_ETMV4_TRCTRACEIDR];

		}

	}





	/* Set decoder parameters to simply print the trace packets */

	/* Set decoder parameters to simply print the trace packets */

	if (cs_etm__init_decoder_params(&d_params, NULL,

	if (cs_etm__init_decoder_params(&d_params, NULL,
@@ -382,7 +408,6 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address, 
static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm,

static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm,

						unsigned int queue_nr)

						unsigned int queue_nr)

{

{

	int i;

	struct cs_etm_decoder_params d_params;

	struct cs_etm_decoder_params d_params;

	struct cs_etm_trace_params  *t_params = NULL;

	struct cs_etm_trace_params  *t_params = NULL;

	struct cs_etm_queue *etmq;

	struct cs_etm_queue *etmq;
@@ -431,33 +456,8 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm, 
	if (!t_params)

	if (!t_params)

		goto out_free;

		goto out_free;





	for (i = 0; i < etm->num_cpu; i++) {

	if (cs_etm__init_trace_params(t_params, etm))

		if (etm->metadata[i][CS_ETM_MAGIC] == __perf_cs_etmv3_magic) {

		goto out_free;

			u32 etmidr = etm->metadata[i][CS_ETM_ETMIDR];



			t_params[i].protocol =

					cs_etm__get_v7_protocol_version(etmidr);

			t_params[i].etmv3.reg_ctrl =

					etm->metadata[i][CS_ETM_ETMCR];

			t_params[i].etmv3.reg_trc_id =

					etm->metadata[i][CS_ETM_ETMTRACEIDR];

		} else if (etm->metadata[i][CS_ETM_MAGIC] ==

							__perf_cs_etmv4_magic) {

			t_params[i].protocol = CS_ETM_PROTO_ETMV4i;

			t_params[i].etmv4.reg_idr0 =

					etm->metadata[i][CS_ETMV4_TRCIDR0];

			t_params[i].etmv4.reg_idr1 =

					etm->metadata[i][CS_ETMV4_TRCIDR1];

			t_params[i].etmv4.reg_idr2 =

					etm->metadata[i][CS_ETMV4_TRCIDR2];

			t_params[i].etmv4.reg_idr8 =

					etm->metadata[i][CS_ETMV4_TRCIDR8];

			t_params[i].etmv4.reg_configr =

					etm->metadata[i][CS_ETMV4_TRCCONFIGR];

			t_params[i].etmv4.reg_traceidr =

					etm->metadata[i][CS_ETMV4_TRCTRACEIDR];

		}

	}





	/* Set decoder parameters to simply print the trace packets */

	/* Set decoder parameters to simply print the trace packets */

	if (cs_etm__init_decoder_params(&d_params, etmq,

	if (cs_etm__init_decoder_params(&d_params, etmq,

tools/perf/util/cs-etm.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -105,8 +105,8 @@ struct intlist *traceid_list; 




#define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))

#define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))





static const u64 __perf_cs_etmv3_magic   = 0x3030303030303030ULL;

#define __perf_cs_etmv3_magic 0x3030303030303030ULL

static const u64 __perf_cs_etmv4_magic   = 0x4040404040404040ULL;

#define __perf_cs_etmv4_magic 0x4040404040404040ULL

#define CS_ETMV3_PRIV_SIZE (CS_ETM_PRIV_MAX * sizeof(u64))

#define CS_ETMV3_PRIV_SIZE (CS_ETM_PRIV_MAX * sizeof(u64))

#define CS_ETMV4_PRIV_SIZE (CS_ETMV4_PRIV_MAX * sizeof(u64))

#define CS_ETMV4_PRIV_SIZE (CS_ETMV4_PRIV_MAX * sizeof(u64))

CRA Git | Maintained and supported by SUSTech CRA and CCSE