Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755763AbcLOSOx (ORCPT ); Thu, 15 Dec 2016 13:14:53 -0500 Received: from mail.kernel.org ([198.145.29.136]:40334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbcLOSOw (ORCPT ); Thu, 15 Dec 2016 13:14:52 -0500 From: Andy Lutomirski To: x86@kernel.org Cc: Borislav Petkov , "linux-kernel@vger.kernel.org" , Brian Gerst , Andy Lutomirski Subject: [PATCH] x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6 Date: Thu, 15 Dec 2016 10:14:42 -0800 Message-Id: <6ea30c0e9daec21e488b54761881a6dfcf3e04d0.1481825597.git.luto@kernel.org> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1272 Lines: 38 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 --- I don't know what CPUs, if any, are affected, and the bug is minor anyway, so the major advantage of applying this is to remove a head-scratcher when reading the code, I think. arch/x86/kernel/cpu/common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index cc9e980c68ec..d61722821b7b 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.9.3