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

perf cs-etm: Add configuration for ETMv3 trace protocol 



This patch deals with the proper initialisation of configuration
parameters for the ETMv3 trace protocol in order to properly handle
packets generated by tracers following this specification.

Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1543955944-10042-2-git-send-email-mathieu.poirier@linaro.org


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

tools/perf/util/cs-etm-decoder/cs-etm-decoder.h

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ struct cs_etm_queue; 
typedef u32 (*cs_etm_mem_cb_type)(struct cs_etm_queue *, u64,

				  size_t, u8 *);



struct cs_etmv3_trace_params {

	u32 reg_ctrl;

	u32 reg_trc_id;

	u32 reg_ccer;

	u32 reg_idr;

};



struct cs_etmv4_trace_params {

	u32 reg_idr0;

	u32 reg_idr1;
@@ -65,6 +72,7 @@ struct cs_etmv4_trace_params { 
struct cs_etm_trace_params {

	int protocol;

	union {

		struct cs_etmv3_trace_params etmv3;

		struct cs_etmv4_trace_params etmv4;

	};

};

tools/perf/util/cs-etm.c

+40 −14
Original line number Diff line number Diff line
@@ -114,16 +114,29 @@ static void cs_etm__dump_event(struct cs_etm_auxtrace *etm, 
	/* Use metadata to fill in trace parameters for trace decoder */

	t_params = zalloc(sizeof(*t_params) * etm->num_cpu);

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

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

			t_params[i].protocol = CS_ETM_PROTO_ETMV3;

			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_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 */

	d_params.packet_printer = cs_etm__packet_dump;
@@ -352,16 +365,29 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm, 
		goto out_free;



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

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

			t_params[i].protocol = CS_ETM_PROTO_ETMV3;

			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_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 */

	d_params.packet_printer = cs_etm__packet_dump;