From 250dfc025613f5e193183f9520432207f4b296e4 Mon Sep 17 00:00:00 2001 From: Ronak Kanabar Date: Fri, 29 Mar 2019 13:25:09 +0530 Subject: soc/intel/cannonlake: Configure Vmx support using Kconfig Change VmxEnable UPD values based on Kconfig ENABLE_VMX and remove it from Devicetree and chip.h Remove Vmx dependency on Vt-d Change-Id: I4180c2270038a28befd6ed53c9485905025a15ba Signed-off-by: Ronak Kanabar Reviewed-on: https://review.coreboot.org/c/coreboot/+/32117 Reviewed-by: Lijian Zhao Reviewed-by: Furquan Shaikh Reviewed-by: Nico Huber Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/romstage/fsp_params.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/soc/intel/cannonlake/romstage') diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c index 4545f52696..2ad2c935b7 100644 --- a/src/soc/intel/cannonlake/romstage/fsp_params.c +++ b/src/soc/intel/cannonlake/romstage/fsp_params.c @@ -61,11 +61,8 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, const config_t *config) m_cfg->PcdDebugInterfaceFlags = CONFIG(DRIVERS_UART_8250IO) ? 0x02 : 0x10; - /* Disable Vmx if Vt-d is already disabled */ - if (config->VtdDisable) - m_cfg->VmxEnable = 0; - else - m_cfg->VmxEnable = config->VmxEnable; + /* Change VmxEnable UPD value according to ENABLE_VMX Kconfig */ + m_cfg->VmxEnable = CONFIG(ENABLE_VMX); #if CONFIG(SOC_INTEL_COMMON_CANNONLAKE_BASE) if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI)) -- cgit v1.2.3