aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/zhaoxin.c
diff options
context:
space:
mode:
authorSean Christopherson <sean.j.christopherson@intel.com>2019-12-20 20:45:01 -0800
committerBorislav Petkov <bp@suse.de>2020-01-13 17:50:40 +0100
commit7d37953ba81121c8725f99356f7ee9762d4c3ed9 (patch)
treef95b0fc84cd79249720aa34266757c74a0e10d11 /arch/x86/kernel/cpu/zhaoxin.c
parentx86/centaur: Use common IA32_FEAT_CTL MSR initialization (diff)
downloadlinux-dev-7d37953ba81121c8725f99356f7ee9762d4c3ed9.tar.xz
linux-dev-7d37953ba81121c8725f99356f7ee9762d4c3ed9.zip
x86/zhaoxin: Use common IA32_FEAT_CTL MSR initialization
Use the recently added IA32_FEAT_CTL MSR initialization sequence to opportunistically enable VMX support when running on a Zhaoxin CPU. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20191221044513.21680-8-sean.j.christopherson@intel.com
Diffstat (limited to 'arch/x86/kernel/cpu/zhaoxin.c')
-rw-r--r--arch/x86/kernel/cpu/zhaoxin.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
index 8e6f2f4b4afe..630a1450ea70 100644
--- a/arch/x86/kernel/cpu/zhaoxin.c
+++ b/arch/x86/kernel/cpu/zhaoxin.c
@@ -141,6 +141,8 @@ static void init_zhaoxin(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
#endif
+ init_ia32_feat_ctl(c);
+
if (cpu_has(c, X86_FEATURE_VMX))
zhaoxin_detect_vmx_virtcap(c);
}