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: 72488 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp65906qga; Wed, 20 Jul 2016 13:16:53 -0700 (PDT) X-Received: by 10.98.34.66 with SMTP id i63mr65921730pfi.130.1469045813701; Wed, 20 Jul 2016 13:16:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b74si5100744pfd.257.2016.07.20.13.16.53; Wed, 20 Jul 2016 13:16:53 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754848AbcGTUQu (ORCPT + 29 others); Wed, 20 Jul 2016 16:16:50 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:36586 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbcGTUQN (ORCPT ); Wed, 20 Jul 2016 16:16:13 -0400 Received: by mail-io0-f175.google.com with SMTP id b62so57689885iod.3 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=Y1LVpNvzw4s49ElSFmmqK6WpqT6Ql9KIRUsYMnPSduITTKXCRBBi2LY3xjniq27U2h kkF8BztMvMShvdATxL4pWchzkl7TtgHttGOW4bl7DX9yl4hDNkvidNfYGbBMHKaPR1GA Xj9O/6MVDxg1N/4kU9HzByoR2fa++AX3O6dGTmMYOhjnbe5wjTHWd+kQFcT0TDYNVJIN 6/agcEx7T5QmKI0WKIhuLyrHD5w/xO/RwOesQZ+gUmKwUGbp1x4qPqt6zNMdjTFZJCU9 9NYI4mBgXDFjx7S0Pn7Y/U8wgguTsFoNpKvuuC6wGAT455LOXIzBkYizLbWYJYRMis3L wLrg== X-Gm-Message-State: ALyK8tIUUGQ+uEL40Nr2LFSkLzWqxswtfQPkfZbo5OYbFHaYEXgOf3wnX7ZgbOBHSVGYeZV9 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 Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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> 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 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 -- 2.7.4 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