diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
| commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
| tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /arch/x86/kernel/cpu/intel.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
| download | kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.gz kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.xz kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.zip | |
Merge branch 'topic/quirk-cleanup' into topic/misc
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 8ea6929e974..549f2ada55f 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -29,6 +29,19 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) { + /* Unmask CPUID levels if masked: */ + if (c->x86 == 6 && c->x86_model >= 15) { + u64 misc_enable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { + misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + c->cpuid_level = cpuid_eax(0); + } + } + if ((c->x86 == 0xf && c->x86_model >= 0x03) || (c->x86 == 0x6 && c->x86_model >= 0x0e)) set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); |