From patchwork Thu Jan 14 21:46:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 59781 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp153242lbb; Thu, 14 Jan 2016 13:48:20 -0800 (PST) X-Received: by 10.98.32.76 with SMTP id g73mr9753100pfg.48.1452808100678; Thu, 14 Jan 2016 13:48:20 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vt4si11682011pab.8.2016.01.14.13.48.20; Thu, 14 Jan 2016 13:48:20 -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=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755903AbcANVsR (ORCPT + 29 others); Thu, 14 Jan 2016 16:48:17 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34153 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755188AbcANVrh (ORCPT ); Thu, 14 Jan 2016 16:47:37 -0500 Received: by mail-pf0-f172.google.com with SMTP id q63so109252792pfb.1 for ; Thu, 14 Jan 2016 13:47:37 -0800 (PST) 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=xAfEX6D5AF2iC2fdWEZIky0PhcJ87hBqJTjYJ+74bYQ=; b=RkvFisHe+cQf5OMmdb6JI3HaHGW+OZiup4plpnY8k+sZhEeqKaaZexpmfIAIE4Pw26 6SpIyANdD6ipOQxO4UQlxfKy+7n+3abdxyu3pvgIGUwMQtzFs3VL5jvEQfus89dSf9Vo KFU0PZpsBj/n1o8Ad85kBks4eRHy7/wBt+7gs= 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=xAfEX6D5AF2iC2fdWEZIky0PhcJ87hBqJTjYJ+74bYQ=; b=g/4wphpw0ew+v7opPVkDRHE/yFmYY296id5n3pNYmkcUENz389jCtAudjdA7GBJSjD hEfC4dGGgOv7rq1vm1DuYx0WsEk+WI2XFlLjOYXjwkcVDBml4+Zj3OJ5tjjuThoFF5l+ hCS4a9x/YhhYasin80pYL6aZZn261LfgnagErToPANNWzSo2QBwwHONKYW/3l0h+tDJ/ 8w3tyeMrNU78avGkXmZO2idtCzNFYelpLrZKBrIo/xTFeNy3RvZYSCqfnI0DEuiVZHwQ K8+vQXBPX9KTxnerqT3xM9D6bUHzovA+sUgtO+vfEzwhP8p9ssbNJXwkOGmKhRjqnaVU vqiA== X-Gm-Message-State: ALoCoQljKVtGjO42T6OyStrVGrbTK8yTY/S2r5iZ+oYsnx9otj0FGuXXRI0nYQr3z3no8jSFfJ78nOQ9i/tJTrpKHShqrXW2cw== X-Received: by 10.98.0.7 with SMTP id 7mr8566894pfa.5.1452808057276; Thu, 14 Jan 2016 13:47:37 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id c87sm11383309pfj.41.2016.01.14.13.47.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jan 2016 13:47:36 -0800 (PST) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, rabin@rab.in, Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Subject: [PATCH V8 22/23] perf tools: making coresight PMU listable Date: Thu, 14 Jan 2016 14:46:16 -0700 Message-Id: <1452807977-8069-23-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452807977-8069-1-git-send-email-mathieu.poirier@linaro.org> References: <1452807977-8069-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 diff --git a/MAINTAINERS b/MAINTAINERS index 233f83464814..b2a92245eece 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