Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60882cc1 authored by David Wang's avatar David Wang Committed by Thomas Gleixner
Browse files

x86/Centaur: Initialize supported CPU features properly 



Centaur CPUs have some Intel compatible capabilities,including Permformance
Monitoring Counters and CPU virtualization capabilities. Initialize them in
the Centaur specific init code.

Signed-off-by: default avatarDavid Wang <davidwang@zhaoxin.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: lukelin@viacpu.com
Cc: qiyuanwang@zhaoxin.com
Cc: gregkh@linuxfoundation.org
Cc: brucechang@via-alliance.com
Cc: timguo@zhaoxin.com
Cc: cooperyan@zhaoxin.com
Cc: hpa@zytor.com
Cc: benjaminpan@viatech.com
Link: https://lkml.kernel.org/r/1524212968-28998-1-git-send-email-davidwang@zhaoxin.com
parent 87ef1202

arch/x86/kernel/cpu/centaur.c

+48 −0
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ 
#define RNG_ENABLED	(1 << 3)

#define RNG_ENABLE	(1 << 6)	/* MSR_VIA_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_c3(struct cpuinfo_x86 *c)

{

	u32  lo, hi;
@@ -112,6 +119,31 @@ static void early_init_centaur(struct cpuinfo_x86 *c) 
	}

}



static void centaur_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_centaur(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_32
@@ -128,6 +160,19 @@ static void init_centaur(struct cpuinfo_x86 *c) 
	clear_cpu_cap(c, 0*32+31);

#endif

	early_init_centaur(c);



	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);

	}



	switch (c->x86) {

#ifdef CONFIG_X86_32

	case 5:
@@ -199,6 +244,9 @@ static void init_centaur(struct cpuinfo_x86 *c) 
#ifdef CONFIG_X86_64

	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);

#endif



	if (cpu_has(c, X86_FEATURE_VMX))

		centaur_detect_vmx_virtcap(c);

}



#ifdef CONFIG_X86_32