lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1

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

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

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <20100218184339.GG20473@aftab>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Borislav Petkov
2010-02-04 12:09:07 +01:00
committed by H. Peter Anvin
parent 414bb144ef
commit f619b3d842
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/cpu/intel_cacheinfo.c
View File

@@ -327,7 +327,7 @@ amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)
/* see errata #382 and #388 */ /* see errata #382 and #388 */
if ((boot_cpu_data.x86 == 0x10) && if ((boot_cpu_data.x86 == 0x10) &&
((boot_cpu_data.x86_model < 0x9) || ((boot_cpu_data.x86_model < 0x8) ||
(boot_cpu_data.x86_mask < 0x1))) (boot_cpu_data.x86_mask < 0x1)))
return; return;
@@ -744,7 +744,7 @@ static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf,
unsigned int index) unsigned int index)
{ {
int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map)); 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); struct pci_dev *dev = node_to_k8_nb_misc(node);
unsigned int reg = 0; 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) const char *buf, size_t count, unsigned int index)
{ {
int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map)); 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); struct pci_dev *dev = node_to_k8_nb_misc(node);
unsigned long val = 0; unsigned long val = 0;