[coreboot-gerrit] Change in ...coreboot[master]: src/cpu/x86 STM Support

[Name of user not set (Code Review)]

Name of user not set #1002358 has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33236

Change subject: src/cpu/x86  STM Support
......................................................................

src/cpu/x86  STM Support

STM initialization

Change-Id: I3a0adcefc0f6e22a9da5fe53952481a77737e5eb
---
M src/cpu/x86/mp_init.c
1 file changed, 25 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/33236/1

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 3889c7d..881d8a2 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -37,8 +37,12 @@
 #include <symbols.h>
 #include <thread.h>

+#include <security/intel/stm/StmApi.h>
+
 #define MAX_APIC_IDS 256

+extern int LoadStmImage(uint32_t mseg);
+
 struct mp_callback {
    void (*func)(void *);
    void *arg;
@@ -823,6 +827,10 @@
 {
    size_t smm_save_state_size = mp_state.smm_save_state_size;

+#ifdef CONFIG_STM
+	uint32_t mseg;
+#endif
+
    /* Do nothing if SMM is disabled.*/
    if (!is_smm_enabled())
    	return;
@@ -839,6 +847,14 @@
    	printk(BIOS_ERR, "Unable to install SMM permanent handler.\n");
    	smm_disable();
    }
+#ifdef CONFIG_STM
+
+	/* Calculate mseg location*/
+	mseg = mp_state.perm_smbase + (mp_state.perm_smsize - CONFIG_MSEG_SIZE);
+
+	/* Load the STM into the MSEG */
+	LoadStmImage(mseg);
+#endif

/* Ensure the SMM handlers hit DRAM before performing first SMI. */
    wbinvd();
@@ -1023,6 +1039,15 @@
    if (ops->get_smm_info != NULL)
    	ops->get_smm_info(&state->perm_smbase, &state->perm_smsize,
    				&state->smm_save_state_size);
+#ifdef CONFIG_STM
+
+	/* Currently, the CPU SMM save state size is based on a simplistic
+	 *  algorithm. (set it to 1K)
+	 * note: In the future, this will need to handle newer x86 processors 
+	 * that require 32k alignment of the save state on 32K boundries.*/
+	state->smm_save_state_size += (sizeof(TXT_PROCESSOR_SMM_DESCRIPTOR) + 0x1000) & 0xfffff000;
+
+#endif  /* CONFIG_STM */

/*
     * Default to smm_initiate_relocation() if trigger callback isn't