Commit-ID: 5b0bc9ac2ce4881ee318a21f31140584ce4dbdad Gitweb: http://git.kernel.org/tip/5b0bc9ac2ce4881ee318a21f31140584ce4dbdad Author: Dominik Brodowski <li...@dominikbrodowski.net> AuthorDate: Wed, 7 Jun 2017 11:58:19 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 8 Jun 2017 10:03:05 +0200
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 <li...@dominikbrodowski.net> [ Edit and massage commit message. ] Signed-off-by: Borislav Petkov <b...@suse.de> Cc: <sta...@vger.kernel.org> # 4.10.. Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Link: http://lkml.kernel.org/r/20170607095819.9754-1...@alien8.de Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/cpu/microcode/intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index afdfd23..f522415 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -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; }
