Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mathieu 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: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Mike Leach and committed by
Arnaldo Carvalho de Melo
29e2eb2a 51d96355

+4 -2
+2 -2
tools/build/feature/test-libopencsd.c
··· 4 4 /* 5 5 * Check OpenCSD library version is sufficient to provide required features 6 6 */ 7 - #define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0)) 7 + #define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0)) 8 8 #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) 9 - #error "OpenCSD >= 0.11.0 is required" 9 + #error "OpenCSD >= 0.14.0 is required" 10 10 #endif 11 11 12 12 int main(void)
+2
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
··· 564 564 resp = cs_etm_decoder__set_tid(etmq, packet_queue, 565 565 elem, trace_chan_id); 566 566 break; 567 + /* Unused packet types */ 568 + case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH: 567 569 case OCSD_GEN_TRC_ELEM_ADDR_NACC: 568 570 case OCSD_GEN_TRC_ELEM_CYCLE_COUNT: 569 571 case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN: