From patchwork Tue Sep 6 16:37:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 75562 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp640698qgf; Tue, 6 Sep 2016 09:38:54 -0700 (PDT) X-Received: by 10.66.194.196 with SMTP id hy4mr40429166pac.63.1473179934090; Tue, 06 Sep 2016 09:38:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wi6si36100015pab.81.2016.09.06.09.38.53; Tue, 06 Sep 2016 09:38:54 -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 S936419AbcIFQie (ORCPT + 27 others); Tue, 6 Sep 2016 12:38:34 -0400 Received: from mail-yb0-f172.google.com ([209.85.213.172]:34746 "EHLO mail-yb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753790AbcIFQiW (ORCPT ); Tue, 6 Sep 2016 12:38:22 -0400 Received: by mail-yb0-f172.google.com with SMTP id x93so89079643ybh.1 for ; Tue, 06 Sep 2016 09:37:23 -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=1dbY+m/T+7Tz+ePRV1wDHX3+8vY+O3v0q+4vplLDXOA=; b=GBXcARiJhXKRq5Q0CyjwSPMu7UPtkm/Jbw3WOSF7TELke/udL2eALXfnayyklBw186 j2sAXK9JKCcnyY3y33f+FT6lIAwl8rST9rpILjD7UuVCZy9k/OB1n+LCDJRTlzo9Czh7 c5NLJITU5RC7Z7ViWXB9ag4knK674Jn/GLzjg= 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=1dbY+m/T+7Tz+ePRV1wDHX3+8vY+O3v0q+4vplLDXOA=; b=N7yo771PnhEO0yA2Qtfl3jL+qMXNRB66XZafCqWDnOWsE5WnCfxQ5/zAI0sN4YJv0n QCT4oLv9JM39lxIODwzPnwBo+iu9e8bHEBGOnXZY1o8vxLrHOZRVkRfQ+CCNRuddD6y1 L+D5iK1eMzWop5eDLdE9LSVnOoQ5E3kUQJeHiK2V8o2W6/bE0gpwYv2H1eGlAXCwU1oH NzaRgllzai5TuSNfoZbURTvP+eS49p0eJWQA0XPbAqcghM9fL7QfdYBo4MW5N5t1bvoq lhMXv1FUKxfEvy/ddnAui9RAK73z8nLPTaVUL0XTKla/5EJXtfw0cAFwgVM1CF9KrsMM o3MQ== X-Gm-Message-State: AE9vXwMYwgpBeZIjjdgODowIDJwehWF1tS/Dzq1ynEIRZUqT0ufB5rZdXtyuBznYE4vfqfaU X-Received: by 10.107.43.151 with SMTP id r145mr6098651ior.11.1473179843078; Tue, 06 Sep 2016 09:37:23 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id w1sm1772733iod.11.2016.09.06.09.37.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Sep 2016 09:37:22 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Cc: acme@infradead.org, peterz@infradead.org, jolsa@kernel.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RESEND][PATCH V7 1/5] perf tools: making coresight PMU listable Date: Tue, 6 Sep 2016 10:37:13 -0600 Message-Id: <1473179837-3293-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473179837-3293-1-git-send-email-mathieu.poirier@linaro.org> References: <1473179837-3293-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 Acked-by: Jiri Olsa --- MAINTAINERS | 1 + tools/perf/Makefile.config | 11 +++++++---- tools/perf/arch/arm/util/Build | 2 ++ tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ 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 71aa5daeae8f..58c91461548e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1122,6 +1122,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/Makefile.config b/tools/perf/Makefile.config index 24803c58049a..72edf83d76b7 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -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 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; +}