diff options
| author | Fenghua Yu | 2012-12-21 08:44:24 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2013-01-31 22:19:06 +0100 |
| commit | e6ebf5deaaaa33b661f0db86380c232b162bd68c (patch) | |
| tree | a90eb68a9a610a47ed6cbdf8a554252c02172b16 /arch/x86/kernel | |
| parent | x86/common.c: Make have_cpuid_p() a global function (diff) | |
| download | kernel-qcow2-linux-e6ebf5deaaaa33b661f0db86380c232b162bd68c.tar.gz kernel-qcow2-linux-e6ebf5deaaaa33b661f0db86380c232b162bd68c.tar.xz kernel-qcow2-linux-e6ebf5deaaaa33b661f0db86380c232b162bd68c.zip | |
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: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1356075872-3054-5-git-send-email-fenghua.yu@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d7fd2468752a..d814772c5bed 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -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 (;;) |