From patchwork Fri Jun 17 17:02:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 70360 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp382029qgy; Fri, 17 Jun 2016 10:02:14 -0700 (PDT) X-Received: by 10.98.23.20 with SMTP id 20mr3449244pfx.96.1466182934791; Fri, 17 Jun 2016 10:02:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oz4si16083273pac.91.2016.06.17.10.02.14; Fri, 17 Jun 2016 10:02:14 -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 S933486AbcFQRCN (ORCPT + 30 others); Fri, 17 Jun 2016 13:02:13 -0400 Received: from mail-it0-f43.google.com ([209.85.214.43]:34655 "EHLO mail-it0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbcFQRCL (ORCPT ); Fri, 17 Jun 2016 13:02:11 -0400 Received: by mail-it0-f43.google.com with SMTP id e5so28893222ith.1 for ; Fri, 17 Jun 2016 10:02:05 -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=URzrazsbiojrRcupeFLflzJgdYeuhp8P0qwYZhY2mgc=; b=T5ymr+X66Q4GOFV/2MpdH61IhOxJLqw3/kipLyNLDL/JHzTHdYZmUlLcu2ne9c3Hyw F9DpjjuwQW0Ve4KD+ANySlN11FnqCG9adLV0Exr/YLHKEtlTPLU7QTQYyL6yRymd/0We +5XxSrs8/DWTx3KZAwosLlbSZpUmts7OJdsA4= 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=URzrazsbiojrRcupeFLflzJgdYeuhp8P0qwYZhY2mgc=; b=N5XAb5XGmMbi+lTycxMzT1GS2vevDDo55rmt8lnxo+hYlQk6zv6tP9RpvnazrAhIkK Ej6s6LVidKtlzrJbxO2JXgX69xva7dfJUqT0eDok8EJIvLIPgqO9xqRoMOBZYErZkIW9 Hu5WvmPYJoKqXXsRBbi+crmo4A8uUDtsMDEjp5vbfj2OCewb4/t/4YFrRvkKlTvSqVuq cMv7AkocfLEmztxv4ev2UM7fv6FVou3nG1k2+Hh1gAHBgXT2JGsPuVTMcPBLfHJbxe7Y i9uWW+N1Ux9f9X2jnahGJaJ8a51XZtFi4AORLLzaWbfzq6LChFQoxmBObiMJNCVwq/7t b2Gw== X-Gm-Message-State: ALyK8tKDpKaHPymTg3cJ0KCJ9GbcmVbVh8VCSIeizjSI6uGaDva1iTPGBXcZxTJQRbMPEfjz X-Received: by 10.36.4.210 with SMTP id 201mr36959861itb.1.1466182925151; Fri, 17 Jun 2016 10:02:05 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a186sm9833891ith.14.2016.06.17.10.02.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jun 2016 10:02:04 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Cc: adrian.hunter@intel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH RESEND 1/2] perf tools: making coresight PMU listable Date: Fri, 17 Jun 2016 11:02:01 -0600 Message-Id: <1466182922-14426-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1466182922-14426-1-git-send-email-mathieu.poirier@linaro.org> References: <1466182922-14426-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/MANIFEST | 1 + tools/perf/arch/arm/util/Build | 2 ++ tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ tools/perf/config/Makefile | 11 ++++++++--- 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 tools/perf/arch/arm/util/pmu.c -- 2.5.0 diff --git a/MAINTAINERS b/MAINTAINERS index 7304d2e37a98..d3451007718b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1085,6 +1085,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/MANIFEST b/tools/perf/MANIFEST index 8c8c6b9ce915..c6683e60e603 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -64,6 +64,7 @@ include/asm-generic/bitops/const_hweight.h include/asm-generic/bitops/fls64.h include/asm-generic/bitops/__fls.h include/asm-generic/bitops/fls.h +include/linux/coresight-pmu.h include/linux/perf_event.h include/linux/list.h include/linux/hash.h 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 5ad0255f8756..494a672aa11d 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -681,9 +681,14 @@ 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