cpu/intel/common: Add/Use common function to set virtualization
Migrate duplicated enable_vmx() method from multiple CPUs to common folder. Add common virtualization option for CPUs which support it. Note that this changes the default to enable virtualization on CPUs that support it. Change-Id: Ib110bed6c9f5508e3f867dcdc6f341fc50e501d1 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/17874 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins)
This commit is contained in:
committed by
Nico Huber
parent
2a58975264
commit
ed6fe2f64b
@ -12,6 +12,7 @@ config CPU_INTEL_MODEL_106CX
|
||||
select TSC_SYNC_MFENCE
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
select SERIALIZED_SMM_INITIALIZATION
|
||||
select CPU_INTEL_COMMON
|
||||
|
||||
if CPU_INTEL_MODEL_106CX
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
ramstage-y += model_106cx_init.c
|
||||
subdirs-y += ../../x86/name
|
||||
subdirs-y += ../common
|
||||
|
||||
cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_106cx/microcode.bin
|
||||
|
@ -25,38 +25,7 @@
|
||||
#include <cpu/intel/hyperthreading.h>
|
||||
#include <cpu/x86/cache.h>
|
||||
#include <cpu/x86/name.h>
|
||||
|
||||
#define IA32_FEATURE_CONTROL 0x003a
|
||||
|
||||
#define CPUID_VMX (1 << 5)
|
||||
#define CPUID_SMX (1 << 6)
|
||||
static void enable_vmx(void)
|
||||
{
|
||||
struct cpuid_result regs;
|
||||
msr_t msr;
|
||||
|
||||
msr = rdmsr(IA32_FEATURE_CONTROL);
|
||||
|
||||
if (msr.lo & (1 << 0)) {
|
||||
/* VMX locked. If we set it again we get an illegal
|
||||
* instruction
|
||||
*/
|
||||
return;
|
||||
}
|
||||
|
||||
regs = cpuid(1);
|
||||
if (regs.ecx & CPUID_VMX) {
|
||||
msr.lo |= (1 << 2);
|
||||
if (regs.ecx & CPUID_SMX)
|
||||
msr.lo |= (1 << 1);
|
||||
}
|
||||
|
||||
wrmsr(IA32_FEATURE_CONTROL, msr);
|
||||
|
||||
msr.lo |= (1 << 0); /* Set lock bit */
|
||||
|
||||
wrmsr(IA32_FEATURE_CONTROL, msr);
|
||||
}
|
||||
#include <cpu/intel/common/common.h>
|
||||
|
||||
#define HIGHEST_CLEVEL 3
|
||||
static void configure_c_states(void)
|
||||
@ -127,8 +96,8 @@ static void model_106cx_init(struct device *cpu)
|
||||
/* Enable the local CPU APICs */
|
||||
setup_lapic();
|
||||
|
||||
/* Enable virtualization */
|
||||
enable_vmx();
|
||||
/* Set virtualization based on Kconfig option */
|
||||
set_vmx();
|
||||
|
||||
/* Configure C States */
|
||||
configure_c_states();
|
||||
|
Reference in New Issue
Block a user