x86/cpu changes for v4.3
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus
# HEAD: b1c599b8ff80ea79b9f8277a3f9f36a7b0cfedce x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
Two changes: a suspend/resume quirk and a new CPUID bit definition.
Thanks,
Ingo
------------------>
Laura Abbott (1):
x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume
Mathias Krause (1):
x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
arch/x86/include/asm/cpufeature.h | 1 + arch/x86/kernel/cpu/common.c | 18 +++++++++++++++ arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/intel.c | 47 ++++++++++++++++++++++++++------------- 4 files changed, 52 insertions(+), 15 deletions(-)
arch/x86/include/asm/cpufeature.h +1 -0
@@ -119,6 +119,7 @@#define X86_FEATURE_TM2 ( 4*32+ 8)/* Thermal Monitor 2 */ #define X86_FEATURE_SSSE3 ( 4*32+ 9)/* Supplemental SSE-3 */ #define X86_FEATURE_CID ( 4*32+10)/* Context ID */ +#define X86_FEATURE_SDBG ( 4*32+11)/* Silicon Debug */ #define X86_FEATURE_FMA ( 4*32+12)/* Fused multiply-add */ #define X86_FEATURE_CX16 ( 4*32+13)/* CMPXCHG16B */ #define X86_FEATURE_XTPR ( 4*32+14)/* Send Task Priority Messages */
arch/x86/kernel/cpu/common.c +18 -0
@@ -13,6 +13,7 @@#include <linux/kgdb.h> #include <linux/smp.h> #include <linux/io.h> +#include <linux/syscore_ops.h> #include <asm/stackprotector.h> #include <asm/perf_event.h>
@@ -1488,3 +1489,20 @@ inline bool __static_cpu_has_safe(u16 bit)return boot_cpu_has (bit); }EXPORT_SYMBOL_GPL (__static_cpu_has_safe); + +static void bsp_resume (void ) +{ +if (this_cpu->c_bsp_resume) + this_cpu->c_bsp_resume (&boot_cpu_data); +} + +static struct syscore_ops cpu_syscore_ops = { + .resume = bsp_resume, +}; + +static int __init init_cpu_syscore (void ) +{ +register_syscore_ops (&cpu_syscore_ops); +return 0 ; +} +core_initcall (init_cpu_syscore);
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -13,6 +13,7 @@ struct cpu_dev {void (*c_init)(struct cpuinfo_x86 *);void (*c_identify)(struct cpuinfo_x86 *);void (*c_detect_tlb)(struct cpuinfo_x86 *); +void (*c_bsp_resume)(struct cpuinfo_x86 *);int c_x86_vendor;#ifdef CONFIG_X86_32 /* Optional vendor specific routine to obtain the cache size. */
arch/x86/kernel/cpu/intel.c +32 -15
65 lines not on this page · raw message