x86: microcode: cleanup

Impact: cleanup Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Dmitry Adamushko <dmitry.adamushko@gmail.com> Cc: Peter Oruba <peter.oruba@amd.com> LKML-Reference: <200903111632.37279.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu>

x86: microcode: cleanup
Impact: cleanup Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Dmitry Adamushko <dmitry.adamushko@gmail.com> Cc: Peter Oruba <peter.oruba@amd.com> LKML-Reference: <200903111632.37279.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar
1 parent af5c820a31
Showing 3 changed files with 97 additions and 87 deletions Side-by-side Diff
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_core.c
arch/x86/kernel/microcode_intel.c
@@ -12,31 +12,30 @@
  *
  *  Licensed under the terms of the GNU General Public
  *  License version 2. See file COPYING for details.
-*/
-
+ */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
 #include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/cpumask.h>
+#include <linux/pci_ids.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
 #include <linux/pci.h>
-#include <linux/pci_ids.h>
-#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
  
-#include <asm/msr.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
  
 MODULE_DESCRIPTION("AMD Microcode Update Driver");
 MODULE_AUTHOR("Peter Oruba");
@@ -72,8 +71,8 @@
 } __attribute__((packed));
  
 struct microcode_amd {
-	struct microcode_header_amd hdr;
-	unsigned int mpb[0];
+	struct microcode_header_amd	hdr;
+	unsigned int			mpb[0];
 };
  
 #define UCODE_MAX_SIZE			2048
@@ -184,8 +183,8 @@
 	return 0;
 }
  
-static void *get_next_ucode(const u8 *buf, unsigned int size,
-			    unsigned int *mc_size)
+static void *
+get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
 {
 	unsigned int total_size;
 	u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
@@ -222,7 +221,6 @@
 	}
 	return mc;
 }
-
  
 static int install_equiv_cpu_table(const u8 *buf)
 {
@@ -70,47 +70,47 @@
  *		Fix sigmatch() macro to handle old CPUs with pf == 0.
  *		Thanks to Stuart Swales for pointing out this bug.
  */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/smp_lock.h>
+#include <linux/spinlock.h>
 #include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
-#include <linux/miscdevice.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
  
-#include <asm/msr.h>
-#include <asm/uaccess.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
  
 MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_LICENSE("GPL");
  
-#define MICROCODE_VERSION 	"2.00"
+#define MICROCODE_VERSION	"2.00"
  
-static struct microcode_ops *microcode_ops;
+static struct microcode_ops	*microcode_ops;
  
 /* no concurrent ->write()s are allowed on /dev/cpu/microcode */
 static DEFINE_MUTEX(microcode_mutex);
  
-struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
+struct ucode_cpu_info		ucode_cpu_info[NR_CPUS];
 EXPORT_SYMBOL_GPL(ucode_cpu_info);
  
 #ifdef CONFIG_MICROCODE_OLD_INTERFACE
 struct update_for_cpu {
-	const void __user *buf;
-	size_t size;
+	const void __user	*buf;
+	size_t			size;
 };
  
 static long update_for_cpu(void *_ufc)
  
@@ -209,12 +209,12 @@
  
 MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
 #else
-#define microcode_dev_init() 0
-#define microcode_dev_exit() do { } while (0)
+#define microcode_dev_init()	0
+#define microcode_dev_exit()	do { } while (0)
 #endif
  
 /* fake device for request_firmware */
-static struct platform_device *microcode_pdev;
+static struct platform_device	*microcode_pdev;
  
 static long reload_for_cpu(void *unused)
 {
@@ -282,8 +282,8 @@
 };
  
 static struct attribute_group mc_attr_group = {
-	.attrs = mc_default_attrs,
-	.name = "microcode",
+	.attrs		= mc_default_attrs,
+	.name		= "microcode",
 };
  
 static void __microcode_fini_cpu(int cpu)
@@ -353,7 +353,7 @@
 	 */
 	if (uci->valid) {
 		err = microcode_resume_cpu(smp_processor_id());
-	} else {	
+	} else {
 		collect_cpu_info(smp_processor_id());
 		if (uci->valid && system_state == SYSTEM_RUNNING)
 			err = microcode_ops->request_microcode_fw(
@@ -423,9 +423,9 @@
 }
  
 static struct sysdev_driver mc_sysdev_driver = {
-	.add = mc_sysdev_add,
-	.remove = mc_sysdev_remove,
-	.resume = mc_sysdev_resume,
+	.add		= mc_sysdev_add,
+	.remove		= mc_sysdev_remove,
+	.resume		= mc_sysdev_resume,
 };
  
 static __cpuinit int
@@ -464,7 +464,7 @@
 }
  
 static struct notifier_block __refdata mc_cpu_notifier = {
-	.notifier_call = mc_cpu_callback,
+	.notifier_call	= mc_cpu_callback,
 };
  
 static int __init microcode_init(void)
@@ -70,28 +70,28 @@
  *		Fix sigmatch() macro to handle old CPUs with pf == 0.
  *		Thanks to Stuart Swales for pointing out this bug.
  */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/smp_lock.h>
+#include <linux/spinlock.h>
 #include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
-#include <linux/miscdevice.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
-#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
  
-#include <asm/msr.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
  
 MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
  
@@ -129,12 +129,13 @@
 	struct extended_signature sigs[0];
 };
  
