From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124AbcCUKBq (ORCPT ); Mon, 21 Mar 2016 06:01:46 -0400 Received: from [198.137.202.10] ([198.137.202.10]:46006 "EHLO terminus.zytor.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752002AbcCUKBi (ORCPT ); Mon, 21 Mar 2016 06:01:38 -0400 Date: Mon, 21 Mar 2016 02:55:26 -0700 From: tip-bot for Huang Rui Message-ID: Cc: fengguang.wu@intel.com, alexander.shishkin@linux.intel.com, fweisbec@gmail.com, luto@amacapital.net, Vincent.Wan@amd.com, hecmargi@upv.es, kristen@linux.intel.com, suravee.suthikulpanit@amd.com, bp@suse.de, dvlasenk@redhat.com, peterz@infradead.org, ross.zwisler@linux.intel.com, ray.huang@amd.com, brgerst@gmail.com, john.stultz@linaro.org, acme@redhat.com, aaron.lu@intel.com, tglx@linutronix.de, Aravind.Gopalakrishnan@amd.com, dsahern@gmail.com, rric@kernel.org, vincent.weaver@maine.edu, jolsa@redhat.com, luto@kernel.org, linux@roeck-us.net, jacob.w.shin@gmail.com, eranian@google.com, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, bp@alien8.de, herrmann.der.user@googlemail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: fengguang.wu@intel.com, alexander.shishkin@linux.intel.com, fweisbec@gmail.com, luto@amacapital.net, Vincent.Wan@amd.com, hecmargi@upv.es, kristen@linux.intel.com, suravee.suthikulpanit@amd.com, bp@suse.de, peterz@infradead.org, ross.zwisler@linux.intel.com, dvlasenk@redhat.com, ray.huang@amd.com, brgerst@gmail.com, john.stultz@linaro.org, acme@redhat.com, aaron.lu@intel.com, tglx@linutronix.de, Aravind.Gopalakrishnan@amd.com, dsahern@gmail.com, rric@kernel.org, vincent.weaver@maine.edu, jolsa@redhat.com, luto@kernel.org, linux@roeck-us.net, jacob.w.shin@gmail.com, eranian@google.com, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, bp@alien8.de, herrmann.der.user@googlemail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <1452739808-11871-4-git-send-email-ray.huang@amd.com> References: <1452739808-11871-4-git-send-email-ray.huang@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] x86/cpufeature, perf/x86: Add AMD Accumulated Power Mechanism feature flag Git-Commit-ID: 01fe03ff1c7ce6b6e2212cb6171a49c2858fbc7c 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: 01fe03ff1c7ce6b6e2212cb6171a49c2858fbc7c Gitweb: http://git.kernel.org/tip/01fe03ff1c7ce6b6e2212cb6171a49c2858fbc7c Author: Huang Rui AuthorDate: Thu, 14 Jan 2016 10:50:06 +0800 Committer: Ingo Molnar CommitDate: Mon, 21 Mar 2016 09:35:29 +0100 x86/cpufeature, perf/x86: Add AMD Accumulated Power Mechanism feature flag AMD CPU family 15h model 0x60 introduces a mechanism for measuring accumulated power. It is used to report the processor power consumption and support for it is indicated by CPUID Fn8000_0007_EDX[12]. Signed-off-by: Huang Rui Signed-off-by: Borislav Petkov Cc: Aaron Lu Cc: Alexander Shishkin Cc: Andreas Herrmann Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Aravind Gopalakrishnan Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Brian Gerst Cc: David Ahern Cc: Denys Vlasenko Cc: Fengguang Wu Cc: Frédéric Weisbecker Cc: Guenter Roeck Cc: H. Peter Anvin Cc: Hector Marco-Gisbert Cc: Jacob Shin Cc: Jiri Olsa Cc: John Stultz Cc: Kristen Carlson Accardi Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Robert Richter Cc: Ross Zwisler Cc: Stephane Eranian Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Vince Weaver Cc: Wan Zongshun Cc: spg_linux_kernel@amd.com Link: http://lkml.kernel.org/r/1452739808-11871-4-git-send-email-ray.huang@amd.com [ Resolved conflict and moved the synthetic CPUID slot to 19. ] Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/kernel/cpu/amd.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 746dd6a..44ebd04 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -94,7 +94,7 @@ #define X86_FEATURE_REP_GOOD ( 3*32+16) /* rep microcode works well */ #define X86_FEATURE_MFENCE_RDTSC ( 3*32+17) /* "" Mfence synchronizes RDTSC */ #define X86_FEATURE_LFENCE_RDTSC ( 3*32+18) /* "" Lfence synchronizes RDTSC */ -/* free, was #define X86_FEATURE_11AP ( 3*32+19) * "" Bad local APIC aka 11AP */ +#define X86_FEATURE_ACC_POWER ( 3*32+19) /* AMD Accumulated Power Mechanism */ #define X86_FEATURE_NOPL ( 3*32+20) /* The NOPL (0F 1F) instructions */ #define X86_FEATURE_ALWAYS ( 3*32+21) /* "" Always-present feature */ #define X86_FEATURE_XTOPOLOGY ( 3*32+22) /* cpu topology enum extensions */ diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index d4b06e8..68fe8d3 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -546,6 +546,10 @@ static void early_init_amd(struct cpuinfo_x86 *c) set_sched_clock_stable(); } + /* Bit 12 of 8000_0007 edx is accumulated power mechanism. */ + if (c->x86_power & BIT(12)) + set_cpu_cap(c, X86_FEATURE_ACC_POWER); + #ifdef CONFIG_X86_64 set_cpu_cap(c, X86_FEATURE_SYSCALL32); #else