From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbdFHJYS (ORCPT ); Thu, 8 Jun 2017 05:24:18 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42953 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbdFHJYP (ORCPT ); Thu, 8 Jun 2017 05:24:15 -0400 Date: Thu, 8 Jun 2017 02:20:33 -0700 From: tip-bot for Dominik Brodowski Message-ID: Cc: bp@suse.de, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, linux@dominikbrodowski.net Reply-To: bp@suse.de, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, linux@dominikbrodowski.net, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <20170607095819.9754-1-bp@alien8.de> References: <20170607095819.9754-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/microcode/intel: Clear patch pointer before jettisoning the initrd Git-Commit-ID: 5b0bc9ac2ce4881ee318a21f31140584ce4dbdad X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5b0bc9ac2ce4881ee318a21f31140584ce4dbdad Gitweb: http://git.kernel.org/tip/5b0bc9ac2ce4881ee318a21f31140584ce4dbdad Author: Dominik Brodowski AuthorDate: Wed, 7 Jun 2017 11:58:19 +0200 Committer: Ingo Molnar 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 [ Edit and massage commit message. ] Signed-off-by: Borislav Petkov Cc: # 4.10.. Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170607095819.9754-1-bp@alien8.de Signed-off-by: Ingo Molnar --- 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; }