From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751988AbbJaWp7 (ORCPT ); Sat, 31 Oct 2015 18:45:59 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:48906 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbbJaWp5 (ORCPT ); Sat, 31 Oct 2015 18:45:57 -0400 Subject: Re: [PATCH v3 04/10] x86, amd: add accessor for number of cores per compute unit To: Huang Rui , Borislav Petkov , Peter Zijlstra , Jean Delvare , Andy Lutomirski , Andreas Herrmann , Thomas Gleixner , Ingo Molnar , "Rafael J. Wysocki" , Len Brown , John Stultz , =?UTF-8?B?RnLDqWTDqXJpYyBXZWlzYmVja2Vy?= References: <1446199024-1896-1-git-send-email-ray.huang@amd.com> <1446199024-1896-5-git-send-email-ray.huang@amd.com> Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, x86@kernel.org, Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , SPG_Linux_Kernel From: Guenter Roeck Message-ID: <563544A1.6060505@roeck-us.net> Date: Sat, 31 Oct 2015 15:45:53 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1446199024-1896-5-git-send-email-ray.huang@amd.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=0.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/30/2015 02:56 AM, Huang Rui wrote: > Add an accessor function amd_get_cores_per_cu() which returns the > number of cores per compute unit. In multiple CPUs, they always have > the same number of cores per compute unit. > > In a subsequent patch, we will use this function in fam15h_power > driver. > > Signed-off-by: Huang Rui > Cc: Borislav Petkov > Cc: Guenter Roeck > Cc: Peter Zijlstra > Cc: Ingo Molnar This patch will require an Acked-by: from an x86 maintainer. Thanks, Guenter > --- > arch/x86/include/asm/processor.h | 1 + > arch/x86/kernel/cpu/amd.c | 19 +++++++++++++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h > index 19577dd..831ad682 100644 > --- a/arch/x86/include/asm/processor.h > +++ b/arch/x86/include/asm/processor.h > @@ -810,6 +810,7 @@ static inline int mpx_disable_management(void) > > extern u16 amd_get_nb_id(int cpu); > extern u32 amd_get_nodes_per_socket(void); > +extern u32 amd_get_cores_per_cu(void); > > static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) > { > diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c > index 4a70fc6..a914b1b 100644 > --- a/arch/x86/kernel/cpu/amd.c > +++ b/arch/x86/kernel/cpu/amd.c > @@ -27,6 +27,9 @@ > */ > static u32 nodes_per_socket = 1; > > +/* cores_per_cu: stores the number of cores per compute unit */ > +static u32 cores_per_cu = 1; > + > static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p) > { > u32 gprs[8] = { 0 }; > @@ -299,7 +302,6 @@ static int nearby_node(int apicid) > #ifdef CONFIG_SMP > static void amd_get_topology(struct cpuinfo_x86 *c) > { > - u32 cores_per_cu = 1; > u8 node_id; > int cpu = smp_processor_id(); > > @@ -314,7 +316,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c) > /* get compute unit information */ > smp_num_siblings = ((ebx >> 8) & 3) + 1; > c->compute_unit_id = ebx & 0xff; > - cores_per_cu += ((ebx >> 8) & 3); > } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { > u64 value; > > @@ -380,6 +381,13 @@ u32 amd_get_nodes_per_socket(void) > } > EXPORT_SYMBOL_GPL(amd_get_nodes_per_socket); > > +/* this function returns the number of cores per compute unit */ > +u32 amd_get_cores_per_cu(void) > +{ > + return cores_per_cu; > +} > +EXPORT_SYMBOL_GPL(amd_get_cores_per_cu); > + > static void srat_detect_node(struct cpuinfo_x86 *c) > { > #ifdef CONFIG_NUMA > @@ -510,6 +518,13 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) > > if (cpu_has(c, X86_FEATURE_MWAITX)) > use_mwaitx_delay(); > + > + if (cpu_has_topoext) { > + u32 cpuid; > + > + cpuid = cpuid_ebx(0x8000001e); > + cores_per_cu += ((cpuid >> 8) & 3); > + } > } > > static void early_init_amd(struct cpuinfo_x86 *c) >