-#define DEFAULT_UCODE_DATASIZE 	(2000)
+#define DEFAULT_UCODE_DATASIZE	(2000)
 #define MC_HEADER_SIZE		(sizeof(struct microcode_header_intel))
 #define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
 #define EXT_HEADER_SIZE		(sizeof(struct extended_sigtable))
 #define EXT_SIGNATURE_SIZE	(sizeof(struct extended_signature))
 #define DWSIZE			(sizeof(u32))
+
 #define get_totalsize(mc) \
 	(((struct microcode_intel *)mc)->hdr.totalsize ? \
 	 ((struct microcode_intel *)mc)->hdr.totalsize : \
  
  
  
  
  
  
@@ -197,30 +198,31 @@
 }
  
 static inline int
-update_match_revision(struct microcode_header_intel *mc_header,	int rev)
+update_match_revision(struct microcode_header_intel *mc_header, int rev)
 {
 	return (mc_header->rev <= rev) ? 0 : 1;
 }
  
 static int microcode_sanity_check(void *mc)
 {
+	unsigned long total_size, data_size, ext_table_size;
 	struct microcode_header_intel *mc_header = mc;
 	struct extended_sigtable *ext_header = NULL;
-	struct extended_signature *ext_sig;
-	unsigned long total_size, data_size, ext_table_size;
 	int sum, orig_sum, ext_sigcount = 0, i;
+	struct extended_signature *ext_sig;
  
 	total_size = get_totalsize(mc_header);
 	data_size = get_datasize(mc_header);
+
 	if (data_size + MC_HEADER_SIZE > total_size) {
 		printk(KERN_ERR "microcode: error! "
-			"Bad data size in microcode data file\n");
+				"Bad data size in microcode data file\n");
 		return -EINVAL;
 	}
  
 	if (mc_header->ldrver != 1 || mc_header->hdrver != 1) {
 		printk(KERN_ERR "microcode: error! "
-			"Unknown microcode update format\n");
+				"Unknown microcode update format\n");
 		return -EINVAL;
 	}
 	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
  
  
@@ -318,12 +320,16 @@
  
 static void apply_microcode(int cpu)
 {
+	struct microcode_intel *mc_intel;
+	struct ucode_cpu_info *uci;
 	unsigned long flags;
 	unsigned int val[2];
-	int cpu_num = raw_smp_processor_id();
-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
-	struct microcode_intel *mc_intel = uci->mc;
+	int cpu_num;
  
+	cpu_num = raw_smp_processor_id();
+	uci = ucode_cpu_info + cpu;
+	mc_intel = uci->mc;
+
 	/* We should bind the task to the CPU */
 	BUG_ON(cpu_num != cpu);
  
  
  
@@ -348,15 +354,17 @@
 	spin_unlock_irqrestore(&microcode_update_lock, flags);
 	if (val[1] != mc_intel->hdr.rev) {
 		printk(KERN_ERR "microcode: CPU%d update from revision "
-			"0x%x to 0x%x failed\n", cpu_num, uci->cpu_sig.rev, val[1]);
+				"0x%x to 0x%x failed\n",
+			cpu_num, uci->cpu_sig.rev, val[1]);
 		return;
 	}
 	printk(KERN_INFO "microcode: CPU%d updated from revision "
-	       "0x%x to 0x%x, date = %04x-%02x-%02x \n",
+			 "0x%x to 0x%x, date = %04x-%02x-%02x \n",
 		cpu_num, uci->cpu_sig.rev, val[1],
 		mc_intel->hdr.date & 0xffff,
 		mc_intel->hdr.date >> 24,
 		(mc_intel->hdr.date >> 16) & 0xff);
