x86/microcode/intel: Do not retry microcode reloading on the APs

commit c21d25aaac7dde48ea3e825744aa1c9c10b102df upstream.

The retries in load_ucode_intel_ap() were in place to support systems
with mixed steppings. Mixed steppings are no longer supported and there is
only one microcode image at a time. Any retries will simply reattempt to
apply the same image over and over without making progress.

  [ bp: Zap the circumstantial reasoning from the commit message. ]

Fixes: a53bf3c3f76b ("x86/microcode: Rework microcode loading")
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221129210832.107850-3-ashok.raj@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index b224d4dae2ffb622833f383d1ba2b4f663161d2e..896f456b3f5c8288c4b23ef2c30d0b68f6123203 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -659,7 +659,6 @@ void load_ucode_intel_ap(void)
        else
                iup = &intel_ucode_patch;
 
-reget:
        if (!*iup) {
                patch = __load_ucode_intel(&uci);
                if (!patch)
@@ -670,12 +669,7 @@ reget:
 
        uci.mc = *iup;
 
-       if (apply_microcode_early(&uci, true)) {
-               /* Mixed-silicon system? Try to refetch the proper patch: */
-               *iup = NULL;
-
-               goto reget;
-       }
+       apply_microcode_early(&uci, true);
 }
 
 static struct microcode_intel *find_patch(struct ucode_cpu_info *uci)