[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110526093925.1b9d8bba@endymion.delvare>
Date: Thu, 26 May 2011 09:39:25 +0200
From: Jean Delvare <khali@...ux-fr.org>
To: Andi Kleen <andi@...stfloor.org>
Cc: x86@...nel.org, linux-kernel@...r.kernel.org,
Andi Kleen <ak@...ux.intel.com>
Subject: Re: [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check
On Wed, 25 May 2011 12:32:27 -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@...ux.intel.com>
>
> Now that the cpu update level is available the Atom PSE errata
> check can use it directly without reading the MSR again.
>
> Signed-off-by: Andi Kleen <ak@...ux.intel.com>
Acked-by: Jean Delvare <khali@...ux-fr.org>
> ---
> arch/x86/kernel/cpu/intel.c | 15 ++++-----------
> 1 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index ba5ba17..701efa4 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -55,17 +55,10 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
> * need the microcode to have already been loaded... so if it is
> * not, recommend a BIOS update and disable large pages.
> */
> - if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2) {
> - u32 ucode, junk;
> -
> - wrmsr(MSR_IA32_UCODE_REV, 0, 0);
> - sync_core();
> - rdmsr(MSR_IA32_UCODE_REV, junk, ucode);
> -
> - if (ucode < 0x20e) {
> - printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n");
> - clear_cpu_cap(c, X86_FEATURE_PSE);
> - }
> + if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2 &&
> + c->cpu_update < 0x20e) {
> + printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n");
> + clear_cpu_cap(c, X86_FEATURE_PSE);
> }
>
> #ifdef CONFIG_X86_64
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists