Skip to content

Commit 5b0bc9a

Browse files
Dominik BrodowskiIngo Molnar
authored andcommitted
x86/microcode/intel: Clear patch pointer before jettisoning the initrd
During early boot, load_ucode_intel_ap() uses __load_ucode_intel() to obtain a pointer to the relevant microcode patch (embedded in the initrd), and stores this value in 'intel_ucode_patch' to speed up the microcode patch application for subsequent CPUs. On resuming from suspend-to-RAM, however, load_ucode_ap() calls load_ucode_intel_ap() for each non-boot-CPU. By then the initramfs is long gone so the pointer stored in 'intel_ucode_patch' no longer points to a valid microcode patch. Clear that pointer so that we effectively fall back to the CPU hotplug notifier callbacks to update the microcode. Signed-off-by: Dominik Brodowski <[email protected]> [ Edit and massage commit message. ] Signed-off-by: Borislav Petkov <[email protected]> Cc: <[email protected]> # 4.10.. Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent ae1d557 commit 5b0bc9a

File tree

1 file changed

+3
-0
lines changed
  • arch/x86/kernel/cpu/microcode

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void)
619619

620620
show_saved_mc();
621621

622+
/* initrd is going away, clear patch ptr. */
623+
intel_ucode_patch = NULL;
624+
622625
return 0;
623626
}
624627

0 commit comments

Comments
 (0)