|
Packit |
863535 |
From 1008c52c09dcb23d93f8e0ea83a6246265d2cce0 Mon Sep 17 00:00:00 2001
|
|
Packit |
863535 |
From: Borislav Petkov <bp@suse.de>
|
|
Packit |
863535 |
Date: Fri, 16 Feb 2018 12:26:39 +0100
|
|
Packit |
863535 |
Subject: x86/CPU: Add a microcode loader callback
|
|
Packit |
863535 |
|
|
Packit |
863535 |
Add a callback function which the microcode loader calls when microcode
|
|
Packit |
863535 |
has been updated to a newer revision. Do the callback only when no error
|
|
Packit |
863535 |
was encountered during loading.
|
|
Packit |
863535 |
|
|
Packit |
863535 |
Tested-by: Ashok Raj <ashok.raj@intel.com>
|
|
Packit |
863535 |
Signed-off-by: Borislav Petkov <bp@suse.de>
|
|
Packit |
863535 |
Reviewed-by: Ashok Raj <ashok.raj@intel.com>
|
|
Packit |
863535 |
Cc: Andy Lutomirski <luto@kernel.org>
|
|
Packit |
863535 |
Cc: Arjan van de Ven <arjan@linux.intel.com>
|
|
Packit |
863535 |
Cc: Borislav Petkov <bp@alien8.de>
|
|
Packit |
863535 |
Cc: Dan Williams <dan.j.williams@intel.com>
|
|
Packit |
863535 |
Cc: Dave Hansen <dave.hansen@linux.intel.com>
|
|
Packit |
863535 |
Cc: David Woodhouse <dwmw2@infradead.org>
|
|
Packit |
863535 |
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Packit |
863535 |
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
Packit |
863535 |
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Packit |
863535 |
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Packit |
863535 |
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
Packit |
863535 |
Link: http://lkml.kernel.org/r/20180216112640.11554-3-bp@alien8.de
|
|
Packit |
863535 |
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
Packit |
863535 |
---
|
|
Packit |
863535 |
arch/x86/include/asm/processor.h | 1 +
|
|
Packit |
863535 |
arch/x86/kernel/cpu/common.c | 10 ++++++++++
|
|
Packit |
863535 |
arch/x86/kernel/cpu/microcode/core.c | 8 ++++++--
|
|
Packit |
863535 |
3 files changed, 17 insertions(+), 2 deletions(-)
|
|
Packit |
863535 |
|
|
Packit |
863535 |
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
|
|
Packit |
863535 |
index 1bd9ed8..b0ccd48 100644
|
|
Packit |
863535 |
--- a/arch/x86/include/asm/processor.h
|
|
Packit |
863535 |
+++ b/arch/x86/include/asm/processor.h
|
|
Packit |
863535 |
@@ -977,4 +977,5 @@ bool xen_set_default_idle(void);
|
|
Packit |
863535 |
|
|
Packit |
863535 |
void stop_this_cpu(void *dummy);
|
|
Packit |
863535 |
void df_debug(struct pt_regs *regs, long error_code);
|
|
Packit |
863535 |
+void microcode_check(void);
|
|
Packit |
863535 |
#endif /* _ASM_X86_PROCESSOR_H */
|
|
Packit |
863535 |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
|
|
Packit |
863535 |
index 824aee0..84f1cd8 100644
|
|
Packit |
863535 |
--- a/arch/x86/kernel/cpu/common.c
|
|
Packit |
863535 |
+++ b/arch/x86/kernel/cpu/common.c
|
|
Packit |
863535 |
@@ -1749,3 +1749,13 @@ static int __init init_cpu_syscore(void)
|
|
Packit |
863535 |
return 0;
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
core_initcall(init_cpu_syscore);
|
|
Packit |
863535 |
+
|
|
Packit |
863535 |
+/*
|
|
Packit |
863535 |
+ * The microcode loader calls this upon late microcode load to recheck features,
|
|
Packit |
863535 |
+ * only when microcode has been updated. Caller holds microcode_mutex and CPU
|
|
Packit |
863535 |
+ * hotplug lock.
|
|
Packit |
863535 |
+ */
|
|
Packit |
863535 |
+void microcode_check(void)
|
|
Packit |
863535 |
+{
|
|
Packit |
863535 |
+ perf_check_microcode();
|
|
Packit |
863535 |
+}
|
|
Packit |
863535 |
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
index 6fdaf7c..aa1b9a4 100644
|
|
Packit |
863535 |
--- a/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
|
Packit |
863535 |
@@ -509,6 +509,7 @@ static ssize_t reload_store(struct device *dev,
|
|
Packit |
863535 |
const char *buf, size_t size)
|
|
Packit |
863535 |
{
|
|
Packit |
863535 |
enum ucode_state tmp_ret = UCODE_OK;
|
|
Packit |
863535 |
+ bool do_callback = false;
|
|
Packit |
863535 |
unsigned long val;
|
|
Packit |
863535 |
ssize_t ret = 0;
|
|
Packit |
863535 |
int cpu;
|
|
Packit |
863535 |
@@ -531,10 +532,13 @@ static ssize_t reload_store(struct device *dev,
|
|
Packit |
863535 |
if (!ret)
|
|
Packit |
863535 |
ret = -EINVAL;
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
+
|
|
Packit |
863535 |
+ if (tmp_ret == UCODE_UPDATED)
|
|
Packit |
863535 |
+ do_callback = true;
|
|
Packit |
863535 |
}
|
|
Packit |
863535 |
|
|
Packit |
863535 |
- if (!ret && tmp_ret == UCODE_UPDATED)
|
|
Packit |
863535 |
- perf_check_microcode();
|
|
Packit |
863535 |
+ if (!ret && do_callback)
|
|
Packit |
863535 |
+ microcode_check();
|
|
Packit |
863535 |
|
|
Packit |
863535 |
mutex_unlock(µcode_mutex);
|
|
Packit |
863535 |
put_online_cpus();
|
|
Packit |
863535 |
--
|
|
Packit |
863535 |
cgit v1.1
|
|
Packit |
863535 |
|