| From e1e7132b8dfad21362eb68a4077183530d6ab75f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 9 Jan 2023 07:35:52 -0800 |
| Subject: x86/microcode: Adjust late loading result reporting message |
| |
| From: Ashok Raj <ashok.raj@intel.com> |
| |
| [ Upstream commit 6eab3abac7043226e5375e9ead0c7607ced6767b ] |
| |
| 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/ |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kernel/cpu/microcode/core.c | 11 +++++++---- |
| 1 file changed, 7 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c |
| index 122da99bac4e4..36583bc4b88c3 100644 |
| --- a/arch/x86/kernel/cpu/microcode/core.c |
| +++ b/arch/x86/kernel/cpu/microcode/core.c |
| @@ -521,11 +521,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; |
| } |
| -- |
| 2.39.2 |
| |
