[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-7f709d0c322203e37581f6b7c91f88b4fdeca5a0@git.kernel.org>
Date:   Tue, 25 Oct 2016 09:31:14 -0700
From:   tip-bot for Borislav Petkov <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     hpa@...or.com, bp@...en8.de, peterz@...radead.org,
        brgerst@...il.com, torvalds@...ux-foundation.org,
        linux-kernel@...r.kernel.org, jpoimboe@...hat.com,
        mingo@...nel.org, luto@...nel.org, tglx@...utronix.de,
        dvlasenk@...hat.com, bp@...e.de
Subject: [tip:x86/microcode] x86/microcode: Collect CPU info on resume
Commit-ID:  7f709d0c322203e37581f6b7c91f88b4fdeca5a0
Gitweb:     http://git.kernel.org/tip/7f709d0c322203e37581f6b7c91f88b4fdeca5a0
Author:     Borislav Petkov <bp@...e.de>
AuthorDate: Tue, 25 Oct 2016 11:55:18 +0200
Committer:  Ingo Molnar <mingo@...nel.org>
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 <bp@...e.de>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-9-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 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);
 
Powered by blists - more mailing lists
 
