| From f619b3d8427eb57f0134dab75b0d217325c72411 Mon Sep 17 00:00:00 2001 |
| From: Borislav Petkov <borislav.petkov@amd.com> |
| Date: Thu, 4 Feb 2010 12:09:07 +0100 |
| Subject: x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1 |
| |
| From: Borislav Petkov <borislav.petkov@amd.com> |
| |
| commit f619b3d8427eb57f0134dab75b0d217325c72411 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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 _ |
| |
| /* 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; |
| |
| @@ -759,7 +759,7 @@ static ssize_t show_cache_disable(struct |
| 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; |
| |
| @@ -786,7 +786,7 @@ static ssize_t store_cache_disable(struc |
| 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; |
| |