Skip to content

Commit 29e2eb2

Browse files
mikel-armbbacmel
authored andcommitted
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 <[email protected]> Reviewed-by: Leo Yan <[email protected]> Reviewed-by: Mathieu Poirier <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Suzuki Poulouse <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 51d9635 commit 29e2eb2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tools/build/feature/test-libopencsd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
/*
55
* Check OpenCSD library version is sufficient to provide required features
66
*/
7-
#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))
7+
#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0))
88
#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"
1010
#endif
1111

1212
int main(void)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
564564
resp = cs_etm_decoder__set_tid(etmq, packet_queue,
565565
elem, trace_chan_id);
566566
break;
567+
/* Unused packet types */
568+
case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH:
567569
case OCSD_GEN_TRC_ELEM_ADDR_NACC:
568570
case OCSD_GEN_TRC_ELEM_CYCLE_COUNT:
569571
case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN:

0 commit comments

Comments
 (0)