[PATCH 3/4] x86, cacheinfo: Make use of CPUID 0x8000001d for cache information on AMD

2012-10-19 Thread Andreas Herrmann 

Rely on CPUID 0x801d for cache information when AMD CPUID topology
extensions are available.

Signed-off-by: Andreas Herrmann 
---
 arch/x86/kernel/cpu/intel_cacheinfo.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c 
b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 8ce7a83..cd2e1cc 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -538,7 +538,11 @@ __cpuinit cpuid4_cache_lookup_regs(int index,
unsignededx;
 
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
-   amd_cpuid4(index, , , );
+   if (cpu_has_topoext)
+   cpuid_count(0x801d, index, ,
+   , , );
+   else
+   amd_cpuid4(index, , , );
amd_init_l3_cache(this_leaf, index);
} else {
cpuid_count(4, index, , , , );
-- 
1.7.8.6


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/4] x86, cacheinfo: Make use of CPUID 0x8000001d for cache information on AMD

2012-10-19 Thread Andreas Herrmann 

Rely on CPUID 0x801d for cache information when AMD CPUID topology
extensions are available.

Signed-off-by: Andreas Herrmann andreas.herrma...@amd.com
---
 arch/x86/kernel/cpu/intel_cacheinfo.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c 
b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 8ce7a83..cd2e1cc 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -538,7 +538,11 @@ __cpuinit cpuid4_cache_lookup_regs(int index,
unsignededx;
 
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
-   amd_cpuid4(index, eax, ebx, ecx);
+   if (cpu_has_topoext)
+   cpuid_count(0x801d, index, eax.full,
+   ebx.full, ecx.full, edx);
+   else
+   amd_cpuid4(index, eax, ebx, ecx);
amd_init_l3_cache(this_leaf, index);
} else {
cpuid_count(4, index, eax.full, ebx.full, ecx.full, edx);
-- 
1.7.8.6


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/