public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andreas Herrmann <andreas.herrmann3@amd.com>
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org,
	Borislav Petkov <borislav.petkov@amd.com>,
	Brice Goglin <Brice.Goglin@inria.fr>
Subject: [PATCH 6/8] x86, mcheck: Make use of cpu_node_mask instead of cpu_core_mask
Date: Fri, 7 Aug 2009 15:04:15 +0200	[thread overview]
Message-ID: <20090807130415.GY6520@alberich.amd.com> (raw)
In-Reply-To: <20090807125609.GH7198@alberich.amd.com>

This fixes threshold_bank4 support on multi-node processors.

We need to create 2 sets of symlinks for sibling shared banks -- one
set for each internal node, symlinks of each set should target the
first core on same internal node.

Currently only one set is created where all symlinks are targeting
the first core of the entire socket.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
 arch/x86/kernel/cpu/mcheck/mce_amd.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index ddae216..595cbe5 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -494,7 +494,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 
 #ifdef CONFIG_SMP
 	if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) {	/* symlink */
-		i = cpumask_first(cpu_core_mask(cpu));
+		i = cpumask_first(cpu_node_mask(cpu));
 
 		/* first core not up yet */
 		if (cpu_data(i).cpu_core_id)
@@ -514,7 +514,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 		if (err)
 			goto out;
 
-		cpumask_copy(b->cpus, cpu_core_mask(cpu));
+		cpumask_copy(b->cpus, cpu_node_mask(cpu));
 		per_cpu(threshold_banks, cpu)[bank] = b;
 
 		goto out;
@@ -539,7 +539,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 #ifndef CONFIG_SMP
 	cpumask_setall(b->cpus);
 #else
-	cpumask_copy(b->cpus, cpu_core_mask(cpu));
+	cpumask_copy(b->cpus, cpu_node_mask(cpu));
 #endif
 
 	per_cpu(threshold_banks, cpu)[bank] = b;
-- 
1.6.3.3




  parent reply	other threads:[~2009-08-07 13:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-07 12:56 [PATCH 0/8 v5] x86: Adapt CPU topology detection for AMD Magny-Cours Andreas Herrmann
2009-08-07 12:57 ` [PATCH 1/8] topology: Introduce cpu_node information for multi-node processors Andreas Herrmann
2009-08-07 12:57 ` [PATCH 2/8] x86: Provide CPU topology " Andreas Herrmann
2009-08-07 12:58 ` [PATCH 3/8] x86: Add cpu_node topology detection for AMD Magny-Cours Andreas Herrmann
2009-08-07 12:59 ` [PATCH 4/8] x86, topology: Swap semantic of core_siblings and cpu_node_siblings Andreas Herrmann
2009-08-07 13:02 ` [PATCH 5/8] x86, cacheinfo: Fixup L3 cache information for AMD multi-node processors Andreas Herrmann
2009-08-07 13:04 ` Andreas Herrmann [this message]
2009-08-07 13:05 ` [PATCH 7/8] x86, smpboot: use zalloc_cpumask_var instead of alloc/clear Andreas Herrmann
2009-08-07 13:05 ` [PATCH 8/8] topology: Update CPU topology documentation Andreas Herrmann
2009-08-12 23:22 ` [PATCH 0/8 v5] x86: Adapt CPU topology detection for AMD Magny-Cours Alex Chiang
2009-08-13  9:21   ` Andreas Herrmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090807130415.GY6520@alberich.amd.com \
    --to=andreas.herrmann3@amd.com \
    --cc=Brice.Goglin@inria.fr \
    --cc=borislav.petkov@amd.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox