<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29682">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "soc/intel/skylake: enable VMX support"<br><br>This reverts commit 969ef10f5409f70f85b76f3a7c5b5a4e4a637ee9.<br><br>It ignores a devicetree setting based on a Kconfig, probably con-<br>flicts with what FSP does and doesn't use the existing code in<br>cpu/intel/common/.<br><br>Change-Id: Iea598cf74ba542a650433719f29cb5c9df700c0f<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M 3rdparty/chromeec<br>M src/soc/intel/skylake/Kconfig<br>M src/soc/intel/skylake/cpu.c<br>3 files changed, 1 insertion(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/29682/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/3rdparty/chromeec b/3rdparty/chromeec</span><br><span>index 11bd4c0..b45641f 160000</span><br><span>--- a/3rdparty/chromeec</span><br><span>+++ b/3rdparty/chromeec</span><br><span>@@ -1 +1 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subproject commit 11bd4c0f4d11357ab830982d7dec164813c886dd</span><br><span style="color: hsl(120, 100%, 40%);">+Subproject commit b45641f331b8ffaff2e2e94ffc758b3d966e2e34</span><br><span>diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig</span><br><span>index 3a2b50b..d6de918 100644</span><br><span>--- a/src/soc/intel/skylake/Kconfig</span><br><span>+++ b/src/soc/intel/skylake/Kconfig</span><br><span>@@ -67,7 +67,6 @@</span><br><span> select SOC_INTEL_COMMON_BLOCK_SMM</span><br><span> select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP</span><br><span> select SOC_INTEL_COMMON_BLOCK_UART</span><br><span style="color: hsl(0, 100%, 40%);">- select SOC_INTEL_COMMON_BLOCK_VMX</span><br><span> select SOC_INTEL_COMMON_PCH_BASE</span><br><span> select SOC_INTEL_COMMON_NHLT</span><br><span> select SOC_INTEL_COMMON_RESET</span><br><span>diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c</span><br><span>index 9e4bbe8..4d99d5e 100644</span><br><span>--- a/src/soc/intel/skylake/cpu.c</span><br><span>+++ b/src/soc/intel/skylake/cpu.c</span><br><span>@@ -38,7 +38,6 @@</span><br><span> #include <intelblocks/mp_init.h></span><br><span> #include <intelblocks/sgx.h></span><br><span> #include <intelblocks/smm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <intelblocks/vmx.h></span><br><span> #include <pc80/mc146818rtc.h></span><br><span> #include <soc/cpu.h></span><br><span> #include <soc/msr.h></span><br><span>@@ -483,8 +482,6 @@</span><br><span> smm_lock();</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mp_run_on_all_cpus(vmx_configure, NULL, 2 * USECS_PER_MSEC);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> mp_run_on_all_cpus(sgx_configure, NULL, 14 * USECS_PER_MSEC);</span><br><span> }</span><br><span> </span><br><span>@@ -566,22 +563,3 @@</span><br><span> sgx_param->enable = conf->sgx_enable;</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-int soc_fill_vmx_param(struct vmx_param *vmx_param)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *dev = SA_DEV_ROOT;</span><br><span style="color: hsl(0, 100%, 40%);">- config_t *conf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!dev) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "Failed to get root dev for checking VMX param\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- conf = dev->chip_info;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!conf) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "Failed to get chip_info for VMX param\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vmx_param->enable = conf->VmxEnable;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29682">change 29682</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29682"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iea598cf74ba542a650433719f29cb5c9df700c0f </div>
<div style="display:none"> Gerrit-Change-Number: 29682 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>