+
 	uci->cpu_sig.rev = val[1];
 }
  
  
@@ -404,18 +412,23 @@
 		leftover  -= mc_size;
 	}
  
-	if (new_mc) {
-		if (!leftover) {
-			if (uci->mc)
-				vfree(uci->mc);
-			uci->mc = (struct microcode_intel *)new_mc;
-			pr_debug("microcode: CPU%d found a matching microcode update with"
-				 " version 0x%x (current=0x%x)\n",
-				cpu, new_rev, uci->cpu_sig.rev);
-		} else
-			vfree(new_mc);
+	if (!new_mc)
+		goto out;
+
+	if (leftover) {
+		vfree(new_mc);
+		goto out;
 	}
  
+	if (uci->mc)
+		vfree(uci->mc);
+	uci->mc = (struct microcode_intel *)new_mc;
+
+	pr_debug("microcode: CPU%d found a matching microcode update with"
+		 " version 0x%x (current=0x%x)\n",
+			cpu, new_rev, uci->cpu_sig.rev);
+
+ out:
 	return (int)leftover;
 }
...	...	@@ -12,31 +12,30 @@
12	12	*
13	13	* Licensed under the terms of the GNU General Public
14	14	* License version 2. See file COPYING for details.
15		-*/
16		-
	15	+ */
	16	+#include <linux/platform_device.h>
17	17	#include <linux/capability.h>
18		-#include <linux/kernel.h>
19		-#include <linux/init.h>
20		-#include <linux/sched.h>
21		-#include <linux/cpumask.h>
22		-#include <linux/module.h>
23		-#include <linux/slab.h>
24		-#include <linux/vmalloc.h>
25	18	#include <linux/miscdevice.h>
	19	+#include <linux/firmware.h>
26	20	#include <linux/spinlock.h>
27		-#include <linux/mm.h>
28		-#include <linux/fs.h>
	21	+#include <linux/cpumask.h>
	22	+#include <linux/pci_ids.h>
	23	+#include <linux/uaccess.h>
	24	+#include <linux/vmalloc.h>
	25	+#include <linux/kernel.h>
	26	+#include <linux/module.h>
29	27	#include <linux/mutex.h>
	28	+#include <linux/sched.h>
	29	+#include <linux/init.h>
	30	+#include <linux/slab.h>
30	31	#include <linux/cpu.h>
31		-#include <linux/firmware.h>
32		-#include <linux/platform_device.h>
33	32	#include <linux/pci.h>
34		-#include <linux/pci_ids.h>
35		-#include <linux/uaccess.h>
	33	+#include <linux/fs.h>
	34	+#include <linux/mm.h>
36	35
37		-#include <asm/msr.h>
38		-#include <asm/processor.h>
39	36	#include <asm/microcode.h>
	37	+#include <asm/processor.h>
	38	+#include <asm/msr.h>
40	39
41	40	MODULE_DESCRIPTION("AMD Microcode Update Driver");
42	41	MODULE_AUTHOR("Peter Oruba");
...	...	@@ -72,8 +71,8 @@
72	71	} __attribute__((packed));
73	72
74	73	struct microcode_amd {
75		- struct microcode_header_amd hdr;
76		- unsigned int mpb[0];
	74	+ struct microcode_header_amd hdr;
	75	+ unsigned int mpb[0];
77	76	};
78	77
79	78	#define UCODE_MAX_SIZE 2048
...	...	@@ -184,8 +183,8 @@
184	183	return 0;
185	184	}
186	185
187		-static void get_next_ucode(const u8 buf, unsigned int size,
188		- unsigned int *mc_size)
	186	+static void *
	187	+get_next_ucode(const u8 buf, unsigned int size, unsigned int mc_size)
