[S] Change in coreboot[main]: soc/intel/xeon_sp/gnr: Enable VMX by FSP

[Shuo Liu (Code Review)]

Attention is currently required from: Arthur Heymans, Christian Walter, Johnny Lin, Jonathan Zhang, Lean Sheng Tan, Patrick Rudolph, Tim Chu.

Hello Johnny Lin,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/84327?usp=email

to review the following change.

Change subject: soc/intel/xeon_sp/gnr: Enable VMX by FSP
......................................................................

soc/intel/xeon_sp/gnr: Enable VMX by FSP

Configure FSP UPD VMX from Kconfig ENABLE_VMX.

Change-Id: I0c03f535b6f93761419657127e791c02e8ee4988
Signed-off-by: Johnny Lin 
---
M src/soc/intel/xeon_sp/gnr/cpu.c
M src/soc/intel/xeon_sp/gnr/romstage.c
2 files changed, 8 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/84327/1

diff --git a/src/soc/intel/xeon_sp/gnr/cpu.c b/src/soc/intel/xeon_sp/gnr/cpu.c
index ebccb08..5805035 100644
--- a/src/soc/intel/xeon_sp/gnr/cpu.c
+++ b/src/soc/intel/xeon_sp/gnr/cpu.c
@@ -34,8 +34,9 @@
    printk(BIOS_SPEW, "%s dev: %s, cpu: %lu, apic_id: 0x%x\n",
    	__func__, dev_path(cpu), cpu_index(), cpu->path.apic.apic_id);

-	/* Enable VMX */
-	set_vmx_and_lock();
+	/* Only lock and let vmx enabled by FSP to avoid FSP always triggering power good reset
+	   due to vmx configuration conflict */
+	set_feature_ctrl_lock();
 }

static struct device_operations cpu_dev_ops = {
diff --git a/src/soc/intel/xeon_sp/gnr/romstage.c b/src/soc/intel/xeon_sp/gnr/romstage.c
index e61471e..48d88aa 100644
--- a/src/soc/intel/xeon_sp/gnr/romstage.c
+++ b/src/soc/intel/xeon_sp/gnr/romstage.c
@@ -66,6 +66,11 @@
    			"FSP_BOOT_WITH_FULL_CONFIGURATION.\n");
    }

+	if (CONFIG(ENABLE_VMX))
+		m_cfg->VmxEnable = 1;
+	else
+		m_cfg->VmxEnable = 0;
+
    /* Board level settings */
    mainboard_memory_init_params(mupd);
 }