Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ebf5de authored by Fenghua Yu's avatar Fenghua Yu Committed by H. Peter Anvin
Browse files

x86/common.c: load ucode in 64 bit or show loading ucode info in 32 bit on AP 



In 64 bit, load ucode on AP in cpu_init().

In 32 bit, show ucode loading info on AP in cpu_init(). Microcode has been
loaded earlier before paging. Now it is safe to show the loading microcode
info on this AP.

Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1356075872-3054-5-git-send-email-fenghua.yu@intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent d288e1cf

arch/x86/kernel/cpu/common.c

+8 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,12 @@ void __cpuinit cpu_init(void) 
	int cpu;

	int i;



	/*

	 * Load microcode on this cpu if a valid microcode is available.

	 * This is early microcode loading procedure.

	 */

	load_ucode_ap();



	cpu = stack_smp_processor_id();

	t = &per_cpu(init_tss, cpu);

	oist = &per_cpu(orig_ist, cpu);
@@ -1311,6 +1317,8 @@ void __cpuinit cpu_init(void) 
	struct tss_struct *t = &per_cpu(init_tss, cpu);

	struct thread_struct *thread = &curr->thread;



	show_ucode_info_early();



	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {

		printk(KERN_WARNING "CPU#%d already initialized!\n", cpu);

		for (;;)