From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaldo Carvalho de Melo Subject: [PATCH 01/13] perf cs-etm: Add missing case value Date: Fri, 29 Mar 2019 10:37:49 -0300 Message-ID: <20190329133801.21004-2-acme@kernel.org> References: <20190329133801.21004-1-acme@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190329133801.21004-1-acme@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Ingo Molnar , Thomas Gleixner Cc: Solomon Tan , Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulouse , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Alexander Shishkin , Peter Zijlstra , Jiri Olsa , Namhyung Kim , Robert Walker , Jiri Olsa , linux-arm-kernel@lists.infradead.org List-Id: linux-perf-users.vger.kernel.org RnJvbTogU29sb21vbiBUYW4gPHNvbG9tb25ib2JzdG9uZXJAZ21haWwuY29tPgoKVGhlIGZvbGxv d2luZyBlcnJvciB3YXMgdGhyb3duIHdoZW4gY29tcGlsaW5nIGB0b29scy9wZXJmYCB1c2luZyBP cGVuQ1NECnYwLjExLjEuIFRoaXMgcGF0Y2ggZml4ZXMgc2FpZCBlcnJvci4KCiAgICBDQyAgICAg ICB1dGlsL2ludGVsLXB0LWRlY29kZXIvaW50ZWwtcHQtbG9nLm8KICAgIENDICAgICAgIHV0aWwv Y3MtZXRtLWRlY29kZXIvY3MtZXRtLWRlY29kZXIubwogIHV0aWwvY3MtZXRtLWRlY29kZXIvY3Mt ZXRtLWRlY29kZXIuYzogSW4gZnVuY3Rpb24KICDigJhjc19ldG1fZGVjb2Rlcl9fYnVmZmVyX3Jh bmdl4oCZOgogIHV0aWwvY3MtZXRtLWRlY29kZXIvY3MtZXRtLWRlY29kZXIuYzozNzA6MjogZXJy b3I6IGVudW1lcmF0aW9uIHZhbHVlCiAg4oCYT0NTRF9JTlNUUl9XRklfV0ZF4oCZIG5vdCBoYW5k bGVkIGluIHN3aXRjaCBbLVdlcnJvcj1zd2l0Y2gtZW51bV0KICAgIHN3aXRjaCAoZWxlbS0+bGFz dF9pX3R5cGUpIHsKICAgIF5+fn5+fgogICAgQ0MgICAgICAgdXRpbC9pbnRlbC1wdC1kZWNvZGVy L2ludGVsLXB0LWRlY29kZXIubwogIGNjMTogYWxsIHdhcm5pbmdzIGJlaW5nIHRyZWF0ZWQgYXMg ZXJyb3JzCgpCZWNhdXNlIGBPQ1NEX0lOU1RSX1dGSV9XRkVgIGNhc2Ugd2FzIGFkZGVkIG9ubHkg aW4gdjAuMTEuMCwgdGhlIG1pbmltdW0KcmVxdWlyZWQgT3BlbkNTRCBsaWJyYXJ5IHZlcnNpb24g Zm9yIHRoaXMgcGF0Y2ggaXMgbm8gbG9uZ2VyIHYwLjEwLjAuCgpTaWduZWQtb2ZmLWJ5OiBTb2xv bW9uIFRhbiA8c29sb21vbmJvYnN0b25lckBnbWFpbC5jb20+CkNjOiBBbGV4YW5kZXIgU2hpc2hr aW4gPGFsZXhhbmRlci5zaGlzaGtpbkBsaW51eC5pbnRlbC5jb20+CkNjOiBKaXJpIE9sc2EgPGpv bHNhQHJlZGhhdC5jb20+CkNjOiBNYXRoaWV1IFBvaXJpZXIgPG1hdGhpZXUucG9pcmllckBsaW5h cm8ub3JnPgpDYzogTmFtaHl1bmcgS2ltIDxuYW1oeXVuZ0BrZXJuZWwub3JnPgpDYzogUGV0ZXIg WmlqbHN0cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzogUm9iZXJ0IFdhbGtlciA8cm9iZXJ0 LndhbGtlckBhcm0uY29tPgpDYzogU3V6dWtpIEsgUG91bG91c2UgPHN1enVraS5wb3Vsb3NlQGFy bS5jb20+CkNjOiBsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKTGluazogaHR0 cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTkwMzIyMDUyMjU1LkdBNDgwOUB3LU9wdGlQbGV4LTcw NTAKU2lnbmVkLW9mZi1ieTogQXJuYWxkbyBDYXJ2YWxobyBkZSBNZWxvIDxhY21lQHJlZGhhdC5j b20+Ci0tLQogdG9vbHMvYnVpbGQvZmVhdHVyZS90ZXN0LWxpYm9wZW5jc2QuYyAgICAgICAgICAg fCA0ICsrLS0KIHRvb2xzL3BlcmYvdXRpbC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVjb2Rlci5j IHwgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS90b29scy9idWlsZC9mZWF0dXJlL3Rlc3QtbGlib3BlbmNzZC5jIGIvdG9v bHMvYnVpbGQvZmVhdHVyZS90ZXN0LWxpYm9wZW5jc2QuYwppbmRleCBkNjhlYjRmYjQwY2MuLjJi MGUwMmMzODg3MCAxMDA2NDQKLS0tIGEvdG9vbHMvYnVpbGQvZmVhdHVyZS90ZXN0LWxpYm9wZW5j c2QuYworKysgYi90b29scy9idWlsZC9mZWF0dXJlL3Rlc3QtbGlib3BlbmNzZC5jCkBAIC00LDkg KzQsOSBAQAogLyoKICAqIENoZWNrIE9wZW5DU0QgbGlicmFyeSB2ZXJzaW9uIGlzIHN1ZmZpY2ll bnQgdG8gcHJvdmlkZSByZXF1aXJlZCBmZWF0dXJlcwogICovCi0jZGVmaW5lIE9DU0RfTUlOX1ZF UiAoKDAgPDwgMTYpIHwgKDEwIDw8IDgpIHwgKDApKQorI2RlZmluZSBPQ1NEX01JTl9WRVIgKCgw IDw8IDE2KSB8ICgxMSA8PCA4KSB8ICgwKSkKICNpZiAhZGVmaW5lZChPQ1NEX1ZFUl9OVU0pIHx8 IChPQ1NEX1ZFUl9OVU0gPCBPQ1NEX01JTl9WRVIpCi0jZXJyb3IgIk9wZW5DU0QgPj0gMC4xMC4w IGlzIHJlcXVpcmVkIgorI2Vycm9yICJPcGVuQ1NEID49IDAuMTEuMCBpcyByZXF1aXJlZCIKICNl bmRpZgogCiBpbnQgbWFpbih2b2lkKQpkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi91dGlsL2NzLWV0 bS1kZWNvZGVyL2NzLWV0bS1kZWNvZGVyLmMgYi90b29scy9wZXJmL3V0aWwvY3MtZXRtLWRlY29k ZXIvY3MtZXRtLWRlY29kZXIuYwppbmRleCBiYTRjNjIzY2Q4ZGUuLjM5ZmUyMWUxY2Y5MyAxMDA2 NDQKLS0tIGEvdG9vbHMvcGVyZi91dGlsL2NzLWV0bS1kZWNvZGVyL2NzLWV0bS1kZWNvZGVyLmMK KysrIGIvdG9vbHMvcGVyZi91dGlsL2NzLWV0bS1kZWNvZGVyL2NzLWV0bS1kZWNvZGVyLmMKQEAg LTM4Nyw2ICszODcsNyBAQCBjc19ldG1fZGVjb2Rlcl9fYnVmZmVyX3JhbmdlKHN0cnVjdCBjc19l dG1fZGVjb2RlciAqZGVjb2RlciwKIAkJYnJlYWs7CiAJY2FzZSBPQ1NEX0lOU1RSX0lTQjoKIAlj YXNlIE9DU0RfSU5TVFJfRFNCX0RNQjoKKwljYXNlIE9DU0RfSU5TVFJfV0ZJX1dGRToKIAljYXNl IE9DU0RfSU5TVFJfT1RIRVI6CiAJZGVmYXVsdDoKIAkJcGFja2V0LT5sYXN0X2luc3RyX3Rha2Vu X2JyYW5jaCA9IGZhbHNlOwotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B97E7C43381 for ; Fri, 29 Mar 2019 13:38:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 873E42183F for ; Fri, 29 Mar 2019 13:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553866697; bh=Wpkq7fKhOkGK+qcig9edQZnwpwpsFOVc7la2atYG6hQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H/7NNcWuPNdECXcZmww47yoyC1BZ+hM1l9XnnwFqXXvEedzBQBB1C5+k6ryub2nQb W/XXx8pcwQEhfHaLcKSJfiC5pybp3l078vknGbgzrsVGuq/w0FeQZWgtgIGbPwTQRX phoaEepWsC5EV0uii0n0H1TI9sOyeuIYTbVbAcQs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729739AbfC2NiQ (ORCPT ); Fri, 29 Mar 2019 09:38:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:33566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729636AbfC2NiQ (ORCPT ); Fri, 29 Mar 2019 09:38:16 -0400 Received: from quaco.ghostprotocols.net (unknown [190.15.121.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0199C2173C; Fri, 29 Mar 2019 13:38:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553866694; bh=Wpkq7fKhOkGK+qcig9edQZnwpwpsFOVc7la2atYG6hQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cTluN8uXxN5K8PmCUGCtMNCMycpjrG1cbiKQatFQuFGYXwwHRpenzpw0TT5VxEo/k +oU1zfCdqyZ0JHCozOUy8v9v/JNqcxvOSsAPSXKZ8DrQqKlzbOzsQg7NF0scW4MdOC TrLbm4dLUK0CgdpP1rJrZM6adCnbiimnp+tst1OM= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Solomon Tan , Alexander Shishkin , Jiri Olsa , Mathieu Poirier , Peter Zijlstra , Robert Walker , Suzuki K Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 01/13] perf cs-etm: Add missing case value Date: Fri, 29 Mar 2019 10:37:49 -0300 Message-Id: <20190329133801.21004-2-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190329133801.21004-1-acme@kernel.org> References: <20190329133801.21004-1-acme@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Solomon Tan 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: Solomon Tan Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Robert Walker Cc: Suzuki K Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190322052255.GA4809@w-OptiPlex-7050 Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/feature/test-libopencsd.c | 4 ++-- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c index d68eb4fb40cc..2b0e02c38870 100644 --- a/tools/build/feature/test-libopencsd.c +++ b/tools/build/feature/test-libopencsd.c @@ -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) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index ba4c623cd8de..39fe21e1cf93 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -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; -- 2.20.1