189	188	{
190	189	unsigned int total_size;
191	190	u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
...	...	@@ -222,7 +221,6 @@
222	221	}
223	222	return mc;
224	223	}
225		-
226	224
227	225	static int install_equiv_cpu_table(const u8 *buf)
228	226	{
...	...	@@ -70,47 +70,47 @@
70	70	* Fix sigmatch() macro to handle old CPUs with pf == 0.
71	71	* Thanks to Stuart Swales for pointing out this bug.
72	72	*/
	73	+#include <linux/platform_device.h>
73	74	#include <linux/capability.h>
74		-#include <linux/kernel.h>
75		-#include <linux/init.h>
76		-#include <linux/sched.h>
	75	+#include <linux/miscdevice.h>
	76	+#include <linux/firmware.h>
77	77	#include <linux/smp_lock.h>
	78	+#include <linux/spinlock.h>
78	79	#include <linux/cpumask.h>
79		-#include <linux/module.h>
80		-#include <linux/slab.h>
	80	+#include <linux/uaccess.h>
81	81	#include <linux/vmalloc.h>
82		-#include <linux/miscdevice.h>
83		-#include <linux/spinlock.h>
84		-#include <linux/mm.h>
85		-#include <linux/fs.h>
	82	+#include <linux/kernel.h>
	83	+#include <linux/module.h>
86	84	#include <linux/mutex.h>
	85	+#include <linux/sched.h>
	86	+#include <linux/init.h>
	87	+#include <linux/slab.h>
87	88	#include <linux/cpu.h>
88		-#include <linux/firmware.h>
89		-#include <linux/platform_device.h>
	89	+#include <linux/fs.h>
	90	+#include <linux/mm.h>
90	91
91		-#include <asm/msr.h>
92		-#include <asm/uaccess.h>
93		-#include <asm/processor.h>
94	92	#include <asm/microcode.h>
	93	+#include <asm/processor.h>
	94	+#include <asm/msr.h>
95	95
96	96	MODULE_DESCRIPTION("Microcode Update Driver");
97	97	MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
98	98	MODULE_LICENSE("GPL");
99	99
100		-#define MICROCODE_VERSION "2.00"
	100	+#define MICROCODE_VERSION "2.00"
101	101
102		-static struct microcode_ops *microcode_ops;
	102	+static struct microcode_ops *microcode_ops;
103	103
104	104	/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
105	105	static DEFINE_MUTEX(microcode_mutex);
106	106
107		-struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
	107	+struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
108	108	EXPORT_SYMBOL_GPL(ucode_cpu_info);
109	109
110	110	#ifdef CONFIG_MICROCODE_OLD_INTERFACE
111	111	struct update_for_cpu {
112		- const void __user *buf;
113		- size_t size;
	112	+ const void __user *buf;
	113	+ size_t size;
114	114	};
115	115
116	116	static long update_for_cpu(void *_ufc)
117	117
...	...	@@ -209,12 +209,12 @@
209	209
210	210	MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
211	211	#else
212		-#define microcode_dev_init() 0
213		-#define microcode_dev_exit() do { } while (0)
	212	+#define microcode_dev_init() 0
	213	+#define microcode_dev_exit() do { } while (0)
214	214	#endif
215	215
216	216	/* fake device for request_firmware */
217		-static struct platform_device *microcode_pdev;
	217	+static struct platform_device *microcode_pdev;
218	218
219	219	static long reload_for_cpu(void *unused)
220	220	{
...	...	@@ -282,8 +282,8 @@
282	282	};
283	283
284	284	static struct attribute_group mc_attr_group = {
285		- .attrs = mc_default_attrs,
286		- .name = "microcode",
	285	+ .attrs = mc_default_attrs,
	286	+ .name = "microcode",
287	287	};
288	288
289	289	static void __microcode_fini_cpu(int cpu)
...	...	@@ -353,7 +353,7 @@
353	353	*/
354	354	if (uci->valid) {
355	355	err = microcode_resume_cpu(smp_processor_id());
356		- } else {
	356	+ } else {
357	357	collect_cpu_info(smp_processor_id());
358	358	if (uci->valid && system_state == SYSTEM_RUNNING)
359	359	err = microcode_ops->request_microcode_fw(
...	...	@@ -423,9 +423,9 @@
423	423	}
424	424
425	425	static struct sysdev_driver mc_sysdev_driver = {
426		- .add = mc_sysdev_add,
427		- .remove = mc_sysdev_remove,
428		- .resume = mc_sysdev_resume,
	426	+ .add = mc_sysdev_add,
	427	+ .remove = mc_sysdev_remove,
	428	+ .resume = mc_sysdev_resume,
429	429	};
430	430
431	431	static __cpuinit int
...	...	@@ -464,7 +464,7 @@
464	464	}
465	465
466	466	static struct notifier_block __refdata mc_cpu_notifier = {
467		- .notifier_call = mc_cpu_callback,
	467	+ .notifier_call = mc_cpu_callback,
468	468	};
469	469
470	470	static int __init microcode_init(void)
...	...	@@ -70,28 +70,28 @@
70	70	* Fix sigmatch() macro to handle old CPUs with pf == 0.
71	71	* Thanks to Stuart Swales for pointing out this bug.
72	72	*/
	73	+#include <linux/platform_device.h>
73	74	#include <linux/capability.h>
74		-#include <linux/kernel.h>
75		-#include <linux/init.h>
76		-#include <linux/sched.h>
	75	+#include <linux/miscdevice.h>
	76	+#include <linux/firmware.h>
77	77	#include <linux/smp_lock.h>
	78	+#include <linux/spinlock.h>
78	79	#include <linux/cpumask.h>
79		-#include <linux/module.h>
80		-#include <linux/slab.h>
	80	+#include <linux/uaccess.h>
81	81	#include <linux/vmalloc.h>
82		-#include <linux/miscdevice.h>
83		-#include <linux/spinlock.h>
84		-#include <linux/mm.h>
85		-#include <linux/fs.h>
	82	+#include <linux/kernel.h>
	83	+#include <linux/module.h>
86	84	#include <linux/mutex.h>
	85	+#include <linux/sched.h>
	86	+#include <linux/init.h>
	87	+#include <linux/slab.h>
87	88	#include <linux/cpu.h>
88		-#include <linux/firmware.h>
89		-#include <linux/platform_device.h>
90		-#include <linux/uaccess.h>
	89	+#include <linux/fs.h>
	90	+#include <linux/mm.h>
91	91
92		-#include <asm/msr.h>
93		-#include <asm/processor.h>
94	92	#include <asm/microcode.h>
	93	+#include <asm/processor.h>
	94	+#include <asm/msr.h>
95	95
96	96	MODULE_DESCRIPTION("Microcode Update Driver");
97	97	MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
98	98
...	...	@@ -129,12 +129,13 @@
129	129	struct extended_signature sigs[0];
130	130	};
131	131
132		-#define DEFAULT_UCODE_DATASIZE (2000)
	132	+#define DEFAULT_UCODE_DATASIZE (2000)
