Skip to content

Commit

Permalink
x86/microcode/intel: Clear patch pointer before jettisoning the initrd
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Dominik Brodowski authored and Ingo Molnar committed Jun 8, 2017
1 parent ae1d557 commit 5b0bc9a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/kernel/cpu/microcode/intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void)

show_saved_mc();

/* initrd is going away, clear patch ptr. */
intel_ucode_patch = NULL;

return 0;
}

Expand Down

0 comments on commit 5b0bc9a

Please sign in to comment.