| From 323d67c1c351c3b5f05d5705e5865688930d0259 Mon Sep 17 00:00:00 2001 |
| From: Andy Lutomirski <luto@kernel.org> |
| Date: Thu, 15 Dec 2016 10:14:42 -0800 |
| Subject: [PATCH] x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6 |
| |
| commit 3df8d9208569ef0b2313e516566222d745f3b94b upstream. |
| |
| A typo (or mis-merge?) resulted in leaf 6 only being probed if |
| cpuid_level >= 7. |
| |
| Fixes: 2ccd71f1b278 ("x86/cpufeature: Move some of the scattered feature bits to x86_capability") |
| Signed-off-by: Andy Lutomirski <luto@kernel.org> |
| Acked-by: Borislav Petkov <bp@alien8.de> |
| Cc: Brian Gerst <brgerst@gmail.com> |
| Link: http://lkml.kernel.org/r/6ea30c0e9daec21e488b54761881a6dfcf3e04d0.1481825597.git.luto@kernel.org |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c |
| index bcc9ccc220c9..8e5d91c3dc98 100644 |
| --- a/arch/x86/kernel/cpu/common.c |
| +++ b/arch/x86/kernel/cpu/common.c |
| @@ -667,13 +667,14 @@ void get_cpu_cap(struct cpuinfo_x86 *c) |
| c->x86_capability[CPUID_1_EDX] = edx; |
| } |
| |
| + /* Thermal and Power Management Leaf: level 0x00000006 (eax) */ |
| + if (c->cpuid_level >= 0x00000006) |
| + c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006); |
| + |
| /* Additional Intel-defined flags: level 0x00000007 */ |
| if (c->cpuid_level >= 0x00000007) { |
| cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); |
| - |
| c->x86_capability[CPUID_7_0_EBX] = ebx; |
| - |
| - c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006); |
| c->x86_capability[CPUID_7_ECX] = ecx; |
| } |
| |
| -- |
| 2.10.1 |
| |
