All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND PATCH] x86, cacheinfo: Remove NUMA dependency
@ 2010-02-15 11:43 Borislav Petkov
  2010-02-15 21:24 ` [tip:x86/cpu] x86, cacheinfo: Remove NUMA dependency, fix for D1 Isntanbul tip-bot for Borislav Petkov
  0 siblings, 1 reply; 8+ messages in thread
From: Borislav Petkov @ 2010-02-15 11:43 UTC (permalink / raw)
  To: mingo, hpa, tglx; +Cc: x86, linux-kernel, Borislav Petkov

From: Borislav Petkov <borislav.petkov@amd.com>

The show/store_cache_disable routines depend unnecessarily on NUMA's
cpu_to_node and the disabling of cache indices breaks when !CONFIG_NUMA.
Remove that dependency by using a helper which returns always the
correct node id.

While at it, enable L3 Cache Index disable on revD1 Istanbuls which
sport the feature too.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
 arch/x86/kernel/cpu/intel_cacheinfo.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 589b705..be5f5c2 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -327,7 +327,7 @@ amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)
 
 	/* see errata #382 and #388 */
 	if ((boot_cpu_data.x86 == 0x10) &&
-	    ((boot_cpu_data.x86_model < 0x9) ||
+	    ((boot_cpu_data.x86_model < 0x8) ||
 	     (boot_cpu_data.x86_mask  < 0x1)))
 		return;
 
@@ -744,7 +744,7 @@ static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf,
 				  unsigned int index)
 {
 	int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map));
-	int node = cpu_to_node(cpu);
+	int node = amd_get_nb_id(cpu);
 	struct pci_dev *dev = node_to_k8_nb_misc(node);
 	unsigned int reg = 0;
 
@@ -771,7 +771,7 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,
 	const char *buf, size_t count, unsigned int index)
 {
 	int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map));
-	int node = cpu_to_node(cpu);
+	int node = amd_get_nb_id(cpu);
 	struct pci_dev *dev = node_to_k8_nb_misc(node);
 	unsigned long val = 0;
 
-- 
1.6.6.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-02-19  6:10 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-15 11:43 [RESEND PATCH] x86, cacheinfo: Remove NUMA dependency Borislav Petkov
2010-02-15 21:24 ` [tip:x86/cpu] x86, cacheinfo: Remove NUMA dependency, fix for D1 Isntanbul tip-bot for Borislav Petkov
2010-02-16 14:02   ` Ingo Molnar
2010-02-16 15:26     ` Borislav Petkov
2010-02-18 18:42     ` [PATCH 2/2] x86, cacheinfo: Enable L3 CID only on AMD Borislav Petkov
2010-02-19  6:09       ` [tip:x86/cpu] " tip-bot for Borislav Petkov
2010-02-18 18:43     ` [PATCH 1/2] x86, cacheinfo: Remove NUMA dependency, fix for Fam10h, rev.D1 Borislav Petkov
2010-02-19  6:09       ` [tip:x86/cpu] x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1 tip-bot for Borislav Petkov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.