From patchwork Mon Nov 23 18:33:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57180 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1602945lbb; Mon, 23 Nov 2015 10:35:36 -0800 (PST) X-Received: by 10.66.63.70 with SMTP id e6mr18173774pas.32.1448303736075; Mon, 23 Nov 2015 10:35:36 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l65si21236995pfi.193.2015.11.23.10.35.35; Mon, 23 Nov 2015 10:35:36 -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 S1755246AbbKWSfd (ORCPT + 28 others); Mon, 23 Nov 2015 13:35:33 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36233 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754998AbbKWSek (ORCPT ); Mon, 23 Nov 2015 13:34:40 -0500 Received: by pacdm15 with SMTP id dm15so198933328pac.3 for ; Mon, 23 Nov 2015 10:34:39 -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=MBxP4UDRjEL9+saWFeh8QRp+ODbcpQIN0Qc/RiIBOv8=; b=HApje9i38xzzKYsKq8etVIc3z5dHpDg1oLdk/piqqUjBJDDyau1z10La5kauCgtKME 7yUL40Hj2FVeCxD0apnrll582EN8kq+K+XgGIYwv5fJD2OOIM/yeMESXRfrd77FMYu04 oTYX0QUPWvHo4wOVf4TpePfF0llEwMHefatudxkzUbrLUfamcsSpj8w3JKJyzFoCpUXn vqN8dDwefEzhdypiz8lsjqR4Hd5WqXmcS0aaLbK2bUGTinXPSAXcckIJTRYJ8aSPscnj toOebKHn+MA2hWQDT03N1THi29Yvd8qxKeq5aRipvjwOreGngUVftnTBAW4e098+6QJ3 NbDw== 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=MBxP4UDRjEL9+saWFeh8QRp+ODbcpQIN0Qc/RiIBOv8=; b=lnxx5tnT1kNE1R9RbKXDeDhdsHp5XwJM8zeOi25HSzf0JetrL+r6JM9LEQtnOnCLd8 UnCyC6Dhp7Fjpm1ViPLsufgnVXZ3mha7NyV24GoPnIze/oqiFEtB7d7tRa6Pa0GSfwE8 jCnme5QEf1BWjPKMdZpoBW6Rjip2tBbnCf3KnotnxFVBjz4xeNyf0ydFCNAERjC2dZc8 2RhARKrn7+3JHXIiOaGmIUOvhAn2pV0e4iZMuJ9XQyz93cf1Y6n6ScgzwrUyRrW0frJS RpCqDTnHZBrmvf0I5wk5Q1qjRoD99UJeyVC6NVqnUGulwuxCRMc4QdTV8rPyQfmNjfFN 4/3A== X-Gm-Message-State: ALoCoQkulKtxkP0BziJN7GKS9eW6fxx4zfPNhCx9gb91vAgBVKD738Ezh4fWlzoTVhxj+u+TAtuH X-Received: by 10.98.75.71 with SMTP id y68mr17641908pfa.75.1448303679646; Mon, 23 Nov 2015 10:34:39 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id r20sm10865186pfa.93.2015.11.23.10.34.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:39 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org 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 Subject: [RESEND PATCH V4 25/26] perf tools: making coresight PMU listable Date: Mon, 23 Nov 2015 11:33:17 -0700 Message-Id: <1448303598-11249-26-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> References: <1448303598-11249-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. 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 -- 1.9.1 -- 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 994a7aeb4a2d..d73f35aeaf3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -999,6 +999,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 38a08539f4bf..64bdb82b3337 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -626,12 +626,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