x86/centaur: Use common IA32_FEAT_CTL MSR initialization
mainline inclusion from mainline-v5.5-rc1 commit <501444905fcb4166589fda99497c273ac5efc65e> category: feature ------------------- Use the recently added IA32_FEAT_CTL MSR initialization sequence to opportunistically enable VMX support when running on a Centaur 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-7-sean.j.christopherson@intel.com Signed-off-by: leoliu-oc <leoliu-oc@zhaoxin.com>
This commit is contained in:
parent
2bf5a747a0
commit
dd1d37a84b
|
@ -382,7 +382,7 @@ config X86_DEBUGCTLMSR
|
|||
|
||||
config IA32_FEAT_CTL
|
||||
def_bool y
|
||||
depends on CPU_SUP_INTEL
|
||||
depends on CPU_SUP_INTEL || CPU_SUP_CENTAUR
|
||||
|
||||
menuconfig PROCESSOR_SELECT
|
||||
bool "Supported processor vendors" if EXPERT
|
||||
|
|
|
@ -250,6 +250,8 @@ static void init_centaur(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))
|
||||
centaur_detect_vmx_virtcap(c);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue