forked from rpms/kernel
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 527c5ac4a29d4b854b10586ea877c65174cbd40d Mon Sep 17 00:00:00 2001
|
|
From: Ashok Raj <ashok.raj@intel.com>
|
|
Date: Mon, 9 Jan 2023 07:35:52 -0800
|
|
Subject: [PATCH 15/36] 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/
|
|
(cherry picked from commit 6eab3abac7043226e5375e9ead0c7607ced6767b)
|
|
|
|
CVE: CVE-2023-20593
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.com>
|
|
---
|
|
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 9df2c40a4ddf..fb383088bede 100644
|
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
|
@@ -472,11 +472,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.3
|
|
|