From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check
Date: Wed, 12 Oct 2011 17:46:34 -0700 [thread overview]
Message-ID: <1318466795-7393-2-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1318466795-7393-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.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@linux.intel.com>
---
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 26627a3..5231312 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -64,17 +64,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->microcode < 0x20e) {
+ printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n");
+ clear_cpu_cap(c, X86_FEATURE_PSE);
}
#ifdef CONFIG_X86_64
--
1.7.4.4
next prev parent reply other threads:[~2011-10-13 0:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 0:46 [PATCH 1/3] x86, intel: Output microcode revision v6 Andi Kleen
2011-10-13 0:46 ` Andi Kleen [this message]
2011-10-13 5:38 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check H. Peter Anvin
2011-10-13 0:46 ` [PATCH 3/3] coretemp: Get microcode revision from cpu_data v3 Andi Kleen
2011-10-13 5:38 ` H. Peter Anvin
2011-10-13 16:11 ` Yu, Fenghua
2011-10-13 5:37 ` [PATCH 1/3] x86, intel: Output microcode revision v6 H. Peter Anvin
2011-10-13 12:53 ` Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 22:55 [PATCH 1/3] x86, intel: Output microcode revision v7 Andi Kleen
2011-10-13 22:55 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-09-28 23:19 [PATCH 1/3] x86, intel: Output microcode revision v5 Andi Kleen
2011-09-28 23:19 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-08-29 23:47 [PATCH 1/3] x86, intel: Output microcode revision v4 Andi Kleen
2011-08-29 23:47 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-08-29 23:47 ` [PATCH 3/3] coretemp: Get microcode revision from cpu_data v2 Andi Kleen
2011-08-30 1:08 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Yu, Fenghua
2011-07-06 23:57 [PATCH 1/3] x86, intel: Output microcode revision v3 Andi Kleen
2011-07-06 23:57 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-07-11 8:19 ` Jean Delvare
2011-07-01 19:21 [PATCH 1/3] x86, intel: Output microcode revision v3 Andi Kleen
2011-07-01 19:21 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-05-25 19:32 [PATCH 1/3] x86, intel: Output microcode revision v2 Andi Kleen
2011-05-25 19:32 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-05-26 7:39 ` Jean Delvare
2011-05-24 23:03 [PATCH 1/3] x86, intel: Output microcode revision Andi Kleen
2011-05-24 23:03 ` [PATCH 2/3] x86, intel: Use cpu_update for Atom errata check Andi Kleen
2011-05-25 6:59 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318466795-7393-2-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).