From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332AbcCUKAT (ORCPT ); Mon, 21 Mar 2016 06:00:19 -0400 Received: from [198.137.202.10] ([198.137.202.10]:45904 "EHLO terminus.zytor.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752002AbcCUKAN (ORCPT ); Mon, 21 Mar 2016 06:00:13 -0400 Date: Mon, 21 Mar 2016 02:54:14 -0700 From: tip-bot for Huang Rui Message-ID: Cc: alexander.shishkin@linux.intel.com, suravee.suthikulpanit@amd.com, dvlasenk@redhat.com, rric@kernel.org, vincent.weaver@maine.edu, peterz@infradead.org, bp@suse.de, eranian@google.com, ray.huang@amd.com, dsahern@gmail.com, bp@alien8.de, herrmann.der.user@googlemail.com, namhyung@kernel.org, luto@kernel.org, linux-kernel@vger.kernel.org, fengguang.wu@intel.com, john.stultz@linaro.org, hecmargi@upv.es, mingo@kernel.org, aaron.lu@intel.com, linux@roeck-us.net, brgerst@gmail.com, jolsa@redhat.com, luto@amacapital.net, hpa@zytor.com, jacob.w.shin@gmail.com, fweisbec@gmail.com, tglx@linutronix.de, acme@redhat.com, torvalds@linux-foundation.org, Aravind.Gopalakrishnan@amd.com Reply-To: linux-kernel@vger.kernel.org, fengguang.wu@intel.com, john.stultz@linaro.org, namhyung@kernel.org, luto@kernel.org, bp@suse.de, eranian@google.com, dsahern@gmail.com, ray.huang@amd.com, bp@alien8.de, herrmann.der.user@googlemail.com, rric@kernel.org, dvlasenk@redhat.com, peterz@infradead.org, vincent.weaver@maine.edu, suravee.suthikulpanit@amd.com, alexander.shishkin@linux.intel.com, Aravind.Gopalakrishnan@amd.com, torvalds@linux-foundation.org, acme@redhat.com, fweisbec@gmail.com, tglx@linutronix.de, jacob.w.shin@gmail.com, hpa@zytor.com, brgerst@gmail.com, luto@amacapital.net, jolsa@redhat.com, hecmargi@upv.es, mingo@kernel.org, aaron.lu@intel.com, linux@roeck-us.net In-Reply-To: <1452739808-11871-2-git-send-email-ray.huang@amd.com> References: <1452739808-11871-2-git-send-email-ray.huang@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/amd: Move nodes_per_socket into bsp_init_amd() Git-Commit-ID: 8dfeae0d73bf803be1a533e147b3b0ea69375596 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: 8dfeae0d73bf803be1a533e147b3b0ea69375596 Gitweb: http://git.kernel.org/tip/8dfeae0d73bf803be1a533e147b3b0ea69375596 Author: Huang Rui AuthorDate: Thu, 14 Jan 2016 10:50:04 +0800 Committer: Ingo Molnar CommitDate: Mon, 21 Mar 2016 09:08:22 +0100 perf/x86/amd: Move nodes_per_socket into bsp_init_amd() nodes_per_socket is static and it needn't be initialized many times during every CPU core init. So move its initialization into bsp_init_amd(). 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: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Vince Weaver Cc: spg_linux_kernel@amd.com Link: http://lkml.kernel.org/r/1452739808-11871-2-git-send-email-ray.huang@amd.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/amd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index b39338c..d4b06e8 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -306,7 +306,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; cpuid(0x8000001e, &eax, &ebx, &ecx, &edx); - nodes_per_socket = ((ecx >> 8) & 7) + 1; node_id = ecx & 7; /* get compute unit information */ @@ -317,7 +316,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c) u64 value; rdmsrl(MSR_FAM10H_NODE_ID, value); - nodes_per_socket = ((value >> 3) & 7) + 1; node_id = value & 7; } else return; @@ -519,6 +517,18 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) if (cpu_has(c, X86_FEATURE_MWAITX)) use_mwaitx_delay(); + + if (boot_cpu_has(X86_FEATURE_TOPOEXT)) { + u32 ecx; + + ecx = cpuid_ecx(0x8000001e); + nodes_per_socket = ((ecx >> 8) & 7) + 1; + } else if (boot_cpu_has(X86_FEATURE_NODEID_MSR)) { + u64 value; + + rdmsrl(MSR_FAM10H_NODE_ID, value); + nodes_per_socket = ((value >> 3) & 7) + 1; + } } static void early_init_amd(struct cpuinfo_x86 *c)