Skip to content

Commit ab713e7

Browse files
committed
Merge tag 'x86_microcode_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loader update from Borislav Petkov: - Remove the unconditional cache writeback and invalidation after loading the microcode patch on Intel as this was addressing a microcode bug for which there is a concrete microcode revision check instead * tag 'x86_microcode_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/microcode/intel: Remove unnecessary cache writeback and invalidation
2 parents 5a4b3fb + 9a81975 commit ab713e7

File tree

1 file changed

+2
-8
lines changed
  • arch/x86/kernel/cpu/microcode

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,6 @@ static enum ucode_state __apply_microcode(struct ucode_cpu_info *uci,
319319
return UCODE_OK;
320320
}
321321

322-
/*
323-
* Writeback and invalidate caches before updating microcode to avoid
324-
* internal issues depending on what the microcode is updating.
325-
*/
326-
native_wbinvd();
327-
328322
/* write microcode via MSR 0x79 */
329323
native_wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc->bits);
330324

@@ -574,14 +568,14 @@ static bool is_blacklisted(unsigned int cpu)
574568
/*
575569
* Late loading on model 79 with microcode revision less than 0x0b000021
576570
* and LLC size per core bigger than 2.5MB may result in a system hang.
577-
* This behavior is documented in item BDF90, #334165 (Intel Xeon
571+
* This behavior is documented in item BDX90, #334165 (Intel Xeon
578572
* Processor E7-8800/4800 v4 Product Family).
579573
*/
580574
if (c->x86_vfm == INTEL_BROADWELL_X &&
581575
c->x86_stepping == 0x01 &&
582576
llc_size_per_core > 2621440 &&
583577
c->microcode < 0x0b000021) {
584-
pr_err_once("Erratum BDF90: late loading with revision < 0x0b000021 (0x%x) disabled.\n", c->microcode);
578+
pr_err_once("Erratum BDX90: late loading with revision < 0x0b000021 (0x%x) disabled.\n", c->microcode);
585579
pr_err_once("Please consider either early loading through initrd/built-in or a potential BIOS update.\n");
586580
return true;
587581
}

0 commit comments

Comments
 (0)