Commit 7d37953b authored by Sean Christopherson's avatar Sean Christopherson Committed by Borislav Petkov

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: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20191221044513.21680-8-sean.j.christopherson@intel.com
parent 50144490
...@@ -389,7 +389,7 @@ config X86_DEBUGCTLMSR ...@@ -389,7 +389,7 @@ config X86_DEBUGCTLMSR
config IA32_FEAT_CTL config IA32_FEAT_CTL
def_bool y def_bool y
depends on CPU_SUP_INTEL || CPU_SUP_CENTAUR depends on CPU_SUP_INTEL || CPU_SUP_CENTAUR || CPU_SUP_ZHAOXIN
menuconfig PROCESSOR_SELECT menuconfig PROCESSOR_SELECT
bool "Supported processor vendors" if EXPERT bool "Supported processor vendors" if EXPERT
......
...@@ -141,6 +141,8 @@ static void init_zhaoxin(struct cpuinfo_x86 *c) ...@@ -141,6 +141,8 @@ static void init_zhaoxin(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
#endif #endif
init_ia32_feat_ctl(c);
if (cpu_has(c, X86_FEATURE_VMX)) if (cpu_has(c, X86_FEATURE_VMX))
zhaoxin_detect_vmx_virtcap(c); zhaoxin_detect_vmx_virtcap(c);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment