Skip to contentSkip to conversation

x86/microcode changes for v2.6.31

GIT PULL Ingo Molnar 1 participant 1 message Jun 10, 2009 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-microcode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-microcode-for-linus

Thanks,

Ingo

------------------>
Dmitry Adamushko (1):
x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic

Figo.zhang (1):
x86, microcode: Simplify vfree() use

 arch/x86/include/asm/microcode.h  |   25 ++-
 arch/x86/kernel/microcode_amd.c   |   70 +++-----
 arch/x86/kernel/microcode_core.c  |  329 +++++++++++++++++++++----------------
 arch/x86/kernel/microcode_intel.c |   90 ++++-------
 4 files changed, 266 insertions(+), 248 deletions(-)
arch/x86/include/asm/microcode.h +18 -7
index c882664..ef51b50 100644
@@ -9,20 +9,31 @@ struct cpu_signature {
 
 struct device;
 
+enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
+
 struct microcode_ops {
-	int  (*request_microcode_user) (int cpu, const void __user *buf, size_t size);
-	int  (*request_microcode_fw) (int cpu, struct device *device);
+	enum ucode_state (*request_microcode_user) (int cpu,
+				const void __user *buf, size_t size);
 
-	void (*apply_microcode) (int cpu);
+	enum ucode_state (*request_microcode_fw) (int cpu,
+				struct device *device);
 
-	int  (*collect_cpu_info) (int cpu, struct cpu_signature *csig);
 	void (*microcode_fini_cpu) (int cpu);
+
+	/*
+	 * The generic 'microcode_core' part guarantees that
+	 * the callbacks below run on a target cpu when they
+	 * are being called.
+	 * See also the "Synchronization" section in microcode_core.c.
+	 */
+	int (*apply_microcode) (int cpu);
+	int (*collect_cpu_info) (int cpu, struct cpu_signature *csig);
 };
 
 struct ucode_cpu_info {
-	struct cpu_signature cpu_sig;
-	int valid;
-	void *mc;
+	struct cpu_signature	cpu_sig;
+	int			valid;
+	void			*mc;
 };
 extern struct ucode_cpu_info ucode_cpu_info[];
 
arch/x86/kernel/microcode_amd.c +26 -44

172 lines not on this page · raw message

arch/x86/kernel/microcode_core.c +189 -140

537 lines not on this page · raw message

arch/x86/kernel/microcode_intel.c +33 -57

191 lines not on this page · raw message