perf cs-etm: Add support for ETMv3 trace decoding

Add support for the creation of packet printer and decoder for the ETMv3
trace architecture.  That way traces generated by tracers adhering to
that trace protocol can be handled properly by the perf infrastructure.

Signed-off-by: Mathieu 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-3-git-send-email-mathieu.poirier@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
index 5efb616bd609033c527ac1cc4696de9fe9049626..952d1f43f3fa3d08e053afdeceeaaf5c2a4e2000 100644 (file)
--- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
+++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
@@ -116,6 +116,19 @@ int cs_etm_decoder__get_packet(struct cs_etm_decoder *decoder,
        return 1;
 }
 
+static int cs_etm_decoder__gen_etmv3_config(struct cs_etm_trace_params *params,
+                                           ocsd_etmv3_cfg *config)
+{
+       config->reg_idr = params->etmv3.reg_idr;
+       config->reg_ctrl = params->etmv3.reg_ctrl;
+       config->reg_ccer = params->etmv3.reg_ccer;
+       config->reg_trc_id = params->etmv3.reg_trc_id;
+       config->arch_ver = ARCH_V7;
+       config->core_prof = profile_CortexA;
+
+       return 0;
+}
+
 static void cs_etm_decoder__gen_etmv4_config(struct cs_etm_trace_params *params,
                                             ocsd_etmv4_cfg *config)
 {
@@ -237,10 +250,16 @@ cs_etm_decoder__create_etm_packet_printer(struct cs_etm_trace_params *t_params,
                                          struct cs_etm_decoder *decoder)
 {
        const char *decoder_name;
+       ocsd_etmv3_cfg config_etmv3;
        ocsd_etmv4_cfg trace_config_etmv4;
        void *trace_config;
 
        switch (t_params->protocol) {
+       case CS_ETM_PROTO_ETMV3:
+               cs_etm_decoder__gen_etmv3_config(t_params, &config_etmv3);
+               decoder_name = OCSD_BUILTIN_DCD_ETMV3;
+               trace_config = &config_etmv3;
+               break;
        case CS_ETM_PROTO_ETMV4i:
                cs_etm_decoder__gen_etmv4_config(t_params, &trace_config_etmv4);
                decoder_name = OCSD_BUILTIN_DCD_ETMV4I;
@@ -427,11 +446,17 @@ static int cs_etm_decoder__create_etm_packet_decoder(
                                        struct cs_etm_decoder *decoder)
 {
        const char *decoder_name;
+       ocsd_etmv3_cfg config_etmv3;
        ocsd_etmv4_cfg trace_config_etmv4;
        void *trace_config;
        u8 csid;
 
        switch (t_params->protocol) {
+       case CS_ETM_PROTO_ETMV3:
+               cs_etm_decoder__gen_etmv3_config(t_params, &config_etmv3);
+               decoder_name = OCSD_BUILTIN_DCD_ETMV3;
+               trace_config = &config_etmv3;
+               break;
        case CS_ETM_PROTO_ETMV4i:
                cs_etm_decoder__gen_etmv4_config(t_params, &trace_config_etmv4);
                decoder_name = OCSD_BUILTIN_DCD_ETMV4I;