From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756255Ab2HGAfW (ORCPT ); Mon, 6 Aug 2012 20:35:22 -0400 Received: from mga09.intel.com ([134.134.136.24]:59129 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751457Ab2HGAfV (ORCPT ); Mon, 6 Aug 2012 20:35:21 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="182442190" Message-ID: <502062C8.4050006@intel.com> Date: Tue, 07 Aug 2012 08:35:20 +0800 From: Alex Shi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111229 Thunderbird/9.0 MIME-Version: 1.0 To: Borislav Petkov CC: "H. Peter Anvin" , X86-ML , LKML , Borislav Petkov Subject: Re: [PATCH v1 2/4] x86, CPU: Push TLB detection CPUID check down References: <1344272439-29080-1-git-send-email-bp@amd64.org> <1344272439-29080-3-git-send-email-bp@amd64.org> In-Reply-To: <1344272439-29080-3-git-send-email-bp@amd64.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/07/2012 01:00 AM, Borislav Petkov wrote: > From: Borislav Petkov > > Push the max CPUID leaf check into the ->detect_tlb function and remove > general test case from the generic path. > > Signed-off-by: Borislav Petkov Acked-by: Alex Shi > --- > arch/x86/kernel/cpu/common.c | 3 +-- > arch/x86/kernel/cpu/intel.c | 4 ++++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index d239977f361f..080f4a737e3e 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -940,8 +940,7 @@ void __init identify_boot_cpu(void) > #else > vgetcpu_set_mode(); > #endif > - if (boot_cpu_data.cpuid_level >= 2) > - cpu_detect_tlb(&boot_cpu_data); > + cpu_detect_tlb(&boot_cpu_data); > } > > void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c) > diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c > index 0a4ce2980a5a..198e019a531a 100644 > --- a/arch/x86/kernel/cpu/intel.c > +++ b/arch/x86/kernel/cpu/intel.c > @@ -648,6 +648,10 @@ static void __cpuinit intel_detect_tlb(struct cpuinfo_x86 *c) > int i, j, n; > unsigned int regs[4]; > unsigned char *desc = (unsigned char *)regs; > + > + if (c->cpuid_level < 2) > + return; > + > /* Number of times to iterate */ > n = cpuid_eax(2) & 0xFF; >