133	133	#define MC_HEADER_SIZE (sizeof(struct microcode_header_intel))
134	134	#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
135	135	#define EXT_HEADER_SIZE (sizeof(struct extended_sigtable))
136	136	#define EXT_SIGNATURE_SIZE (sizeof(struct extended_signature))
137	137	#define DWSIZE (sizeof(u32))
	138	+
138	139	#define get_totalsize(mc) \
139	140	(((struct microcode_intel *)mc)->hdr.totalsize ? \
140	141	((struct microcode_intel *)mc)->hdr.totalsize : \
141	142
142	143
143	144
144	145
145	146
146	147
...	...	@@ -197,30 +198,31 @@
197	198	}
198	199
199	200	static inline int
200		-update_match_revision(struct microcode_header_intel *mc_header, int rev)
	201	+update_match_revision(struct microcode_header_intel *mc_header, int rev)
201	202	{
202	203	return (mc_header->rev <= rev) ? 0 : 1;
203	204	}
204	205
205	206	static int microcode_sanity_check(void *mc)
206	207	{
	208	+ unsigned long total_size, data_size, ext_table_size;
207	209	struct microcode_header_intel *mc_header = mc;
208	210	struct extended_sigtable *ext_header = NULL;
209		- struct extended_signature *ext_sig;
210		- unsigned long total_size, data_size, ext_table_size;
211	211	int sum, orig_sum, ext_sigcount = 0, i;
	212	+ struct extended_signature *ext_sig;
212	213
213	214	total_size = get_totalsize(mc_header);
214	215	data_size = get_datasize(mc_header);
	216	+
215	217	if (data_size + MC_HEADER_SIZE > total_size) {
216	218	printk(KERN_ERR "microcode: error! "
217		- "Bad data size in microcode data file\n");
	219	+ "Bad data size in microcode data file\n");
218	220	return -EINVAL;
219	221	}
220	222
221	223	if (mc_header->ldrver != 1 \|\| mc_header->hdrver != 1) {
222	224	printk(KERN_ERR "microcode: error! "
223		- "Unknown microcode update format\n");
	225	+ "Unknown microcode update format\n");
