From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbDBSlO (ORCPT ); Thu, 2 Apr 2015 14:41:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37082 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752364AbbDBSlK (ORCPT ); Thu, 2 Apr 2015 14:41:10 -0400 Date: Thu, 2 Apr 2015 11:40:16 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: paulus@samba.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, eranian@google.com, mingo@kernel.org, peterz@infradead.org, kaixu.xia@linaro.org, torvalds@linux-foundation.org, rric@kernel.org, hpa@zytor.com, tglx@linutronix.de, bp@alien8.de, efault@gmx.de Reply-To: fweisbec@gmail.com, paulus@samba.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, kaixu.xia@linaro.org, eranian@google.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, rric@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, bp@alien8.de, efault@gmx.de In-Reply-To: <1421237903-181015-11-git-send-email-alexander.shishkin@linux.intel.com> References: <1421237903-181015-11-git-send-email-alexander.shishkin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] x86: Add Intel Processor Trace (INTEL_PT) cpu feature detection Git-Commit-ID: ed69628b3b04578179334393d7f5fe60a2681f1c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ed69628b3b04578179334393d7f5fe60a2681f1c Gitweb: http://git.kernel.org/tip/ed69628b3b04578179334393d7f5fe60a2681f1c Author: Alexander Shishkin AuthorDate: Wed, 14 Jan 2015 14:18:19 +0200 Committer: Ingo Molnar CommitDate: Thu, 2 Apr 2015 17:14:18 +0200 x86: Add Intel Processor Trace (INTEL_PT) cpu feature detection Intel Processor Trace is an architecture extension that allows for program flow tracing. Signed-off-by: Alexander Shishkin Signed-off-by: Peter Zijlstra (Intel) Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kaixu Xia Cc: Linus Torvalds Cc: Mike Galbraith Cc: Paul Mackerras Cc: Robert Richter Cc: Stephane Eranian Cc: Thomas Gleixner Cc: acme@infradead.org Cc: adrian.hunter@intel.com Cc: kan.liang@intel.com Cc: markus.t.metzger@intel.com Cc: mathieu.poirier@linaro.org Link: http://lkml.kernel.org/r/1421237903-181015-11-git-send-email-alexander.shishkin@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/kernel/cpu/scattered.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 361922d..c1553b7 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -195,6 +195,7 @@ #define X86_FEATURE_HWP_ACT_WINDOW ( 7*32+ 12) /* Intel HWP_ACT_WINDOW */ #define X86_FEATURE_HWP_EPP ( 7*32+13) /* Intel HWP_EPP */ #define X86_FEATURE_HWP_PKG_REQ ( 7*32+14) /* Intel HWP_PKG_REQ */ +#define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */ diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 6063909..3d423a1 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -41,6 +41,7 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c) { X86_FEATURE_HWP_ACT_WINDOW, CR_EAX, 9, 0x00000006, 0 }, { X86_FEATURE_HWP_EPP, CR_EAX,10, 0x00000006, 0 }, { X86_FEATURE_HWP_PKG_REQ, CR_EAX,11, 0x00000006, 0 }, + { X86_FEATURE_INTEL_PT, CR_EBX,25, 0x00000007, 0 }, { X86_FEATURE_APERFMPERF, CR_ECX, 0, 0x00000006, 0 }, { X86_FEATURE_EPB, CR_ECX, 3, 0x00000006, 0 }, { X86_FEATURE_HW_PSTATE, CR_EDX, 7, 0x80000007, 0 },