From patchwork Mon Nov 30 02:14:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57415 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1180064lbb; Sun, 29 Nov 2015 18:18:46 -0800 (PST) X-Received: by 10.98.10.83 with SMTP id s80mr57640358pfi.79.1448849926576; Sun, 29 Nov 2015 18:18:46 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f64si26512701pfd.86.2015.11.29.18.18.46; Sun, 29 Nov 2015 18:18:46 -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; 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753485AbbK3CSn (ORCPT + 28 others); Sun, 29 Nov 2015 21:18:43 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33652 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751AbbK3CSC (ORCPT ); Sun, 29 Nov 2015 21:18:02 -0500 Received: by pabfh17 with SMTP id fh17so173137199pab.0 for ; Sun, 29 Nov 2015 18:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ir5ixKkQ1ShE6i8eLLG5vodHHaB7SC90+bubhwAIyP0=; b=kxoQEZSH6ZeKZv89ViVBRofzFHrWKVzoMj7Gk0Lvbyra50G3KWjdFBCjxVIjSAjw1n BM0AtR0WgyY4nFiHbuNTjwEkdw7aBKAk/OR3a2rBuLVp4CH+oVMETRUCy9dDuS6yXLN1 nb57vVGg3pcpnf09gceof/tACiRhLza2zsT7XDajmrfZ/WpK6Vxl+U4esoiCK3c/DH6M kgmxBFYZk7g6N8Mr5RWhI3i2JcOVswK+ukDs+UXpzWGzqnbjActmIbqw9eZt2kwGEtGs BiEnsmXKVVnu7KHDcxgaHDEpJr0L6kft+IXBVeRydVOF5DNoeOGhPf3o+DebqtUG6wJm jypA== 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=Ir5ixKkQ1ShE6i8eLLG5vodHHaB7SC90+bubhwAIyP0=; b=UmnCszKBbVFRirxjDF1DbBJF9S+WP+zd2v4z3VJb9wO+5ECK9hd+H4NEjcMvy0u0PO F6becUjstxdEJrCGzkoM/1ZatDH4egN2pU48/uL2TD3SuETy1qzkwVDpGWKIkXgtPSVl CXb35uRC7r2l2YrX1LAWqMFCmNF1Ct8II3U9p9a4jF8I1FTBeAFTAaIg5HrNqhHaBlPV bM+FeLARGo9kuThKIGErK69C95jmv6l/WLHbO2IC6l2+CVcKMOdPue8C9b3jfjs4/yXm ySDCBvxM50ycJoswLJrSrB6fxQw+sZ7ztrvvKiNQ+tYDobFQZ++TSWxS/Y0t6e/icv7n rKEA== X-Gm-Message-State: ALoCoQm4kDf8l+T8xnuOL0Q8GuuK1v0jSJkv48Rt2HDb2clx3APcnBZMikwg+kSSWaNIqREX66JX X-Received: by 10.67.4.42 with SMTP id cb10mr17495934pad.65.1448849881524; Sun, 29 Nov 2015 18:18:01 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id n16sm47168818pfa.53.2015.11.29.18.17.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Nov 2015 18:18:00 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, alexander.shishkin@linux.intel.com Cc: zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, pawel.moll@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Subject: [PATCH V5 25/26] perf tools: making coresight PMU listable Date: Sun, 29 Nov 2015 19:14:46 -0700 Message-Id: <1448849687-5724-26-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448849687-5724-1-git-send-email-mathieu.poirier@linaro.org> References: <1448849687-5724-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding the required mechanic allowing 'perf list pmu' to discover coresight ETM/PTM tracers. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Signed-off-by: Mathieu Poirier --- MAINTAINERS | 1 + tools/perf/arch/arm/util/Build | 2 ++ tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ tools/perf/config/Makefile | 17 ++++++++++++----- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 tools/perf/arch/arm/util/pmu.c -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/MAINTAINERS b/MAINTAINERS index e9caa4b28828..571a1dbe6bd1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1007,6 +1007,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 d22e3d07de3d..66ab0b05549c 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_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 de89ec574361..905faabff8b1 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -647,12 +647,19 @@ 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 + 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 + else + $(call detected,CONFIG_AUXTRACE) + CFLAGS += -DHAVE_AUXTRACE_SUPPORT + endif else - $(call detected,CONFIG_AUXTRACE) - CFLAGS += -DHAVE_AUXTRACE_SUPPORT + ifeq ($(ARCH),$(filter $(ARCH), arm arm64)) + $(call detected,CONFIG_AUXTRACE) + CFLAGS += -DHAVE_AUXTRACE_SUPPORT + endif endif endif