lkml.org 
[lkml]   [2019]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/16] x86/zhaoxin: Use common IA32_FEATURE_CONTROL MSR initialization
    Date
    Use the recently added IA32_FEATURE_CONTROL MSR initialization sequence
    to opportunstically enable VMX support when running on a Zhaoxin CPU.

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
    ---
    arch/x86/Kconfig.cpu | 2 +-
    arch/x86/kernel/cpu/zhaoxin.c | 2 ++
    2 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
    index 9e4e41424dc2..e78f39adae7b 100644
    --- a/arch/x86/Kconfig.cpu
    +++ b/arch/x86/Kconfig.cpu
    @@ -389,7 +389,7 @@ config X86_DEBUGCTLMSR

    config X86_FEATURE_CONTROL_MSR
    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
    diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
    index 8e6f2f4b4afe..01b05a4a5a85 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_feature_control_msr(c);
    +
    if (cpu_has(c, X86_FEATURE_VMX))
    zhaoxin_detect_vmx_virtcap(c);
    }
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-10-04 23:58    [W:4.268 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site