Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8fa7a80 authored by Solomon Tan's avatar Solomon Tan Committed by Arnaldo Carvalho de Melo
Browse files

perf cs-etm: Add missing case value 



The following error was thrown when compiling `tools/perf` using OpenCSD
v0.11.1. This patch fixes said error.

    CC       util/intel-pt-decoder/intel-pt-log.o
    CC       util/cs-etm-decoder/cs-etm-decoder.o
  util/cs-etm-decoder/cs-etm-decoder.c: In function
  ‘cs_etm_decoder__buffer_range’:
  util/cs-etm-decoder/cs-etm-decoder.c:370:2: error: enumeration value
  ‘OCSD_INSTR_WFI_WFE’ not handled in switch [-Werror=switch-enum]
    switch (elem->last_i_type) {
    ^~~~~~
    CC       util/intel-pt-decoder/intel-pt-decoder.o
  cc1: all warnings being treated as errors

Because `OCSD_INSTR_WFI_WFE` case was added only in v0.11.0, the minimum
required OpenCSD library version for this patch is no longer v0.10.0.

Signed-off-by: default avatarSolomon Tan <solomonbobstoner@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Walker <robert.walker@arm.com>
Cc: Suzuki K Poulouse <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20190322052255.GA4809@w-OptiPlex-7050


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

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) | (10 << 8) | (0))

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

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

#error "OpenCSD >= 0.10.0 is required"

#error "OpenCSD >= 0.11.0 is required"

#endif



int main(void)

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

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder, 
		break;

	case OCSD_INSTR_ISB:

	case OCSD_INSTR_DSB_DMB:

	case OCSD_INSTR_WFI_WFE:

	case OCSD_INSTR_OTHER:

	default:

		packet->last_instr_taken_branch = false;