From: Thomas Gleixner Date: Wed, 16 Nov 2016 13:19:34 +0000 (+0100) Subject: Merge branch 'x86/cpufeature' into x86/cache X-Git-Tag: v4.10-rc1~29^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7ce7f35b33eb42b6aa4cf176fa34372b21b8472b;p=linux-2.6-block.git Merge branch 'x86/cpufeature' into x86/cache Resolve the cpu/scattered conflict. Signed-off-by: Thomas Gleixner --- 7ce7f35b33eb42b6aa4cf176fa34372b21b8472b diff --cc arch/x86/kernel/cpu/scattered.c index 49fb680bb0e5,d1316f9c8329..d9794060fe22 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@@ -17,11 -17,17 +17,20 @@@ struct cpuid_bit u32 sub_leaf; }; - enum cpuid_regs { - CR_EAX = 0, - CR_ECX, - CR_EDX, - CR_EBX + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */ + static const struct cpuid_bit cpuid_bits[] = { + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 }, - { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 }, - { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 }, ++ { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 }, ++ { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 }, + { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 }, + { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 }, - { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, - { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, ++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 }, ++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 }, ++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 }, ++ { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, ++ { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, + { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, + { 0, 0, 0, 0, 0 } }; void init_scattered_cpuid_features(struct cpuinfo_x86 *c)