sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "soc/intel/common/block: add VMX support"

Browse Source 
This reverts commit 9aae51ad11.

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>
This commit is contained in:
Nico Huber
2018-11-17 23:33:40 +01:00
committed by Patrick Georgi
parent c426be6ae2
commit 9a1d057f5f
4 changed files with 0 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/soc/intel/common/block/include/intelblocks/vmx.h
View File

@ -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 */

3
src/soc/intel/common/block/vmx/Kconfig
View File

@ -1,3 +0,0 @@
config SOC_INTEL_COMMON_BLOCK_VMX
bool "Enable VMX for virtualization"
default n

1
src/soc/intel/common/block/vmx/Makefile.inc
View File

@ -1 +0,0 @@
ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_VMX) += vmx.c

74
src/soc/intel/common/block/vmx/vmx.c
View File

@ -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");
}