summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorAshok Raj <ashok.raj@intel.com>2023-01-09 07:35:52 -0800
committerBorislav Petkov (AMD) <bp@alien8.de>2023-01-21 14:55:20 +0100
commit6eab3abac7043226e5375e9ead0c7607ced6767b (patch)
tree18254ce074ed2ce3a1c1beeb24d843a32d4a5aa4 /arch/x86/kernel/cpu
parentc0dd9245aa9e25a697181f6085692272c9ec61bc (diff)
downloadlinux-stable-6eab3abac7043226e5375e9ead0c7607ced6767b.tar.gz
linux-stable-6eab3abac7043226e5375e9ead0c7607ced6767b.tar.bz2
linux-stable-6eab3abac7043226e5375e9ead0c7607ced6767b.zip
x86/microcode: Adjust late loading result reporting message
During late microcode loading, the "Reload completed" message is issued unconditionally, regardless of success or failure. Adjust the message to report the result of the update. [ bp: Massage. ] Fixes: 9bd681251b7c ("x86/microcode: Announce reload operation's completion") Suggested-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/lkml/874judpqqd.ffs@tglx/
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/microcode/core.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 8ec38c107dc3..61d57d9b93ee 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -453,11 +453,14 @@ static int microcode_reload_late(void)
store_cpu_caps(&prev_info);
ret = stop_machine_cpuslocked(__reload_late, NULL, cpu_online_mask);
- if (ret == 0)
+ if (!ret) {
+ pr_info("Reload succeeded, microcode revision: 0x%x -> 0x%x\n",
+ old, boot_cpu_data.microcode);
microcode_check(&prev_info);
-
- pr_info("Reload completed, microcode revision: 0x%x -> 0x%x\n",
- old, boot_cpu_data.microcode);
+ } else {
+ pr_info("Reload failed, current microcode revision: 0x%x\n",
+ boot_cpu_data.microcode);
+ }
return ret;
}