224	226	return -EINVAL;
225	227	}
226	228	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
227	229
228	230
...	...	@@ -318,12 +320,16 @@
318	320
319	321	static void apply_microcode(int cpu)
320	322	{
	323	+ struct microcode_intel *mc_intel;
	324	+ struct ucode_cpu_info *uci;
321	325	unsigned long flags;
322	326	unsigned int val[2];
323		- int cpu_num = raw_smp_processor_id();
324		- struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
325		- struct microcode_intel *mc_intel = uci->mc;
	327	+ int cpu_num;
326	328
	329	+ cpu_num = raw_smp_processor_id();
	330	+ uci = ucode_cpu_info + cpu;
	331	+ mc_intel = uci->mc;
	332	+
327	333	/* We should bind the task to the CPU */
328	334	BUG_ON(cpu_num != cpu);
329	335
330	336
331	337
...	...	@@ -348,15 +354,17 @@
348	354	spin_unlock_irqrestore(&microcode_update_lock, flags);
349	355	if (val[1] != mc_intel->hdr.rev) {
350	356	printk(KERN_ERR "microcode: CPU%d update from revision "
351		- "0x%x to 0x%x failed\n", cpu_num, uci->cpu_sig.rev, val[1]);
	357	+ "0x%x to 0x%x failed\n",
	358	+ cpu_num, uci->cpu_sig.rev, val[1]);
352	359	return;
353	360	}
354	361	printk(KERN_INFO "microcode: CPU%d updated from revision "
355		- "0x%x to 0x%x, date = %04x-%02x-%02x \n",
	362	+ "0x%x to 0x%x, date = %04x-%02x-%02x \n",
356	363	cpu_num, uci->cpu_sig.rev, val[1],
357	364	mc_intel->hdr.date & 0xffff,
358	365	mc_intel->hdr.date >> 24,
359	366	(mc_intel->hdr.date >> 16) & 0xff);
	367	+
360	368	uci->cpu_sig.rev = val[1];
361	369	}
362	370
363	371
...	...	@@ -404,18 +412,23 @@
404	412	leftover -= mc_size;
405	413	}
406	414
407		- if (new_mc) {
408		- if (!leftover) {
409		- if (uci->mc)
410		- vfree(uci->mc);
411		- uci->mc = (struct microcode_intel *)new_mc;
412		- pr_debug("microcode: CPU%d found a matching microcode update with"
413		- " version 0x%x (current=0x%x)\n",
414		- cpu, new_rev, uci->cpu_sig.rev);
415		- } else
416		- vfree(new_mc);
	415	+ if (!new_mc)
	416	+ goto out;
	417	+
	418	+ if (leftover) {
	419	+ vfree(new_mc);
	420	+ goto out;
417	421	}
418	422
	423	+ if (uci->mc)
	424	+ vfree(uci->mc);
	425	+ uci->mc = (struct microcode_intel *)new_mc;
	426	+
	427	+ pr_debug("microcode: CPU%d found a matching microcode update with"
	428	+ " version 0x%x (current=0x%x)\n",
	429	+ cpu, new_rev, uci->cpu_sig.rev);
	430	+
	431	+ out:
419	432	return (int)leftover;
420	433	}
421	434