Nico Huber has uploaded this change for review. ( https://review.coreboot.org/29683
Change subject: Revert "soc/intel/common/block: add VMX support" ......................................................................
Revert "soc/intel/common/block: add VMX support"
This reverts commit 9aae51ad1141a47d5c2f7133b02f5f0ab6168860.
Proper code in cpu/intel/common/ should be used instead.
Change-Id: I4a5d558b03497d106083eece10c5b34e0e7cbb2d Signed-off-by: Nico Huber nico.h@gmx.de --- D src/soc/intel/common/block/include/intelblocks/vmx.h D src/soc/intel/common/block/vmx/Kconfig D src/soc/intel/common/block/vmx/Makefile.inc D src/soc/intel/common/block/vmx/vmx.c 4 files changed, 0 insertions(+), 108 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/29683/1
diff --git a/src/soc/intel/common/block/include/intelblocks/vmx.h b/src/soc/intel/common/block/include/intelblocks/vmx.h deleted file mode 100644 index b93ceeb..0000000 --- a/src/soc/intel/common/block/include/intelblocks/vmx.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef SOC_INTEL_COMMON_BLOCK_VMX_H -#define SOC_INTEL_COMMON_BLOCK_VMX_H - -#include <stdint.h> - -struct vmx_param { - uint8_t enable; -}; - -/* - * Configure VMX. - */ -void vmx_configure(void *unused); - -/* SOC specific API to get VMX params. - * returns 0, if able to get VMX params; otherwise returns -1 */ -int soc_fill_vmx_param(struct vmx_param *vmx_param); - -#endif /* SOC_INTEL_COMMON_BLOCK_VMX_H */ diff --git a/src/soc/intel/common/block/vmx/Kconfig b/src/soc/intel/common/block/vmx/Kconfig deleted file mode 100644 index f8dce07..0000000 --- a/src/soc/intel/common/block/vmx/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config SOC_INTEL_COMMON_BLOCK_VMX - bool "Enable VMX for virtualization" - default n diff --git a/src/soc/intel/common/block/vmx/Makefile.inc b/src/soc/intel/common/block/vmx/Makefile.inc deleted file mode 100644 index 861e2f9..0000000 --- a/src/soc/intel/common/block/vmx/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_VMX) += vmx.c diff --git a/src/soc/intel/common/block/vmx/vmx.c b/src/soc/intel/common/block/vmx/vmx.c deleted file mode 100644 index 2cffdab..0000000 --- a/src/soc/intel/common/block/vmx/vmx.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <console/console.h> -#include <cpu/x86/msr.h> -#include <intelblocks/msr.h> -#include <intelblocks/vmx.h> -#include <soc/cpu.h> -#include <string.h> - -static bool vmx_param_valid; -static struct vmx_param g_vmx_param; - -static const struct vmx_param *get_vmx_param(void) -{ - if (vmx_param_valid) - return &g_vmx_param; - - memset(&g_vmx_param, 0, sizeof(g_vmx_param)); - if (soc_fill_vmx_param(&g_vmx_param) < 0) { - printk(BIOS_ERR, "VMX : Failed to get soc vmx param\n"); - return NULL; - } - vmx_param_valid = true; - printk(BIOS_INFO, "VMX : param.enable = %d\n", g_vmx_param.enable); - - return &g_vmx_param; -} - -static int soc_vmx_enabled(void) -{ - const struct vmx_param *vmx_param = get_vmx_param(); - return vmx_param ? vmx_param->enable : 0; -} - -void vmx_configure(void *unused) -{ - msr_t msr; - struct cpuid_result regs; - - regs = cpuid(1); - - if (!soc_vmx_enabled() || !(regs.ecx & CPUID_VMX)) { - printk(BIOS_ERR, "VMX: pre-conditions not met\n"); - return; - } - - msr = rdmsr(IA32_FEATURE_CONTROL); - - /* Only enable it when it is not locked */ - if ((msr.lo & FEATURE_CONTROL_LOCK_BIT) == 0) { - /* Enable VMX */ - msr.lo |= FEATURE_ENABLE_VMX; - wrmsr(IA32_FEATURE_CONTROL, msr); - } - - /* Report current status */ - msr = rdmsr(IA32_FEATURE_CONTROL); - printk(BIOS_DEBUG, "VMX status: %s, %s\n", - (msr.lo & FEATURE_ENABLE_VMX) ? "enabled" : "disabled", - (msr.lo & FEATURE_CONTROL_LOCK_BIT) ? "locked" : "unlocked"); -}