From patchwork Thu Jul 14 18:35:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72044 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp218447qga; Thu, 14 Jul 2016 11:36:02 -0700 (PDT) X-Received: by 10.98.102.221 with SMTP id s90mr14688778pfj.69.1468521362316; Thu, 14 Jul 2016 11:36:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i8si3935458pfa.231.2016.07.14.11.36.02; Thu, 14 Jul 2016 11:36:02 -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 S1751666AbcGNSfx (ORCPT + 29 others); Thu, 14 Jul 2016 14:35:53 -0400 Received: from mail-it0-f48.google.com ([209.85.214.48]:37486 "EHLO mail-it0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbcGNSfs (ORCPT ); Thu, 14 Jul 2016 14:35:48 -0400 Received: by mail-it0-f48.google.com with SMTP id f6so78628010ith.0 for ; Thu, 14 Jul 2016 11:35:47 -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=tWORCiKUZnGN31gNaCWM39EWVDgQOUlyIFql2vBu3oI=; b=Lf5DloTrth3fOPbewmHmVCGQNB1ww9yrOMRjcJIEPbBc0IdxAScLy5QiY+C9JmmY4I Tq14tmnJI9uCO8jTt3jqNauIKENIivgk8iillKxZx1iY62X9kCzdRUoCS3iFV7Kha9Y5 QdV4fxESm1c0VL6JNoMQmboczz38t6Cs81LZw= 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=tWORCiKUZnGN31gNaCWM39EWVDgQOUlyIFql2vBu3oI=; b=e6WyTearuSc7UnKI+rcJyPFJAXQXawyA3ykaynmXPt5GrLGVinGE39j7GqhlmJY0iN ipAhuNc/QsBSYzr50zKMdYoydqR9qBYaPxzqX9jovv+rF2Cl8i9o47nIqi2qSc9kp3sH mW7gZeVK+e6MdfCIEdnsQQ2UPrqz387Hj61CBZ3Fzz9c95+LV+4Dc8rydvQiUq7/CYjC b2VSstnRPXvqZQ+pRg6WPdVToBGby7OcdVs0hNMeE+Lhl6jGCFEKKZQxhFUhV5drGSBz d4wCJ0kWzDExmAl/JXSY4DnUcQEewF47FIBZ/n47w19oYlZKXAhUzMzFDnToydnH3CrA Lcbw== X-Gm-Message-State: ALyK8tLmi5C9p+4PLBMXAx4Yx/V+L1Suq8wAASbC8hVcIqoeph/pKLTr0Yslup2wmE/NdFG5 X-Received: by 10.36.60.148 with SMTP id m142mr15123316ita.96.1468521347403; Thu, 14 Jul 2016 11:35:47 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j12sm1700916ioi.36.2016.07.14.11.35.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jul 2016 11:35:47 -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 V2 1/3] tools: Copy the header file needed by perf tools Date: Thu, 14 Jul 2016 12:35:42 -0600 Message-Id: <1468521344-15047-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468521344-15047-1-git-send-email-mathieu.poirier@linaro.org> References: <1468521344-15047-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 Directly accessing kernel files is not allowed anymore. As such making file coresight-pmu.h accessible by the perf tools and complain if this copy strays from the one found in the main kernel tree. Signed-off-by: Mathieu Poirier --- tools/include/linux/coresight-pmu.h | 39 +++++++++++++++++++++++++++++++++++++ tools/perf/MANIFEST | 1 + tools/perf/Makefile.perf | 3 +++ 3 files changed, 43 insertions(+) create mode 100644 tools/include/linux/coresight-pmu.h -- 2.7.4 diff --git a/tools/include/linux/coresight-pmu.h b/tools/include/linux/coresight-pmu.h new file mode 100644 index 000000000000..7d410260661b --- /dev/null +++ b/tools/include/linux/coresight-pmu.h @@ -0,0 +1,39 @@ +/* + * 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 . + */ + +#ifndef _LINUX_CORESIGHT_PMU_H +#define _LINUX_CORESIGHT_PMU_H + +#define CORESIGHT_ETM_PMU_NAME "cs_etm" +#define CORESIGHT_ETM_PMU_SEED 0x10 + +/* ETMv3.5/PTM's ETMCR config bit */ +#define ETM_OPT_CYCACC 12 +#define ETM_OPT_TS 28 + +static inline int coresight_get_trace_id(int cpu) +{ + /* + * A trace ID of value 0 is invalid, so let's start at some + * random value that fits in 7 bits and go from there. Since + * the common convention is to have data trace IDs be I(N) + 1, + * set instruction trace IDs as a function of the CPU number. + */ + return (CORESIGHT_ETM_PMU_SEED + (cpu * 2)); +} + +#endif diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 923eda2e7d52..475e6304db18 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -77,6 +77,7 @@ tools/include/linux/stringify.h tools/include/linux/types.h tools/include/linux/err.h tools/include/linux/bitmap.h +tools/include/linux/coresight-pmu.h include/asm-generic/bitops/arch_hweight.h include/asm-generic/bitops/const_hweight.h include/asm-generic/bitops/fls64.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a129fbc1ed37..739af9493e14 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -411,6 +411,9 @@ $(PERF_IN): prepare FORCE @(test -f ../../arch/arm64/include/uapi/asm/kvm.h && ( \ (diff -B ../arch/arm64/include/uapi/asm/kvm.h ../../arch/arm64/include/uapi/asm/kvm.h >/dev/null) \ || echo "Warning: tools/arch/arm64/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true + @(test -f ../../include/linux/coresight-pmu.h && ( \ + (diff -B ../include/linux/coresight-pmu.h ../../include/linux/coresight-pmu.h >/dev/null) \ + || echo "Warning: tools/include/linux/coresight-pmu.h differs from kernel" >&2 )) || true $(Q)$(MAKE) $(build)=perf $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)