mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 07:01:32 +00:00
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
This commit is contained in:
parent
501444905f
commit
7d37953ba8
@ -389,7 +389,7 @@ config X86_DEBUGCTLMSR
|
||||
|
||||
config IA32_FEAT_CTL
|
||||
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
|
||||
bool "Supported processor vendors" if EXPERT
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user