mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Borislav Petkov (AMD)" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/microcode] x86/microcode/core: Return an error only when necessary
Date: Mon, 06 Feb 2023 13:00:04 -0000	[thread overview]
Message-ID: <167568840420.4906.17934418820483240527.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230130161709.11615-5-bp@alien8.de>

The following commit has been merged into the x86/microcode branch of tip:

Commit-ID:     f33e0c893b22bf94d7985f1f2aa3872237560c74
Gitweb:        https://git.kernel.org/tip/f33e0c893b22bf94d7985f1f2aa3872237560c74
Author:        Borislav Petkov (AMD) <bp@alien8.de>
AuthorDate:    Mon, 30 Jan 2023 13:48:04 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 06 Feb 2023 13:41:31 +01:00

x86/microcode/core: Return an error only when necessary

Return an error from the late loading function which is run on each CPU
only when an error has actually been encountered during the update.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230130161709.11615-5-bp@alien8.de
---
 arch/x86/kernel/cpu/microcode/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index ddc0958..7a329e5 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -409,10 +409,10 @@ static int __reload_late(void *info)
 		goto wait_for_siblings;
 
 	if (err >= UCODE_NFOUND) {
-		if (err == UCODE_ERROR)
+		if (err == UCODE_ERROR) {
 			pr_warn("Error reloading microcode on CPU %d\n", cpu);
-
-		ret = -1;
+			ret = -1;
+		}
 	}
 
 wait_for_siblings:

      reply	other threads:[~2023-02-06 13:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-30 16:17 [PATCH 0/4] x86/microcode: Some fixes Borislav Petkov
2023-01-30 16:17 ` [PATCH 1/4] x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter Borislav Petkov
2023-02-06 13:00   ` [tip: x86/microcode] " tip-bot2 for Borislav Petkov (AMD)
2023-01-30 16:17 ` [PATCH 2/4] x86/microcode/AMD: Add a @cpu parameter to the reloading functions Borislav Petkov
2023-02-06 13:00   ` [tip: x86/microcode] " tip-bot2 for Borislav Petkov (AMD)
2023-01-30 16:17 ` [PATCH 3/4] x86/microcode/AMD: Fix mixed steppings support Borislav Petkov
2023-02-06 13:00   ` [tip: x86/microcode] " tip-bot2 for Borislav Petkov (AMD)
2023-01-30 16:17 ` [PATCH 4/4] x86/microcode/core: Return an error only when necessary Borislav Petkov
2023-02-06 13:00   ` tip-bot2 for Borislav Petkov (AMD) [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=167568840420.4906.17934418820483240527.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --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®