Messages in this thread Patch in this message | | | Date | Tue, 25 Oct 2016 09:31:14 -0700 | From | tip-bot for Borislav Petkov <> | 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@suse.de> AuthorDate: Tue, 25 Oct 2016 11:55:18 +0200 Committer: Ingo Molnar <mingo@kernel.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@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20161025095522.11964-9-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.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);
| |