From e5a1a4c5d6c55be287bef6bef15f138e86dace3f Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Thu, 19 Jan 2017 21:13:02 -0600
Subject: soc/baytrail: add vmx support via CPU_INTEL_COMMON

Mirrors addition to Braswell SoC in commit d3d0f07.

Test: build/boot Windows 10 on Baytrail ChromeOS device, verify Windows shows
virtualization as enabled.

Change-Id: Ia1fafa73325814fed30b2ac91290b682dd8eab04
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30228
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
---
 src/soc/intel/baytrail/Kconfig      | 1 +
 src/soc/intel/baytrail/Makefile.inc | 1 +
 src/soc/intel/baytrail/cpu.c        | 4 ++++
 3 files changed, 6 insertions(+)

(limited to 'src/soc/intel/baytrail')

diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index ece4d61510..1114ff0efa 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -40,6 +40,7 @@ config CPU_SPECIFIC_OPTIONS
 	select INTEL_GMA_SWSMISCI
 	select POSTCAR_STAGE
 	select POSTCAR_CONSOLE
+	select CPU_INTEL_COMMON
 
 config VBOOT
 	select VBOOT_STARTS_IN_ROMSTAGE
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index 3658f5a526..1debea9e2a 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -7,6 +7,7 @@ subdirs-y += ../../../cpu/x86/smm
 subdirs-y += ../../../cpu/x86/tsc
 subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
+subdirs-y += ../../../cpu/intel/common
 
 ramstage-y += memmap.c
 romstage-y += memmap.c
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 9bbeafbe76..6c37aa86b9 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
+#include <cpu/intel/common/common.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/turbo.h>
 #include <cpu/x86/cache.h>
@@ -55,6 +56,9 @@ static void baytrail_core_init(struct device *cpu)
 	if (lapicid())
 		enable_turbo();
 
+	/* Set virtualization based on Kconfig option */
+	set_vmx();
+
 	/* Set core MSRs */
 	reg_script_run(core_msr_script);
 
-- 
cgit v1.2.3