commit 761fdd5e3327db6c646a09bab5ad48cd42680cd2 upstream. Add x86 architecture support for new Zhaoxin processors. Carve out initialization code needed by Zhaoxin processors into a separate compilation unit. To identify Zhaoxin CPU, add a new vendor type X86_VENDOR_ZHAOXIN for system recognition. Signed-off-by: Tony W Wang-oc &lt;TonyWWang-oc(a)zhaoxin.com&gt; Signed-off-by: Thomas Gleixner &lt;tglx(a)linutronix.de&gt; Cc: &quot;hpa(a)zytor.com&quot; &lt;hpa(a)zytor.com&gt; Cc: &quot;gregkh(a)linuxfoundation.org&quot; &lt;gregkh(a)linuxfoundation.org&gt; Cc: &quot;rjw(a)rjwysocki.net&quot; &lt;rjw(a)rjwysocki.net&gt; Cc: &quot;lenb(a)kernel.org&quot; &lt;lenb(a)kernel.org&gt; Cc: David Wang &lt;DavidWang(a)zhaoxin.com&gt; Cc: "Cooper Yan(BJ-RD)" &lt;CooperYan(a)zhaoxin.com&gt; Cc: "Qiyuan Wang(BJ-RD)" &lt;QiyuanWang(a)zhaoxin.com&gt; Cc: "Herry Yang(BJ-RD)" &lt;HerryYang(a)zhaoxin.com&gt; Link: https://lkml.kernel.org/r/01042674b2f741b2aed1f797359bdffb@zhaoxin.com Signed-off-by: LeoLiu-oc &lt;LeoLiu-oc(a)zhaoxin.com&gt; ---  MAINTAINERS                      |   6 ++  arch/x86/Kconfig.cpu             |  13 +++  arch/x86/include/asm/processor.h |   3 +-  arch/x86/kernel/cpu/Makefile     |   1 +  arch/x86/kernel/cpu/zhaoxin.c    | 167 +++++++++++++++++++++++++++++++  5 files changed, 189 insertions(+), 1 deletion(-)  create mode 100644 arch/x86/kernel/cpu/zhaoxin.c diff --git a/MAINTAINERS b/MAINTAINERS index 192c9a4677c5..8c442cbd46b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16243,6 +16243,12 @@ Q: https://patchwork.linuxtv.org/project/linux-media/list/  S:    Maintained  F:    drivers/media/dvb-frontends/zd1301_demod* +ZHAOXIN PROCESSOR SUPPORT +M:    Tony W Wang-oc &lt;TonyWWang-oc(a)zhaoxin.com&gt; +L: linux-kernel(a)vger.kernel.org +S:    Maintained +F:    arch/x86/kernel/cpu/zhaoxin.c +  ZPOOL COMPRESSED PAGE STORAGE API  M:    Dan Streetman &lt;ddstreet(a)ieee.org&gt;  L: linux-mm(a)kvack.org diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 76e274a0fd0a..d1a51794c587 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -480,3 +480,16 @@ config CPU_SUP_UMC_32        CPU might render the kernel unbootable.        If unsure, say N. + +config CPU_SUP_ZHAOXIN +    default y +    bool "Support Zhaoxin processors" if PROCESSOR_SELECT +    help +      This enables detection, tunings and quirks for Zhaoxin processors + +      You need this enabled if you want your kernel to run on a +      Zhaoxin CPU. Disabling this option on other types of CPUs +      makes the kernel a tiny bit smaller. Disabling it on a Zhaoxin +      CPU might render the kernel unbootable. + +      If unsure, say N. diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 74eabe65e3bc..5d31abd45b04 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -159,7 +159,8 @@ enum cpuid_regs_idx {  #define X86_VENDOR_TRANSMETA    7  #define X86_VENDOR_NSC        8  #define X86_VENDOR_HYGON    9 -#define X86_VENDOR_NUM        10 +#define X86_VENDOR_ZHAOXIN    10 +#define X86_VENDOR_NUM        11  #define X86_VENDOR_UNKNOWN    0xff diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index d589ae72d974..f4e5e0f64a33 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32)        += cyrix.o  obj-$(CONFIG_CPU_SUP_CENTAUR)        += centaur.o  obj-$(CONFIG_CPU_SUP_TRANSMETA_32)    += transmeta.o  obj-$(CONFIG_CPU_SUP_UMC_32)        += umc.o +obj-$(CONFIG_CPU_SUP_ZHAOXIN)        += zhaoxin.o  obj-$(CONFIG_X86_MCE)            += mcheck/  obj-$(CONFIG_MTRR)            += mtrr/ diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c new file mode 100644 index 000000000000..8e6f2f4b4afe --- /dev/null +++ b/arch/x86/kernel/cpu/zhaoxin.c @@ -0,0 +1,167 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/sched.h> +#include <linux/sched/clock.h> + +#include <asm/cpufeature.h> + +#include "cpu.h" + +#define MSR_ZHAOXIN_FCR57 0x00001257 + +#define ACE_PRESENT    (1 << 6) +#define ACE_ENABLED    (1 << 7) +#define ACE_FCR        (1 << 7)    /* MSR_ZHAOXIN_FCR */ + +#define RNG_PRESENT    (1 << 2) +#define RNG_ENABLED    (1 << 3) +#define RNG_ENABLE    (1 << 8)    /* MSR_ZHAOXIN_RNG */ + +#define X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW    0x00200000 +#define X86_VMX_FEATURE_PROC_CTLS_VNMI        0x00400000 +#define X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS    0x80000000 +#define X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC    0x00000001 +#define X86_VMX_FEATURE_PROC_CTLS2_EPT        0x00000002 +#define X86_VMX_FEATURE_PROC_CTLS2_VPID        0x00000020 + +static void init_zhaoxin_cap(struct cpuinfo_x86 *c) +{ +    u32  lo, hi; + +    /* Test for Extended Feature Flags presence */ +    if (cpuid_eax(0xC0000000) >= 0xC0000001) { +        u32 tmp = cpuid_edx(0xC0000001); + +        /* Enable ACE unit, if present and disabled */ +        if ((tmp & (ACE_PRESENT | ACE_ENABLED)) == ACE_PRESENT) { +            rdmsr(MSR_ZHAOXIN_FCR57, lo, hi); +            /* Enable ACE unit */ +            lo |= ACE_FCR; +            wrmsr(MSR_ZHAOXIN_FCR57, lo, hi); +            pr_info("CPU: Enabled ACE h/w crypto\n"); +        } + +        /* Enable RNG unit, if present and disabled */ +        if ((tmp & (RNG_PRESENT | RNG_ENABLED)) == RNG_PRESENT) { +            rdmsr(MSR_ZHAOXIN_FCR57, lo, hi); +            /* Enable RNG unit */ +            lo |= RNG_ENABLE; +            wrmsr(MSR_ZHAOXIN_FCR57, lo, hi); +            pr_info("CPU: Enabled h/w RNG\n"); +        } + +        /* +         * Store Extended Feature Flags as word 5 of the CPU +         * capability bit array +         */ +        c->x86_capability[CPUID_C000_0001_EDX] = cpuid_edx(0xC0000001); +    } + +    if (c->x86 >= 0x6) +        set_cpu_cap(c, X86_FEATURE_REP_GOOD); + +    cpu_detect_cache_sizes(c); +} + +static void early_init_zhaoxin(struct cpuinfo_x86 *c) +{ +    if (c->x86 >= 0x6) +        set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); +#ifdef CONFIG_X86_64 +    set_cpu_cap(c, X86_FEATURE_SYSENTER32); +#endif +    if (c->x86_power & (1 << 8)) { +        set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); +        set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); +    } + +    if (c->cpuid_level >= 0x00000001) { +        u32 eax, ebx, ecx, edx; + +        cpuid(0x00000001, &eax, &ebx, &ecx, &edx); +        /* +         * If HTT (EDX[28]) is set EBX[16:23] contain the number of +         * apicids which are reserved per package. Store the resulting +         * shift value for the package management code. +         */ +        if (edx & (1U << 28)) +            c->x86_coreid_bits = get_count_order((ebx >> 16) & 0xff); +    } + +} + +static void zhaoxin_detect_vmx_virtcap(struct cpuinfo_x86 *c) +{ +    u32 vmx_msr_low, vmx_msr_high, msr_ctl, msr_ctl2; + +    rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, vmx_msr_low, vmx_msr_high); +    msr_ctl = vmx_msr_high | vmx_msr_low; + +    if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW) +        set_cpu_cap(c, X86_FEATURE_TPR_SHADOW); +    if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_VNMI) +        set_cpu_cap(c, X86_FEATURE_VNMI); +    if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS) { +        rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2, +              vmx_msr_low, vmx_msr_high); +        msr_ctl2 = vmx_msr_high | vmx_msr_low; +        if ((msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC) && +            (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW)) +            set_cpu_cap(c, X86_FEATURE_FLEXPRIORITY); +        if (msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_EPT) +            set_cpu_cap(c, X86_FEATURE_EPT); +        if (msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_VPID) +            set_cpu_cap(c, X86_FEATURE_VPID); +    } +} + +static void init_zhaoxin(struct cpuinfo_x86 *c) +{ +    early_init_zhaoxin(c); +    init_intel_cacheinfo(c); +    detect_num_cpu_cores(c); +#ifdef CONFIG_X86_32 +    detect_ht(c); +#endif + +    if (c->cpuid_level > 9) { +        unsigned int eax = cpuid_eax(10); + +        /* +         * Check for version and the number of counters +         * Version(eax[7:0]) can't be 0; +         * Counters(eax[15:8]) should be greater than 1; +         */ +        if ((eax & 0xff) && (((eax >> 8) & 0xff) > 1)) +            set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON); +    } + +    if (c->x86 >= 0x6) +        init_zhaoxin_cap(c); +#ifdef CONFIG_X86_64 +    set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); +#endif + +    if (cpu_has(c, X86_FEATURE_VMX)) +        zhaoxin_detect_vmx_virtcap(c); +} + +#ifdef CONFIG_X86_32 +static unsigned int +zhaoxin_size_cache(struct cpuinfo_x86 *c, unsigned int size) +{ +    return size; +} +#endif + +static const struct cpu_dev zhaoxin_cpu_dev = { +    .c_vendor    = "zhaoxin", +    .c_ident    = { "  Shanghai  " }, +    .c_early_init    = early_init_zhaoxin, +    .c_init        = init_zhaoxin, +#ifdef CONFIG_X86_32 +    .legacy_cache_size = zhaoxin_size_cache, +#endif +    .c_x86_vendor    = X86_VENDOR_ZHAOXIN, +}; + +cpu_dev_register(zhaoxin_cpu_dev); -- 2.20.1