From patchwork Wed Jul 20 20:16:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 9240455 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 14D6B600CB for ; Wed, 20 Jul 2016 20:18:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07B8027C7A for ; Wed, 20 Jul 2016 20:18:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF1DE27C39; Wed, 20 Jul 2016 20:18:28 +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 6B46827C39 for ; Wed, 20 Jul 2016 20:18:28 +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 1bPxvb-0002Ph-Qa; Wed, 20 Jul 2016 20:17:11 +0000 Received: from mail-io0-x236.google.com ([2607:f8b0:4001:c06::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bPxuy-0001la-Pb for linux-arm-kernel@lists.infradead.org; Wed, 20 Jul 2016 20:16:36 +0000 Received: by mail-io0-x236.google.com with SMTP id 38so57900952iol.0 for ; Wed, 20 Jul 2016 13:16:13 -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=biZ1lln/MF+tvGCqTbNGsc4Wuxz3QOfxDK1KYfLuHKFoGkt2UNRtjIxF7Nj+XjnGDr HNoaakbW2Cz99DB7g49HFxeBijpJxOQ6Q/qsyDUEPkQ2jOzykEgG9SDFK/zm8u5SE7YC c9BHjpBOP1qrHIzXycp16p/mGvS/wEMxpVVtg= 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=mkRVSrTLvHwPCKK+QOEg+J5fcFtDBVg4+8/B05RIFTlXSQh2j5UKMn6EVy0YXYVPd9 Y0VOtrHWFMiN8zUkMyDVFxYTOfWFRzgqUmM9FtJV7stYQ1hiadGot496sHgFf4M17o7J GBW8FoLQwvEjOClosBtGl8uadmUCoPJ3Kao/dgP0MyQPqgPdCc830AE8XyZITDQXZYk+ AQ1ktw9g/DVzN7NvxYRdQkF1bVdLtsOaGIadQs56OIQMoov4C9IGqhBjhV3Xo6l2sBDl DMqlLqcEsfhwQ8UkydNTJlpVRczLdYI/n3G6XIwGnhR1L6Dl9uGEckqP9NCBDep5HrXa cv4g== X-Gm-Message-State: ALyK8tK6QqlKzIwzeloK3wWBrBFveXs594+WgZ3Si+NT9nIr+D3ECHU74sPI2lurOCDkbPIE X-Received: by 10.107.185.133 with SMTP id j127mr21585009iof.32.1469045772954; Wed, 20 Jul 2016 13:16:12 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id 97sm2140218ioi.12.2016.07.20.13.16.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jul 2016 13:16:12 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Subject: [PATCH V3 2/3] perf tools: making coresight PMU listable Date: Wed, 20 Jul 2016 14:16:07 -0600 Message-Id: <1469045768-17549-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469045768-17549-1-git-send-email-mathieu.poirier@linaro.org> References: <1469045768-17549-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160720_131632_965590_CA7AE4EB X-CRM114-Status: GOOD ( 16.06 ) 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: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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