From: "tip-bot2 for Annie Li" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Annie Li <jiayanli@google.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/microcode] x86/microcode/AMD: Do not return error when microcode update is not necessary
Date: Wed, 30 Apr 2025 15:21:47 -0000 [thread overview]
Message-ID: <174602650759.22196.2016156297642927611.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250430053424.77438-1-jiayanli@google.com>
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: b43dc4ab097859c24e2a6993119c927cffc856aa
Gitweb: https://git.kernel.org/tip/b43dc4ab097859c24e2a6993119c927cffc856aa
Author: Annie Li <jiayanli@google.com>
AuthorDate: Wed, 30 Apr 2025 05:34:24
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Wed, 30 Apr 2025 17:10:46 +02:00
x86/microcode/AMD: Do not return error when microcode update is not necessary
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
---
arch/x86/kernel/cpu/microcode/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index b3658d1..2309321 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -686,6 +686,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;
}
prev parent reply other threads:[~2025-04-30 15:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <2.49.0.901.g37484f566f-goog>
2025-04-30 5:34 ` [PATCH v2] x86/microcode/amd: fix the return value when microcode has no update Annie Li
2025-04-30 15:21 ` tip-bot2 for Annie Li [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=174602650759.22196.2016156297642927611.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=jiayanli@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®