[coreboot-gerrit] Change in coreboot[master]: Revert "soc/intel/skylake: enable VMX support"

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/29682

Change subject: Revert "soc/intel/skylake: enable VMX support"
......................................................................

Revert "soc/intel/skylake: enable VMX support"

This reverts commit 969ef10f5409f70f85b76f3a7c5b5a4e4a637ee9.

It ignores a devicetree setting based on a Kconfig, probably con-
flicts with what FSP does and doesn't use the existing code in
cpu/intel/common/.

Change-Id: Iea598cf74ba542a650433719f29cb5c9df700c0f
Signed-off-by: Nico Huber 
---
M 3rdparty/chromeec
M src/soc/intel/skylake/Kconfig
M src/soc/intel/skylake/cpu.c
3 files changed, 1 insertion(+), 24 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/29682/1

diff --git a/3rdparty/chromeec b/3rdparty/chromeec
index 11bd4c0..b45641f 160000
--- a/3rdparty/chromeec
+++ b/3rdparty/chromeec
@@ -1 +1 @@
-Subproject commit 11bd4c0f4d11357ab830982d7dec164813c886dd
+Subproject commit b45641f331b8ffaff2e2e94ffc758b3d966e2e34
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 3a2b50b..d6de918 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -67,7 +67,6 @@
    select SOC_INTEL_COMMON_BLOCK_SMM
    select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP
    select SOC_INTEL_COMMON_BLOCK_UART
-	select SOC_INTEL_COMMON_BLOCK_VMX
    select SOC_INTEL_COMMON_PCH_BASE
    select SOC_INTEL_COMMON_NHLT
    select SOC_INTEL_COMMON_RESET
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 9e4bbe8..4d99d5e 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -38,7 +38,6 @@
 #include <intelblocks/mp_init.h>
 #include <intelblocks/sgx.h>
 #include <intelblocks/smm.h>
-#include <intelblocks/vmx.h>
 #include <pc80/mc146818rtc.h>
 #include <soc/cpu.h>
 #include <soc/msr.h>
@@ -483,8 +482,6 @@
    smm_lock();
 #endif

-	mp_run_on_all_cpus(vmx_configure, NULL, 2 * USECS_PER_MSEC);
-
    mp_run_on_all_cpus(sgx_configure, NULL, 14 * USECS_PER_MSEC);
 }

@@ -566,22 +563,3 @@
    sgx_param->enable = conf->sgx_enable;
    return 0;
 }
-int soc_fill_vmx_param(struct vmx_param *vmx_param)
-{
-	struct device *dev = SA_DEV_ROOT;
-	config_t *conf;
-
-	if (!dev) {
-		printk(BIOS_ERR, "Failed to get root dev for checking VMX param\n");
-		return -1;
-	}
-
-	conf = dev->chip_info;
-	if (!conf) {
-		printk(BIOS_ERR, "Failed to get chip_info for VMX param\n");
-		return -1;
-	}
-
-	vmx_param->enable = conf->VmxEnable;
-	return 0;
-}