summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnie Li <jiayanli@google.com>2025-04-30 05:34:24 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-19 15:31:27 +0200
commit57a52d74498c2b67d6378bbe5fca7039d20137d3 (patch)
tree8fed68ca9e2c9c5818d23dfb74c8c80a2b73c1aa
parent451a18d71bd979768de223d10b1921da4732f1c9 (diff)
x86/microcode/AMD: Do not return error when microcode update is not necessary
[ Upstream commit b43dc4ab097859c24e2a6993119c927cffc856aa ] After 6f059e634dcd("x86/microcode: Clarify the late load logic"), if the load is up-to-date, the AMD side returns UCODE_OK which leads to load_late_locked() returning -EBADFD. Handle UCODE_OK in the switch case to avoid this error. [ bp: Massage commit message. ] Fixes: 6f059e634dcd ("x86/microcode: Clarify the late load logic") Signed-off-by: Annie Li <jiayanli@google.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/20250430053424.77438-1-jiayanli@google.com Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/x86/kernel/cpu/microcode/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 079f046ee26d..e8021d3e5882 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -696,6 +696,8 @@ static int load_late_locked(void)
return load_late_stop_cpus(true);
case UCODE_NFOUND:
return -ENOENT;
+ case UCODE_OK:
+ return 0;
default:
return -EBADFD;
}