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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, 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 3EC89C282E1 for ; Mon, 22 Apr 2019 19:45:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CFD8E21901 for ; Mon, 22 Apr 2019 19:45:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Nd2qaEGz"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="UrQp/HJX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFD8E21901 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cv49wI98F6vrxVH+pC/6faSmaRHbSiGz9K9P7hkZyJE=; b=Nd2qaEGz/zXZE7 R0pjQe5tLxswoJ6yRX85ozEJ9SQpzTxjBllNYqaa42SMmLxZ4wgxPGeHT3rnAeDKOgR+45jq7Bxvm zBhDBuDaegXySZq5ix3LuRepRMWHdgmRh+s8M606NwrgjuaSI6jkoPJRudgPEKU7rJRPP5bisQ3/6 /IQscbRtjSGP2/q2yiZlaoKeTyiqOsAEz0CzFUFRcCchwxxqh8wkCU+KoL3iK4ZNNYaRanW/nZHfm xgfLQud28oJkKGxPkGQq2uOP/gp/iF8CBHLDoXnomMm9kQYrC33tZdoKveoNEA7o0NLkG/wsOc+hT rEqAswUkT1hxXKClp+qA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIesW-0002pR-R7; Mon, 22 Apr 2019 19:45:24 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIes9-0001AZ-GQ for linux-arm-kernel@lists.infradead.org; Mon, 22 Apr 2019 19:45:10 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7ED51218B0; Mon, 22 Apr 2019 19:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962300; bh=vVszk48zb7rcNd8exr3HZ1ozvbVDgkQiQF6O+xzrBTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrQp/HJXBz6cbTZ83EM/ZfQFhEtKCHRSUOtho2AI3zP9oA2sDkBBHjO+PcsM9k3pK 6yYwE5dgAOiUvR6TAsGozlz4mSK5U337cPdfdSVNsglNeWxTvDANKGaNxT07HCPbw5 eBsOYcNk0VzeEqB7YJ+R3jlx1g5byMFF/PxDZRyY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 91/98] perf cs-etm: Add missing case value Date: Mon, 22 Apr 2019 15:41:58 -0400 Message-Id: <20190422194205.10404-91-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194205.10404-1-sashal@kernel.org> References: <20190422194205.10404-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190422_124502_618227_00419E60 X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulouse , Alexander Shishkin , Solomon Tan , Peter Zijlstra , Namhyung Kim , Robert Walker , Jiri Olsa , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogU29sb21vbiBUYW4gPHNvbG9tb25ib2JzdG9uZXJAZ21haWwuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgYzhmYTdhODA3ZjNjNWY5NDZiZDkyMDc2ZmJhZjc4MjZlZGI2NTBkYyBdCgpUaGUg Zm9sbG93aW5nIGVycm9yIHdhcyB0aHJvd24gd2hlbiBjb21waWxpbmcgYHRvb2xzL3BlcmZgIHVz aW5nIE9wZW5DU0QKdjAuMTEuMS4gVGhpcyBwYXRjaCBmaXhlcyBzYWlkIGVycm9yLgoKICAgIEND ICAgICAgIHV0aWwvaW50ZWwtcHQtZGVjb2Rlci9pbnRlbC1wdC1sb2cubwogICAgQ0MgICAgICAg dXRpbC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVjb2Rlci5vCiAgdXRpbC9jcy1ldG0tZGVjb2Rl ci9jcy1ldG0tZGVjb2Rlci5jOiBJbiBmdW5jdGlvbgogIOKAmGNzX2V0bV9kZWNvZGVyX19idWZm ZXJfcmFuZ2XigJk6CiAgdXRpbC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVjb2Rlci5jOjM3MDoy OiBlcnJvcjogZW51bWVyYXRpb24gdmFsdWUKICDigJhPQ1NEX0lOU1RSX1dGSV9XRkXigJkgbm90 IGhhbmRsZWQgaW4gc3dpdGNoIFstV2Vycm9yPXN3aXRjaC1lbnVtXQogICAgc3dpdGNoIChlbGVt LT5sYXN0X2lfdHlwZSkgewogICAgXn5+fn5+CiAgICBDQyAgICAgICB1dGlsL2ludGVsLXB0LWRl Y29kZXIvaW50ZWwtcHQtZGVjb2Rlci5vCiAgY2MxOiBhbGwgd2FybmluZ3MgYmVpbmcgdHJlYXRl ZCBhcyBlcnJvcnMKCkJlY2F1c2UgYE9DU0RfSU5TVFJfV0ZJX1dGRWAgY2FzZSB3YXMgYWRkZWQg b25seSBpbiB2MC4xMS4wLCB0aGUgbWluaW11bQpyZXF1aXJlZCBPcGVuQ1NEIGxpYnJhcnkgdmVy c2lvbiBmb3IgdGhpcyBwYXRjaCBpcyBubyBsb25nZXIgdjAuMTAuMC4KClNpZ25lZC1vZmYtYnk6 IFNvbG9tb24gVGFuIDxzb2xvbW9uYm9ic3RvbmVyQGdtYWlsLmNvbT4KQ2M6IEFsZXhhbmRlciBT aGlzaGtpbiA8YWxleGFuZGVyLnNoaXNoa2luQGxpbnV4LmludGVsLmNvbT4KQ2M6IEppcmkgT2xz YSA8am9sc2FAcmVkaGF0LmNvbT4KQ2M6IE1hdGhpZXUgUG9pcmllciA8bWF0aGlldS5wb2lyaWVy QGxpbmFyby5vcmc+CkNjOiBOYW1oeXVuZyBLaW0gPG5hbWh5dW5nQGtlcm5lbC5vcmc+CkNjOiBQ ZXRlciBaaWpsc3RyYSA8cGV0ZXJ6QGluZnJhZGVhZC5vcmc+CkNjOiBSb2JlcnQgV2Fsa2VyIDxy b2JlcnQud2Fsa2VyQGFybS5jb20+CkNjOiBTdXp1a2kgSyBQb3Vsb3VzZSA8c3V6dWtpLnBvdWxv c2VAYXJtLmNvbT4KQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpMaW5r OiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxOTAzMjIwNTIyNTUuR0E0ODA5QHctT3B0aVBs ZXgtNzA1MApTaWduZWQtb2ZmLWJ5OiBBcm5hbGRvIENhcnZhbGhvIGRlIE1lbG8gPGFjbWVAcmVk aGF0LmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gKE1pY3Jvc29mdCkgPHNhc2hhbEBr ZXJuZWwub3JnPgotLS0KIHRvb2xzL2J1aWxkL2ZlYXR1cmUvdGVzdC1saWJvcGVuY3NkLmMgICAg ICAgICAgIHwgNCArKy0tCiB0b29scy9wZXJmL3V0aWwvY3MtZXRtLWRlY29kZXIvY3MtZXRtLWRl Y29kZXIuYyB8IDEgKwogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvYnVpbGQvZmVhdHVyZS90ZXN0LWxpYm9wZW5jc2Qu YyBiL3Rvb2xzL2J1aWxkL2ZlYXR1cmUvdGVzdC1saWJvcGVuY3NkLmMKaW5kZXggZDY4ZWI0ZmI0 MGNjLi4yYjBlMDJjMzg4NzAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2J1aWxkL2ZlYXR1cmUvdGVzdC1s aWJvcGVuY3NkLmMKKysrIGIvdG9vbHMvYnVpbGQvZmVhdHVyZS90ZXN0LWxpYm9wZW5jc2QuYwpA QCAtNCw5ICs0LDkgQEAKIC8qCiAgKiBDaGVjayBPcGVuQ1NEIGxpYnJhcnkgdmVyc2lvbiBpcyBz dWZmaWNpZW50IHRvIHByb3ZpZGUgcmVxdWlyZWQgZmVhdHVyZXMKICAqLwotI2RlZmluZSBPQ1NE X01JTl9WRVIgKCgwIDw8IDE2KSB8ICgxMCA8PCA4KSB8ICgwKSkKKyNkZWZpbmUgT0NTRF9NSU5f VkVSICgoMCA8PCAxNikgfCAoMTEgPDwgOCkgfCAoMCkpCiAjaWYgIWRlZmluZWQoT0NTRF9WRVJf TlVNKSB8fCAoT0NTRF9WRVJfTlVNIDwgT0NTRF9NSU5fVkVSKQotI2Vycm9yICJPcGVuQ1NEID49 IDAuMTAuMCBpcyByZXF1aXJlZCIKKyNlcnJvciAiT3BlbkNTRCA+PSAwLjExLjAgaXMgcmVxdWly ZWQiCiAjZW5kaWYKIAogaW50IG1haW4odm9pZCkKZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvdXRp bC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVjb2Rlci5jIGIvdG9vbHMvcGVyZi91dGlsL2NzLWV0 bS1kZWNvZGVyL2NzLWV0bS1kZWNvZGVyLmMKaW5kZXggOGMxNTU1NzVjNmM1Li4yYThiZjZiNDVh MzAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3BlcmYvdXRpbC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVj b2Rlci5jCisrKyBiL3Rvb2xzL3BlcmYvdXRpbC9jcy1ldG0tZGVjb2Rlci9jcy1ldG0tZGVjb2Rl ci5jCkBAIC0zNzQsNiArMzc0LDcgQEAgY3NfZXRtX2RlY29kZXJfX2J1ZmZlcl9yYW5nZShzdHJ1 Y3QgY3NfZXRtX2RlY29kZXIgKmRlY29kZXIsCiAJCWJyZWFrOwogCWNhc2UgT0NTRF9JTlNUUl9J U0I6CiAJY2FzZSBPQ1NEX0lOU1RSX0RTQl9ETUI6CisJY2FzZSBPQ1NEX0lOU1RSX1dGSV9XRkU6 CiAJY2FzZSBPQ1NEX0lOU1RSX09USEVSOgogCWRlZmF1bHQ6CiAJCXBhY2tldC0+bGFzdF9pbnN0 cl90YWtlbl9icmFuY2ggPSBmYWxzZTsKLS0gCjIuMTkuMQoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0 CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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,USER_AGENT_GIT autolearn=unavailable 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 31340C282CE for ; Mon, 22 Apr 2019 19:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7DD221900 for ; Mon, 22 Apr 2019 19:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962306; bh=vVszk48zb7rcNd8exr3HZ1ozvbVDgkQiQF6O+xzrBTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j/sy74o7N8Mg1kzH4ytQ/W0IgsodFILgn7p3hIXW73DBmzs74Baao9zV5VF6CP5PZ Jjc61FZQP2FbBCN+yJnbeq9SXV1WBzW5ntJj31W/eIeWmAtVIpUnynZohaLXvH70ZC YcUdVhVKftIOFtbRu3pIUcblsmIY8SG/TEQoeVfM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729653AbfDVTpE (ORCPT ); Mon, 22 Apr 2019 15:45:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:46418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729604AbfDVTpC (ORCPT ); Mon, 22 Apr 2019 15:45:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7ED51218B0; Mon, 22 Apr 2019 19:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962300; bh=vVszk48zb7rcNd8exr3HZ1ozvbVDgkQiQF6O+xzrBTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrQp/HJXBz6cbTZ83EM/ZfQFhEtKCHRSUOtho2AI3zP9oA2sDkBBHjO+PcsM9k3pK 6yYwE5dgAOiUvR6TAsGozlz4mSK5U337cPdfdSVNsglNeWxTvDANKGaNxT07HCPbw5 eBsOYcNk0VzeEqB7YJ+R3jlx1g5byMFF/PxDZRyY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Solomon Tan , Alexander Shishkin , Jiri Olsa , Mathieu Poirier , Namhyung Kim , Peter Zijlstra , Robert Walker , Suzuki K Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.0 91/98] perf cs-etm: Add missing case value Date: Mon, 22 Apr 2019 15:41:58 -0400 Message-Id: <20190422194205.10404-91-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194205.10404-1-sashal@kernel.org> References: <20190422194205.10404-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit c8fa7a807f3c5f946bd92076fbaf7826edb650dc ] 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 Signed-off-by: Sasha Levin (Microsoft) --- 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 8c155575c6c5..2a8bf6b45a30 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -374,6 +374,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.19.1