Skip to content

Commit be1b670

Browse files
ashok-rajbp3tk0v
authored andcommitted
x86/microcode/intel: Do not retry microcode reloading on the APs
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: 06b8534 ("x86/microcode: Rework microcode loading") Signed-off-by: Ashok Raj <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 5b1586a commit be1b670

File tree

1 file changed

+1
-7
lines changed
  • arch/x86/kernel/cpu/microcode

1 file changed

+1
-7
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ void load_ucode_intel_ap(void)
495495
else
496496
iup = &intel_ucode_patch;
497497

498-
reget:
499498
if (!*iup) {
500499
patch = __load_ucode_intel(&uci);
501500
if (!patch)
@@ -506,12 +505,7 @@ void load_ucode_intel_ap(void)
506505

507506
uci.mc = *iup;
508507

509-
if (apply_microcode_early(&uci, true)) {
510-
/* Mixed-silicon system? Try to refetch the proper patch: */
511-
*iup = NULL;
512-
513-
goto reget;
514-
}
508+
apply_microcode_early(&uci, true);
515509
}
516510

517511
static struct microcode_intel *find_patch(struct ucode_cpu_info *uci)

0 commit comments

Comments
 (0)