Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5489d5a authored by Ashok Raj's avatar Ashok Raj Committed by Greg Kroah-Hartman
Browse files

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



commit be1b670f61443aa5d0d01782e9b8ea0ee825d018 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: 06b8534c ("x86/microcode: Rework microcode loading")
Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarThomas 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf79d541

arch/x86/kernel/cpu/microcode/intel.c

+1 −7
Original line number Diff line number Diff line
@@ -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 @@ void load_ucode_intel_ap(void) 


	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)