From 8d7cb65a0faad620dedf3b5545d46967907b4537 Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zach@vmware.com>
Date: Sat, 3 Sep 2005 15:56:37 -0700
Subject: [PATCH] --- yaml --- r: 6977 b: refs/heads/master c:
 245067d1674d451855692fcd4647daf9fd47f82d h: refs/heads/master i:   6975:
 db9f281626093e26a7c70edb4d50a3612e50a6dd v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/microcode.c   | 7 +++++--
 trunk/include/asm-i386/processor.h   | 5 +++++
 trunk/include/asm-x86_64/processor.h | 5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index daf91857a083..ac1b4b7c8405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bb0d3ec3e5b1e9e2399cdc641b3b6521ac9cdaa
+refs/heads/master: 245067d1674d451855692fcd4647daf9fd47f82d
diff --git a/trunk/arch/i386/kernel/microcode.c b/trunk/arch/i386/kernel/microcode.c
index a77c612aad00..165f13158c60 100644
--- a/trunk/arch/i386/kernel/microcode.c
+++ b/trunk/arch/i386/kernel/microcode.c
@@ -164,7 +164,8 @@ static void collect_cpu_info (void *unused)
 	}
 
 	wrmsr(MSR_IA32_UCODE_REV, 0, 0);
-	__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
+	/* see notes above for revision 1.07.  Apparent chip bug */
+	serialize_cpu();
 	/* get the current revision from MSR 0x8B */
 	rdmsr(MSR_IA32_UCODE_REV, val[0], uci->rev);
 	pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n",
@@ -377,7 +378,9 @@ static void do_update_one (void * unused)
 		(unsigned long) uci->mc->bits >> 16 >> 16);
 	wrmsr(MSR_IA32_UCODE_REV, 0, 0);
 
-	__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
+	/* see notes above for revision 1.07.  Apparent chip bug */
+	serialize_cpu();
+
 	/* get the current revision from MSR 0x8B */
 	rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);
 
diff --git a/trunk/include/asm-i386/processor.h b/trunk/include/asm-i386/processor.h
index 7e17d3b4f65a..a0489b222702 100644
--- a/trunk/include/asm-i386/processor.h
+++ b/trunk/include/asm-i386/processor.h
@@ -277,6 +277,11 @@ static inline void clear_in_cr4 (unsigned long mask)
 	outb((data), 0x23); \
 } while (0)
 
+static inline void serialize_cpu(void)
+{
+	 __asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
+}
+
 static inline void __monitor(const void *eax, unsigned long ecx,
 		unsigned long edx)
 {
diff --git a/trunk/include/asm-x86_64/processor.h b/trunk/include/asm-x86_64/processor.h
index 85549e656eeb..194160f6a43f 100644
--- a/trunk/include/asm-x86_64/processor.h
+++ b/trunk/include/asm-x86_64/processor.h
@@ -437,6 +437,11 @@ static inline void prefetchw(void *x)
 	outb((data), 0x23); \
 } while (0)
 
+static inline void serialize_cpu(void)
+{
+	__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
+}
+
 static inline void __monitor(const void *eax, unsigned long ecx,
 		unsigned long edx)
 {