From patchwork Wed Jan 10 20:46:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 124133 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5732534qgn; Wed, 10 Jan 2018 12:47:01 -0800 (PST) X-Google-Smtp-Source: ACJfBou9VquV63jOnCkFhlw3bL98d24jUDWwMeCqNB7EoyBmSLp2T0kvLAdWkrNT4DCdtNOSOh2H X-Received: by 10.84.179.131 with SMTP id b3mr4425071plc.240.1515617221105; Wed, 10 Jan 2018 12:47:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515617221; cv=none; d=google.com; s=arc-20160816; b=gOW5Fb2y2aNb42eEEBk5KGVVvpS7qlhXwOMOjd8/aVlwC6e8xaejJ5f9f4LmdnON41 bIimedtwaTNJmS2qjFZpXEmTiZcviaHAAWfyWzrsY//oRE+l1a3purkc0RuMsafJ2h+X PIIdqAF7t6qn+Y7Qh3sEi0igQTvkBY0FQBrND14xQdV711ttoXZu18FZ4YuG3Ufwho8Y dbKAl9sg7+bUVYdGAmb/5yX7oxSE6NT07ruqdS8GJ6+VUgk15GpJPc4LHIGX6PyGvp+h EjL6VKQbQB2FXA6T4oxV0yy/AOdMNdNJ3Cjbn37uMssOJN08IxxrRFXro7JBMHMuwuVG azOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=7bLGgXSt/0Rr4kQCNNBXPhEQyiMeuZVS3sU3+ix/0qQ=; b=WEJcyc6EHKH1umgi//pP/DYMFDQ9jLKHvSff9K9jy/UdyDCHy1NUxTD8HzLceGf8Op xrJkewNuseCgpCO9bFKnaPAmqbIVsOctKNQhN+g6NaHNXr+XihLdaWTm7F7vI4BVXUcB 25vUT15L4zqJuJuHF4wxWOvbhJ15wcYnqW+ciGczwRVE25Ea3bJdjmhwn/Reg6rmdk5H RQ0EEb7VB0btsv6gbUATXuxUAqWSuC04Y3KoIfpcF6Q5ApxoudUmiuNj65qc4o6H5J6i El7xfMkew2wYIEuiXb9lLkC6Kq3eCOonJY93us1xQ4G6kCPZUoGPNU64bAWnXOitqy8v TBhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jq79cNCP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si11001033pgd.408.2018.01.10.12.46.58; Wed, 10 Jan 2018 12:47:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jq79cNCP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbeAJUq4 (ORCPT + 28 others); Wed, 10 Jan 2018 15:46:56 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:44669 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbeAJUqy (ORCPT ); Wed, 10 Jan 2018 15:46:54 -0500 Received: by mail-it0-f65.google.com with SMTP id b5so956463itc.3 for ; Wed, 10 Jan 2018 12:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=7bLGgXSt/0Rr4kQCNNBXPhEQyiMeuZVS3sU3+ix/0qQ=; b=Jq79cNCPMN2E+HsRdRFo1X6Qu5H+D7zAkA3M6nGoPBAQpAk+92H4J3XO1QfJAaTzZn Q//TztCvhJL9XBESmMXrbV8lu0S94qIxaH4jf6LGJdoNvfXiud147Kse+d5p69ws0bpv SgsPJkfIG5LKs/BmIqntkXGvxqGQv9N1JQCTw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7bLGgXSt/0Rr4kQCNNBXPhEQyiMeuZVS3sU3+ix/0qQ=; b=QqzSD8KaGERdtmEi6pEWDeIEgkLG5iNaPNj83RAcem41tjPa8Q53aQnOA0YGUXJdIv x4I1qdrHs0zbE4urBAVZY+aCmmvjm5+/ZKlQkS0C4iaaq/f4oXEJ7D56KuhFJ7Xb+dA3 iXtjaY4LgFSMydC5yG2zqznV6yc+rmcbCk1bdQvpS5cyFl1tmIK0EIzdq2XCg5Ityu0l vckN4YD1t52p0FAkU8OrieMAu6h8q81d6ZntZoBOAGHQXAAuo2EX+LT9rn81jnMhMF18 Ht/WD2X6EEN+sNCSfjfQwGxDvoWdB/+K2UATqluNhdplw5oYFLP1rblrfwn2d3sDwEug /NCw== X-Gm-Message-State: AKGB3mLGOorMM688Az+GDLKJu0fVS7+WX27hTaYsfhEP4HgUGy/ffJqr WqjbhrCrrCgKtTR2XTTYB/yn8Q== X-Received: by 10.36.40.15 with SMTP id h15mr19321730ith.28.1515617214048; Wed, 10 Jan 2018 12:46:54 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id x82sm10654339itb.36.2018.01.10.12.46.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 12:46:52 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org, ak@linux.intel.com Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Date: Wed, 10 Jan 2018 13:46:51 -0700 Message-Id: <1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit ("d0565132605f perf evsel: Enable type checking for perf_evsel_config_term types") assumes PERF_EVSEL__CONFIG_TERM_DRV_CFG isn't used and as such adds a BUG_ON(). Since the enumeration type is used in macro ADD_CONFIG_TERM() the change break CoreSight trace acquisition. This patch restores the original code. Signed-off-by: Mathieu Poirier --- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 Acked-by: Jiri Olsa diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index a4d256ea0dc4..b22071a20cd1 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -781,7 +781,7 @@ static void apply_config_terms(struct perf_evsel *evsel, attr->write_backward = term->val.overwrite ? 1 : 0; break; case PERF_EVSEL__CONFIG_TERM_DRV_CFG: - BUG_ON(1); + break; default: break; }