Commit 49ccf87b authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo

perf cs-etm: Rename CS_ETM_TRACE_ON to CS_ETM_DISCONTINUITY

TRACE_ON element is used at the beginning of trace, it also can be
appeared in the middle of trace data to indicate discontinuity; for
example, it's possible to see multiple TRACE_ON elements in the trace
stream if the trace is being limited by address range filtering.

Furthermore, except TRACE_ON element is for discontinuity, NO_SYNC and
EO_TRACE also can be used to indicate discontinuity, though they are
used for different scenarios for which the trace is interrupted.

This patch renames sample type CS_ETM_TRACE_ON to CS_ETM_DISCONTINUITY,
firstly the new name describes more closely the purpose of the packet;
secondly this is a preparation for other output elements which also
cause the trace discontinuity thus they can share the same one packet
type.
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Robert Walker <robert.walker@arm.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1544513908-16805-6-git-send-email-leo.yan@linaro.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cfc1d427
...@@ -390,11 +390,11 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder, ...@@ -390,11 +390,11 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder,
} }
static ocsd_datapath_resp_t static ocsd_datapath_resp_t
cs_etm_decoder__buffer_trace_on(struct cs_etm_decoder *decoder, cs_etm_decoder__buffer_discontinuity(struct cs_etm_decoder *decoder,
const uint8_t trace_chan_id) const uint8_t trace_chan_id)
{ {
return cs_etm_decoder__buffer_packet(decoder, trace_chan_id, return cs_etm_decoder__buffer_packet(decoder, trace_chan_id,
CS_ETM_TRACE_ON); CS_ETM_DISCONTINUITY);
} }
static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
...@@ -412,7 +412,7 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( ...@@ -412,7 +412,7 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
case OCSD_GEN_TRC_ELEM_NO_SYNC: case OCSD_GEN_TRC_ELEM_NO_SYNC:
break; break;
case OCSD_GEN_TRC_ELEM_TRACE_ON: case OCSD_GEN_TRC_ELEM_TRACE_ON:
resp = cs_etm_decoder__buffer_trace_on(decoder, resp = cs_etm_decoder__buffer_discontinuity(decoder,
trace_chan_id); trace_chan_id);
break; break;
case OCSD_GEN_TRC_ELEM_INSTR_RANGE: case OCSD_GEN_TRC_ELEM_INSTR_RANGE:
......
...@@ -25,7 +25,7 @@ struct cs_etm_buffer { ...@@ -25,7 +25,7 @@ struct cs_etm_buffer {
enum cs_etm_sample_type { enum cs_etm_sample_type {
CS_ETM_EMPTY, CS_ETM_EMPTY,
CS_ETM_RANGE, CS_ETM_RANGE,
CS_ETM_TRACE_ON, CS_ETM_DISCONTINUITY,
}; };
enum cs_etm_isa { enum cs_etm_isa {
......
...@@ -562,8 +562,8 @@ static inline int cs_etm__t32_instr_size(struct cs_etm_queue *etmq, ...@@ -562,8 +562,8 @@ static inline int cs_etm__t32_instr_size(struct cs_etm_queue *etmq,
static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet) static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet)
{ {
/* Returns 0 for the CS_ETM_TRACE_ON packet */ /* Returns 0 for the CS_ETM_DISCONTINUITY packet */
if (packet->sample_type == CS_ETM_TRACE_ON) if (packet->sample_type == CS_ETM_DISCONTINUITY)
return 0; return 0;
return packet->start_addr; return packet->start_addr;
...@@ -572,8 +572,8 @@ static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet) ...@@ -572,8 +572,8 @@ static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet)
static inline static inline
u64 cs_etm__last_executed_instr(const struct cs_etm_packet *packet) u64 cs_etm__last_executed_instr(const struct cs_etm_packet *packet)
{ {
/* Returns 0 for the CS_ETM_TRACE_ON packet */ /* Returns 0 for the CS_ETM_DISCONTINUITY packet */
if (packet->sample_type == CS_ETM_TRACE_ON) if (packet->sample_type == CS_ETM_DISCONTINUITY)
return 0; return 0;
return packet->end_addr - packet->last_instr_size; return packet->end_addr - packet->last_instr_size;
...@@ -972,7 +972,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) ...@@ -972,7 +972,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq)
bool generate_sample = false; bool generate_sample = false;
/* Generate sample for tracing on packet */ /* Generate sample for tracing on packet */
if (etmq->prev_packet->sample_type == CS_ETM_TRACE_ON) if (etmq->prev_packet->sample_type == CS_ETM_DISCONTINUITY)
generate_sample = true; generate_sample = true;
/* Generate sample for branch taken packet */ /* Generate sample for branch taken packet */
...@@ -1148,7 +1148,7 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) ...@@ -1148,7 +1148,7 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq)
*/ */
cs_etm__sample(etmq); cs_etm__sample(etmq);
break; break;
case CS_ETM_TRACE_ON: case CS_ETM_DISCONTINUITY:
/* /*
* Discontinuity in trace, flush * Discontinuity in trace, flush
* previous branch stack * previous branch stack
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment