From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941801AbcJYQc1 (ORCPT ); Tue, 25 Oct 2016 12:32:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39974 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941666AbcJYQcS (ORCPT ); Tue, 25 Oct 2016 12:32:18 -0400 Date: Tue, 25 Oct 2016 09:31:14 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, bp@alien8.de, peterz@infradead.org, brgerst@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, mingo@kernel.org, luto@kernel.org, tglx@linutronix.de, dvlasenk@redhat.com, bp@suse.de Reply-To: tglx@linutronix.de, dvlasenk@redhat.com, bp@suse.de, brgerst@gmail.com, peterz@infradead.org, bp@alien8.de, hpa@zytor.com, mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20161025095522.11964-9-bp@alien8.de> References: <20161025095522.11964-9-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Collect CPU info on resume Git-Commit-ID: 7f709d0c322203e37581f6b7c91f88b4fdeca5a0 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: 7f709d0c322203e37581f6b7c91f88b4fdeca5a0 Gitweb: http://git.kernel.org/tip/7f709d0c322203e37581f6b7c91f88b4fdeca5a0 Author: Borislav Petkov AuthorDate: Tue, 25 Oct 2016 11:55:18 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 12:28:58 +0200 x86/microcode: Collect CPU info on resume We need to reread the CPU's microcode revision after resume because applied microcode gets "forgotten" depending on the sleep state. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161025095522.11964-9-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index a18ff75..f737039 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -498,6 +498,9 @@ static enum ucode_state microcode_update_cpu(int cpu) { struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + /* Refresh CPU microcode revision after resume. */ + collect_cpu_info(cpu); + if (uci->valid) return microcode_resume_cpu(cpu);