summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2018-12-30 00:31:35 -0600
committerMatt DeVillier <matt.devillier@gmail.com>2019-01-05 20:39:23 +0000
commit54efaae701dacd58621e66a8cf56812eb5304946 (patch)
tree40f8e9be469cb1170b89b62edbdc089345f894d0
parenta2046b29ef28941c67f78c46520d5345acf08d83 (diff)
cpu/intel/common: improve debug output
currently, if the IA32_FEATURE_CONTROL lock bit is already set, VMX status isn't reported. Adjust debug output to provide more useful infomation on both VMX and lock bit statuses. Test: build/boot google/chell, observe useful output in cbmem log regardless of lock bit status. Change-Id: Ie50f214f7e3fcfd6c3d0d2de034a93518c0a6b46 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/30524 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/cpu/intel/common/common_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index 9c0fcbb122..4f3bcacaf3 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -43,8 +43,9 @@ void set_feature_ctrl_vmx(void)
msr = rdmsr(IA32_FEATURE_CONTROL);
if (msr.lo & (1 << 0)) {
- printk(BIOS_ERR, "IA32_FEATURE_CONTROL is locked, so %s will do nothing\n",
- __func__);
+ printk(BIOS_DEBUG, "IA32_FEATURE_CONTROL already locked; ");
+ printk(BIOS_DEBUG, "VMX status: %s\n", msr.lo & (1 << 2) ?
+ "enabled" : "disabled");
/* IA32_FEATURE_CONTROL locked. If we set it again we get an
* illegal instruction
*/
@@ -75,8 +76,7 @@ void set_feature_ctrl_lock(void)
msr = rdmsr(IA32_FEATURE_CONTROL);
if (msr.lo & (1 << 0)) {
- printk(BIOS_ERR, "IA32_FEATURE_CONTROL is locked, so %s will do nothing\n",
- __func__);
+ printk(BIOS_DEBUG, "IA32_FEATURE_CONTROL already locked; ");
/* IA32_FEATURE_CONTROL locked. If we set it again we get an
* illegal instruction
*/