Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758080AbZFCPpn (ORCPT ); Wed, 3 Jun 2009 11:45:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756277AbZFCPpf (ORCPT ); Wed, 3 Jun 2009 11:45:35 -0400 Received: from sg2ehsobe002.messaging.microsoft.com ([207.46.51.76]:7597 "EHLO SG2EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754923AbZFCPpe convert rfc822-to-8bit (ORCPT ); Wed, 3 Jun 2009 11:45:34 -0400 X-Greylist: delayed 904 seconds by postgrey-1.27 at vger.kernel.org; Wed, 03 Jun 2009 11:45:33 EDT X-SpamScore: -33 X-BigFish: VPS-33(zz1432R98dR148cM1805M655Nzz1202hzzz32i6bh17ch1a3h43j61h) X-Spam-TCS-SCL: 0:0 X-WSS-ID: 0KKO551-01-0YB-01 Date: Wed, 3 Jun 2009 17:16:43 +0200 From: Andreas Herrmann To: Bert Wesarg CC: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 3/5 retry] x86: add cpu_node topology detection for AMD Magny-Cours Message-ID: <20090603151643.GB23657@alberich.amd.com> References: <20090603142727.GI5736@alberich.amd.com> <20090603143559.GL5736@alberich.amd.com> <36ca99e90906030748l6e6cc2caqb575c924836dc0e@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline In-Reply-To: <36ca99e90906030748l6e6cc2caqb575c924836dc0e@mail.gmail.com> User-Agent: Mutt/1.5.16 (2007-06-09) X-OriginalArrivalTime: 03 Jun 2009 15:17:29.0171 (UTC) FILETIME=[68B7E230:01C9E45E] Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5553 Lines: 179 On Wed, Jun 03, 2009 at 04:48:07PM +0200, Bert Wesarg wrote: > On Wed, Jun 3, 2009 at 16:35, Andreas Herrmann > wrote: > > diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c > > index 728b375..feed057 100644 > > --- a/arch/x86/kernel/cpu/amd.c > > +++ b/arch/x86/kernel/cpu/amd.c > > @@ -274,7 +328,14 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) > > ? ? ? ?int node; > > ? ? ? ?unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; > > > > +#ifdef CONFIG_MULTI_NODE_CPU > > + ? ? ? if (cpu_has(c, X86_FEATURE_AMD_DCM)) > > + ? ? ? ? ? ? ? node = (c->phys_proc_id << 1) + c->cpu_node_id; > > + ? ? ? else > > + ? ? ? ? ? ? ? node = c->phys_proc_id; > > +#else > > ? ? ? ?node = c->phys_proc_id; > > +#endif > Stale CONFIG_MULTI_NODE_CPU? Argh! Thanks for catching this. Fixed patch is attached. Regards, Andreas --- This adapts CPU topology detection for AMD Magny-Cours. Here is example output from two cores on same package but different internal cpu_nodes: /sys/devices/system/cpu/cpu5: physical_package_id : 0 core_id : 5 thread_siblings : 00000020 thread_siblings_list : 5 cpu_node_id : 0 cpu_node_siblings : 0000003f cpu_node_siblings_list : 0-5 core_siblings : 00000fff core_siblings_list : 0-11 /sys/devices/system/cpu/cpu6: physical_package_id : 0 core_id : 0 thread_siblings : 00000040 thread_siblings_list : 6 cpu_node_id : 1 cpu_node_siblings : 00000fc0 cpu_node_siblings_list : 6-11 core_siblings : 00000fff core_siblings_list : 0-11 Signed-off-by: Andreas Herrmann --- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/kernel/cpu/amd.c | 60 ++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletions(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 13cc6a5..7abe596 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -94,6 +94,7 @@ #define X86_FEATURE_TSC_RELIABLE (3*32+23) /* TSC is known to be reliable */ #define X86_FEATURE_NONSTOP_TSC (3*32+24) /* TSC does not stop in C states */ #define X86_FEATURE_CLFLUSH_MONITOR (3*32+25) /* "" clflush reqd with monitor */ +#define X86_FEATURE_AMD_DCM (3*32+26) /* multi-node processor */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */ diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 728b375..8c27925 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -6,6 +6,7 @@ #include #include #include +#include #ifdef CONFIG_X86_64 # include @@ -250,6 +251,56 @@ static int __cpuinit nearby_node(int apicid) #endif /* + * Fixup core topology information for AMD multi-node processors. + * Assumption 1: Number of cores in each internal node is the same. + * Assumption 2: Mixed systems with both single-node and dual-node + * processors are not supported. + */ +static void __cpuinit amd_fixup_dcm(struct cpuinfo_x86 *c) +{ + u32 t, cpn; + u8 n; + + /* fixup topology information only once for a core */ + if (cpu_has(c, X86_FEATURE_AMD_DCM)) + return; + + /* check for multi-node processor on boot cpu */ + t = read_pci_config(0, 24, 3, 0xe8); + if (!(t & (1 << 29))) + return; + + set_cpu_cap(c, X86_FEATURE_AMD_DCM); + + /* cores per node: each internal node has half the number of cores */ + cpn = c->x86_max_cores >> 1; + + /* even-numbered NB_id of this dual-node processor */ + n = c->phys_proc_id << 1; + + /* + * determine internal node id and assign cores fifty-fifty to + * each node of the dual-node processor + */ + t = read_pci_config(0, 24 + n, 3, 0xe8); + n = (t>>30) & 0x3; + if (n == 0) { + if (c->cpu_core_id < cpn) + c->cpu_node_id = 0; + else + c->cpu_node_id = 1; + } else { + if (c->cpu_core_id < cpn) + c->cpu_node_id = 1; + else + c->cpu_node_id = 0; + } + + /* fixup core id to be in range from 0 to cpn */ + c->cpu_core_id = c->cpu_core_id % cpn; +} + +/* * On a AMD dual core setup the lower bits of the APIC id distingush the cores. * Assumes number of cores is a power of two. */ @@ -264,6 +315,9 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); /* Convert the initial APIC ID into the socket ID */ c->phys_proc_id = c->initial_apicid >> bits; + /* fixup topology information on multi-node processors */ + if ((c->x86 == 0x10) && (c->x86_model == 9)) + amd_fixup_dcm(c); #endif } @@ -274,7 +328,11 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) int node; unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; - node = c->phys_proc_id; + if (cpu_has(c, X86_FEATURE_AMD_DCM)) + node = (c->phys_proc_id << 1) + c->cpu_node_id; + else + node = c->phys_proc_id; + if (apicid_to_node[apicid] != NUMA_NO_NODE) node = apicid_to_node[apicid]; if (!node_online(node)) { -- 1.6.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/