From patchwork Fri Nov 13 18:45:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 56536 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1213720lbb; Fri, 13 Nov 2015 10:47:17 -0800 (PST) X-Received: by 10.68.106.69 with SMTP id gs5mr33577467pbb.91.1447440436454; Fri, 13 Nov 2015 10:47:16 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wj8si28899317pab.47.2015.11.13.10.47.16; Fri, 13 Nov 2015 10:47:16 -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 S1755045AbbKMSrB (ORCPT + 28 others); Fri, 13 Nov 2015 13:47:01 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36733 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754960AbbKMSq4 (ORCPT ); Fri, 13 Nov 2015 13:46:56 -0500 Received: by pacdm15 with SMTP id dm15so107594381pac.3 for ; Fri, 13 Nov 2015 10:46:56 -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=UTE23IWP120jMDAxagIdADYmJE8MjFG6s8FMGGR40wcr4yCKMDv7FkJkoeba3YrDpQ HbdwfcVI9T2OOxioo628wBGzaFym1IWKC3DAqGwZyxXoUWmmrwmssX9XMLiL87fJ0NQY aLuNzUjbVB9jCOiuOD2jn+ndHB30QwrE3B1/RgNgeOhqiCA2s9pZWkCsx+eTEgJEJ02w tzACJZzXBQApPQ7SOpyznV8A1BQQv6shOFzOnKsOtI1+bOGCltAO53UH/8AU+iM2kVq/ 3zUMFmJ/6bMix/CXugntGVBywtlm42H6/uhZ1Hdqzys82+k8hwAKQIzqevW9vjG+P4vA vN4w== 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=igO3DC3ntpUwRMVA0Jeq5BlqqTJU2y4KPZDvVfxs9kBJV93Eqwpgc5y2fm6Jpwmia+ RzxtAVqSK9S1gvRaI5c+CA6eakOEynNu3mKwhpq91t9tI+qMhAE07jL+8Mf//HbHEAzL PpVKpP2zhF1/Hl82F+qMZZhkoh60rotzeAJmHgDX2gSBmvL1xHxX6k2r5Hzx/nlpevqV 97zlZo31tuqMlGk33VSb4BtzkrZqTJr5O5TaP/nE55Qa4q0aDvfXrUU/UxNduCiEhNEa x5gwS38g+BOXvlOWUDYet/ZN6K1qI0OsBOb+Ztff9VgNxFabElAGmgSZkXG49BXOa84K Hn0w== X-Gm-Message-State: ALoCoQkH09esIp8IgVYnMINGtWOu+OBFZz1rGVT2vO2FDWPq/RB44/4laJel//UEsMZgmG2+/jpv X-Received: by 10.66.101.40 with SMTP id fd8mr26262532pab.91.1447440415921; Fri, 13 Nov 2015 10:46:55 -0800 (PST) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [184.64.168.246]) by smtp.gmail.com with ESMTPSA id xi7sm21737967pbc.56.2015.11.13.10.46.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 10:46:55 -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: adrian.hunter@intel.com, 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@linaro.org Subject: [PATCH V4 25/26] perf tools: making coresight PMU listable Date: Fri, 13 Nov 2015 11:45:16 -0700 Message-Id: <1447440317-1977-26-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447440317-1977-1-git-send-email-mathieu.poirier@linaro.org> References: <1447440317-1977-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