<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25332">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/skylake: enable VMX support<br><br>Use soc/common VMX block to enable VMX on supported devices.<br><br>Change-Id: Iaa1a6201b431783d709c0509715fa8e8b1ce349a<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/soc/intel/skylake/Kconfig<br>M src/soc/intel/skylake/cpu.c<br>2 files changed, 18 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/25332/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig</span><br><span>index aac4a8f..a4178be 100644</span><br><span>--- a/src/soc/intel/skylake/Kconfig</span><br><span>+++ b/src/soc/intel/skylake/Kconfig</span><br><span>@@ -84,6 +84,7 @@</span><br><span> select SOC_INTEL_COMMON_BLOCK_SPI</span><br><span> select SOC_INTEL_COMMON_BLOCK_TIMER</span><br><span> select SOC_INTEL_COMMON_BLOCK_UART</span><br><span style="color: hsl(120, 100%, 40%);">+ select SOC_INTEL_COMMON_BLOCK_VMX</span><br><span> select SOC_INTEL_COMMON_BLOCK_XHCI</span><br><span> select SOC_INTEL_COMMON_GFX_OPREGION</span><br><span> select SOC_INTEL_COMMON_NHLT</span><br><span>diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c</span><br><span>index 1a2de73..4a9d298 100644</span><br><span>--- a/src/soc/intel/skylake/cpu.c</span><br><span>+++ b/src/soc/intel/skylake/cpu.c</span><br><span>@@ -39,6 +39,7 @@</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(120, 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>@@ -476,6 +477,8 @@</span><br><span> smm_lock();</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ mp_run_on_all_cpus(vmx_configure, 2000);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mp_run_on_all_cpus(sgx_configure, 2000);</span><br><span> }</span><br><span> </span><br><span>@@ -552,3 +555,17 @@</span><br><span> sgx_param->enable = conf->sgx_enable;</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+int soc_fill_vmx_param(struct vmx_param *vmx_param)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ device_t dev = SA_DEV_ROOT;</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(dev != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_t *conf = dev->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Failed to get chip_info for VMX param\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vmx_param->enable = conf->VmxEnable;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25332">change 25332</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/25332"/><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: Iaa1a6201b431783d709c0509715fa8e8b1ce349a </div>
<div style="display:none"> Gerrit-Change-Number: 25332 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>