Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbcLFIIP (ORCPT ); Tue, 6 Dec 2016 03:08:15 -0500 Received: from mail.skyhub.de ([78.46.96.112]:36169 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429AbcLFIIM (ORCPT ); Tue, 6 Dec 2016 03:08:12 -0500 Date: Tue, 6 Dec 2016 09:08:06 +0100 From: Borislav Petkov To: Andy Lutomirski Cc: x86@kernel.org, One Thousand Gnomes , "linux-kernel@vger.kernel.org" , Brian Gerst , Matthew Whitehead , Borislav Petkov Subject: Re: [RFC PATCH 1/6] x86/CPU: Add X86_FEATURE_CPUID Message-ID: <20161206080806.mh6wnm3gqe7czvs4@pd.tnic> References: <64c7a16c0c56df35e33b16fec30b69a73a0b96d7.1480985979.git.luto@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <64c7a16c0c56df35e33b16fec30b69a73a0b96d7.1480985979.git.luto@kernel.org> User-Agent: NeoMutt/20161014 (1.7.1) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2598 Lines: 69 On Mon, Dec 05, 2016 at 05:01:10PM -0800, Andy Lutomirski wrote: > From: Borislav Petkov > > Add a synthetic CPUID flag denoting whether the CPU sports the CPUID > instruction or not. This will come useful later when accomodating > CPUID-less CPUs. > > Signed-off-by: Borislav Petkov > Signed-off-by: Andy Lutomirski > --- > arch/x86/include/asm/cpufeatures.h | 2 +- > arch/x86/kernel/cpu/common.c | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h > index a4f9aee62217..e6be43b2679a 100644 > --- a/arch/x86/include/asm/cpufeatures.h > +++ b/arch/x86/include/asm/cpufeatures.h > @@ -100,7 +100,7 @@ > #define X86_FEATURE_XTOPOLOGY ( 3*32+22) /* cpu topology enum extensions */ > #define X86_FEATURE_TSC_RELIABLE ( 3*32+23) /* TSC is known to be reliable */ > #define X86_FEATURE_NONSTOP_TSC ( 3*32+24) /* TSC does not stop in C states */ > -/* free, was #define X86_FEATURE_CLFLUSH_MONITOR ( 3*32+25) * "" clflush reqd with monitor */ > +#define X86_FEATURE_CPUID ( 3*32+25) /* CPU has CPUID instruction itself */ > #define X86_FEATURE_EXTD_APICID ( 3*32+26) /* has extended APICID (8 bits) */ > #define X86_FEATURE_AMD_DCM ( 3*32+27) /* multi-node processor */ > #define X86_FEATURE_APERFMPERF ( 3*32+28) /* APERFMPERF */ > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index cc9e980c68ec..37f031f39e27 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -800,14 +800,12 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) > memset(&c->x86_capability, 0, sizeof c->x86_capability); > c->extended_cpuid_level = 0; > > - if (!have_cpuid_p()) > - identify_cpu_without_cpuid(c); > - > /* cyrix could have cpuid enabled via c_identify()*/ > if (have_cpuid_p()) { > cpu_detect(c); > get_cpu_vendor(c); > get_cpu_cap(c); > + setup_force_cpu_cap(X86_FEATURE_CPUID); > > if (this_cpu->c_early_init) > this_cpu->c_early_init(c); > @@ -817,6 +815,9 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) > > if (this_cpu->c_bsp_init) > this_cpu->c_bsp_init(c); > + } else { > + identify_cpu_without_cpuid(c); > + setup_clear_cpu_cap(X86_FEATURE_CPUID); checkpatch complains here: WARNING: Statements should start on a tabstop #68: FILE: arch/x86/kernel/cpu/common.c:818: + } else { Please reflow tabs. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.