Commit 29e2eb2a authored by Mike Leach's avatar Mike Leach Committed by Arnaldo Carvalho de Melo
Browse files

perf: cs-etm: Update to build with latest opencsd version. 



OpenCSD version v0.14.0 adds in a new output element. This is represented
by a new value in the generic element type enum, which must be added to
the handling code in perf cs-etm-decoder to prevent build errors due to
build options on the perf project.

This element is not currently used by the perf decoder.

Perf build feature test updated to require a minimum of 0.14.0

Tested on Linux 5.7-rc3.

Signed-off-by: default avatarMike Leach <mike.leach@linaro.org>
Reviewed-by: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200501143615.1180-1-mike.leach@linaro.org


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

tools/build/feature/test-libopencsd.c

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
/*

 * Check OpenCSD library version is sufficient to provide required features

 */

#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))

#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0))

#if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)

#error "OpenCSD >= 0.11.0 is required"

#error "OpenCSD >= 0.14.0 is required"

#endif



int main(void)

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

+2 −0
Original line number Diff line number Diff line
@@ -564,6 +564,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( 
		resp = cs_etm_decoder__set_tid(etmq, packet_queue,

					       elem, trace_chan_id);

		break;

	/* Unused packet types */

	case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH:

	case OCSD_GEN_TRC_ELEM_ADDR_NACC:

	case OCSD_GEN_TRC_ELEM_CYCLE_COUNT:

	case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN: