From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751520AbdFGJ6p (ORCPT ); Wed, 7 Jun 2017 05:58:45 -0400 Received: from mail.skyhub.de ([5.9.137.197]:38166 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbdFGJ63 (ORCPT ); Wed, 7 Jun 2017 05:58:29 -0400 From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH] x86/microcode/intel: Clear patch pointer before jettisoning the initrd Date: Wed, 7 Jun 2017 11:58:19 +0200 Message-Id: <20170607095819.9754-1-bp@alien8.de> X-Mailer: git-send-email 2.13.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dominik Brodowski 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 fallback to the CPU hotplug notifier callbacks to update the microcode. Signed-off-by: Dominik Brodowski Cc: # 4.10.. [ Edit and massage commit message. ] Signed-off-by: Borislav Petkov --- 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 afdfd237b59f..f522415bf9e5 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; } -- 2.13.0