x86, cacheinfo: Unify AMD L3 cache index disable checking
PATCH 1/1 x86, cacheinfo: Unify AMD L3 cache index disable checking
All F10h CPUs starting with model 8 resp. 9, stepping 1, support L3 cache index disable. Concentrate the family, model, stepping checking at one place and enable the feature implicitly on upcoming Fam10h models.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/cpu/intel_cacheinfo.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +10 -7
@@ -328,18 +328,22 @@ static unsigned int __cpuinit amd_calc_l3_indices(void)static void __cpuinit amd_check_l3_disable (int index,struct _cpuid4_info_regs *this_leaf) { -if (index <3 ) +if (boot_cpu_data.x86 !=0x10 )return ; -if (boot_cpu_data.x86 ==0x11 ) +if (index <3 )return ;/* see errata #382 and #388 */ -if ((boot_cpu_data.x86 ==0x10 ) && - ((boot_cpu_data.x86_model <0x8 ) || - (boot_cpu_data.x86_mask <0x1 ))) +if (boot_cpu_data.x86_model <0x8 )return ; +if ((boot_cpu_data.x86_model ==0x8 || + boot_cpu_data.x86_model ==0x9 ) + && + boot_cpu_data.x86_mask <0x1 ) +return ; + this_leaf->can_disable = true; this_leaf->l3_indices =amd_calc_l3_indices (); }
@@ -443,8 +447,7 @@ __cpuinit cpuid4_cache_lookup_regs(int index,if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) {amd_cpuid4 (index, &eax, &ebx, &ecx); -if (boot_cpu_data.x86 >=0x10 ) -amd_check_l3_disable (index, this_leaf); +amd_check_l3_disable (index, this_leaf); }else {cpuid_count (4 , index, &eax.full, &ebx.full, &ecx.full, &edx); }
Signature · 10 lines
1.7.0.2 -- Regards/Gruss, Boris. -- Advanced Micro Devices, Inc. Operating Systems Research Center