diff options
author | Nico Huber <nico.h@gmx.de> | 2018-11-17 23:33:40 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-04-29 12:22:58 +0000 |
commit | 9a1d057f5f25caf42bc12b6ca6da48c5c9fe9d16 (patch) | |
tree | 25dfb07a6c291aa0af20c68efd1242cc6bac231b /src/soc/intel/common/block/vmx/vmx.c | |
parent | c426be6ae29ad345d5f6a42726859fd8457f9814 (diff) |
Revert "soc/intel/common/block: add VMX support"
This reverts commit 9aae51ad1141a47d5c2f7133b02f5f0ab6168860.
Proper code in cpu/intel/common/ shall be used instead.
Change-Id: I4a5d558b03497d106083eece10c5b34e0e7cbb2d
Signed-off-by: Nico Huber <nico.h@gmx.de>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/29683
Reviewed-by: Ronak Kanabar <ronak.kanabar@intel.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/common/block/vmx/vmx.c')
-rw-r--r-- | src/soc/intel/common/block/vmx/vmx.c | 74 |
1 files changed, 0 insertions, 74 deletions
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 d0086d080e..0000000000 --- a/src/soc/intel/common/block/vmx/vmx.c +++ /dev/null @@ -1,74 +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 <arch/cpu.h> -#include <console/console.h> -#include <cpu/x86/msr.h> -#include <intelblocks/cpulib.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; - uint32_t feature_flag; - - feature_flag = cpu_get_feature_flags_ecx(); - - if (!soc_vmx_enabled() || !(feature_flag & 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"); -} |