From patchwork Thu Jul 14 18:35:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 9230417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7CD716075D for ; Thu, 14 Jul 2016 18:37:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72272281DB for ; Thu, 14 Jul 2016 18:37:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66AE628305; Thu, 14 Jul 2016 18:37:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 101AE281DB for ; Thu, 14 Jul 2016 18:37:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNlUy-0002sa-Qg; Thu, 14 Jul 2016 18:36:36 +0000 Received: from mail-it0-x22a.google.com ([2607:f8b0:4001:c0b::22a]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNlUX-0002d8-Ls for linux-arm-kernel@lists.infradead.org; Thu, 14 Jul 2016 18:36:10 +0000 Received: by mail-it0-x22a.google.com with SMTP id f6so4795193ith.0 for ; Thu, 14 Jul 2016 11:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LnZjOw3igyHfTw+/t0Q5/eCbQG5a50Oy7CQQlUI9g14=; b=CDexxQIO3nqLEIhyiMLAxxtQpvv9zEOM55tM/zrH1gCHj49d7nJgaMw1XBfie5K4Zf ItYU509eaHA+FHnD8CiVQpzmGzFGqo2TeDcwY0A1fuE+XCG7Sq33HZMNFgv0BTTDQb9h tOHA2rrZ6wHPLl9Kd6Dx4hgH/9FGx8+Bo4DW4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LnZjOw3igyHfTw+/t0Q5/eCbQG5a50Oy7CQQlUI9g14=; b=cGNPY8y1E8Dv29R9AQKNrNO4dUTLYMEnt8vRWWKQT3Ln48GzwQFwrIM9M1VKgVZQxk 2UfmxoPmT+iicVGjDeLG/v6f1JcNL+ye4FZJqdNFruMzGyqWFHzAy02muYMZxU7dJy8c RcBPbKOpl/pDHJ2xOVapK2NTlLRJ2cK8OsrZMJi2wQtzfk9RCj4EbSXBIBF3eEkQUuVl MK+AROPBTvi1Gcn/Bj4/ExAiIWqmHs48tx3LnOYHMs9af2ZPnwKMPBaoI0/3zj8/OzhW OAyBjw9Dx7EiqaYVAZozTYpotXwj7/IrPfioJBaV6U1u2qDai8c3Kg1ohXbD9LlyHlcq T1YQ== X-Gm-Message-State: ALyK8tKM/MPorDymD/lo4hbTM9jW7kEPgy42MRJU6TPkMF7S0QNYxFFHIePTkAwR9jDvFvS/ X-Received: by 10.36.55.2 with SMTP id r2mr30298076itr.73.1468521348650; Thu, 14 Jul 2016 11:35:48 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j12sm1700916ioi.36.2016.07.14.11.35.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jul 2016 11:35:48 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Subject: [PATCH V2 2/3] perf tools: making coresight PMU listable Date: Thu, 14 Jul 2016 12:35:43 -0600 Message-Id: <1468521344-15047-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468521344-15047-1-git-send-email-mathieu.poirier@linaro.org> References: <1468521344-15047-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160714_113609_845354_2634E4A7 X-CRM114-Status: GOOD ( 15.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: adrian.hunter@intel.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Adding the required mechanic allowing 'perf list pmu' to discover coresight ETM/PTM tracers. Signed-off-by: Mathieu Poirier Acked-by: Adrian Hunter --- MAINTAINERS | 1 + tools/perf/arch/arm/util/Build | 2 ++ tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ tools/perf/config/Makefile | 11 +++++++---- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tools/perf/arch/arm/util/pmu.c diff --git a/MAINTAINERS b/MAINTAINERS index 1209323b7e43..a025ab95c92e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1089,6 +1089,7 @@ F: drivers/hwtracing/coresight/* F: Documentation/trace/coresight.txt F: Documentation/devicetree/bindings/arm/coresight.txt F: Documentation/ABI/testing/sysfs-bus-coresight-devices-* +F: tools/perf/arch/arm/util/pmu.c ARM/CORGI MACHINE SUPPORT M: Richard Purdie diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build index f98da17357c0..4093fd146f46 100644 --- a/tools/perf/arch/arm/util/Build +++ b/tools/perf/arch/arm/util/Build @@ -2,3 +2,5 @@ libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o + +libperf-$(CONFIG_AUXTRACE) += pmu.o diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c new file mode 100644 index 000000000000..af9fb666b44f --- /dev/null +++ b/tools/perf/arch/arm/util/pmu.c @@ -0,0 +1,34 @@ +/* + * Copyright(C) 2015 Linaro Limited. All rights reserved. + * Author: Mathieu Poirier + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include +#include +#include + +#include "../../util/pmu.h" + +struct perf_event_attr +*perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) +{ +#ifdef HAVE_AUXTRACE_SUPPORT + if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) { + /* add ETM default config here */ + pmu->selectable = true; + } +#endif + return NULL; +} diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 24803c58049a..72edf83d76b7 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -746,10 +746,13 @@ ifdef LIBBABELTRACE endif ifndef NO_AUXTRACE - ifeq ($(feature-get_cpuid), 0) - msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); - NO_AUXTRACE := 1 - else + ifeq ($(ARCH),x86) + ifeq ($(feature-get_cpuid), 0) + msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); + NO_AUXTRACE := 1 + endif + endif + ifndef NO_AUXTRACE $(call detected,CONFIG_AUXTRACE) CFLAGS += -DHAVE_AUXTRACE_SUPPORT endif