GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize the VMX MSR 

The VMX MSR may come up with random values and needs to be
initialized to zero. This was done incorrectly in finalize_smm.
It must be done on a per core basis in the general CPU init.
This touches all Sandybridge and Ivybridge configs.

Change-Id: I015352d0f8e2ebe55ac0a5e9c5bbff83bd2ff86b
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/1794
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Marc Jones 2012-10-25 14:01:37 -06:00 committed by Stefan Reinauer
parent 5986edadff
commit f5a11aa82f
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpu/intel/model_206ax/finalize.c
View File

@ -43,7 +43,6 @@ static void msr_set_bit(unsigned reg, unsigned bit)
void intel_model_206ax_finalize_smm(void) void intel_model_206ax_finalize_smm(void)
{ {
msr_set_bit(IA32_FEATURE_CONTROL, 0);
msr_set_bit(MSR_PMG_CST_CONFIG_CONTROL, 15); msr_set_bit(MSR_PMG_CST_CONFIG_CONTROL, 15);
/* Lock AES-NI only if supported */ /* Lock AES-NI only if supported */

28
src/cpu/intel/model_206ax/model_206ax_init.c
View File

@ -122,30 +122,32 @@ static void enable_vmx(void)
msr_t msr; msr_t msr;
int enable = CONFIG_ENABLE_VMX; int enable = CONFIG_ENABLE_VMX;
regs = cpuid(1);
/* Check that the VMX is supported before reading or writing the MSR. */
if (!((regs.ecx & CPUID_VMX) || (regs.ecx & CPUID_SMX)))
return;
msr = rdmsr(IA32_FEATURE_CONTROL); msr = rdmsr(IA32_FEATURE_CONTROL);
if (msr.lo & (1 << 0)) { if (msr.lo & (1 << 0)) {
printk(BIOS_ERR, "VMX is locked, so enable_vmx will do nothing\n"); printk(BIOS_ERR, "VMX is locked, so %s will do nothing\n", __func__);
/* VMX locked. If we set it again we get an illegal /* VMX locked. If we set it again we get an illegal
* instruction * instruction
*/ */
return; return;
} }
regs = cpuid(1); /* The IA32_FEATURE_CONTROL MSR may initialize with random values.
printk(BIOS_DEBUG, "%s VMX\n", enable ? "Enabling" : "Disabling"); * It must be cleared regardless of VMX config setting.
if (regs.ecx & CPUID_VMX) { */
if (enable) msr.hi = msr.lo = 0;
msr.lo |= (1 << 2);
else
msr.lo &= ~(1 << 2);
if (regs.ecx & CPUID_SMX) { printk(BIOS_DEBUG, "%s VMX\n", enable ? "Enabling" : "Disabling");
if (enable)
if (enable) {
msr.lo |= (1 << 2);
if (regs.ecx & CPUID_SMX)
msr.lo |= (1 << 1); msr.lo |= (1 << 1);
else
msr.lo &= ~(1 << 1);
}
} }
wrmsr(IA32_FEATURE_CONTROL, msr); wrmsr(IA32_FEATURE_CONTROL, msr);