aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/microcode
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-02-03 06:33:44 -0500
committerIngo Molnar <mingo@kernel.org>2016-02-09 05:41:18 -0500
commitf7eb59dda129e46be5e195a46bfd0dde76db9bbd (patch)
treeccd80c77b22308d9ac202bb6a1aa0c7978784e74 /arch/x86/kernel/cpu/microcode
parentf96fde531946524b26d25d4eed9625695837f524 (diff)
x86/microcode/AMD: Issue microcode updated message later
Before this, we issued this message from save_microcode_in_initrd() which is called from free_initrd_mem(), i.e., only when we have an initrd enabled. However, we can update from builtin microcode too but then we don't issue the update message. Fix it by issuing that message on the generic driver init path. Tested-by: Thomas Voegtle <tv@lio96.de> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1454499225-21544-17-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
-rw-r--r--arch/x86/kernel/cpu/microcode/amd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 9f5ccef33fba..f66cbfe74ce4 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -431,10 +431,6 @@ int __init save_microcode_in_initrd_amd(void)
431 else 431 else
432 container = cont_va; 432 container = cont_va;
433 433
434 if (ucode_new_rev)
435 pr_info_once("microcode updated early to new patch_level=0x%08x\n",
436 ucode_new_rev);
437
438 eax = cpuid_eax(0x00000001); 434 eax = cpuid_eax(0x00000001);
439 eax = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff); 435 eax = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
440 436
@@ -956,6 +952,10 @@ struct microcode_ops * __init init_amd_microcode(void)
956 return NULL; 952 return NULL;
957 } 953 }
958 954
955 if (ucode_new_rev)
956 pr_info_once("microcode updated early to new patch_level=0x%08x\n",
957 ucode_new_rev);
958
959 return &microcode_amd_ops; 959 return &microcode_amd_ops;
960} 960}
961 961