Change in coreboot[master]: cpu/x86/smm_loaderv2: Fix for CPU = 1

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50783 )

Change subject: cpu/x86/smm_loaderv2: Fix for CPU = 1
......................................................................

cpu/x86/smm_loaderv2: Fix for CPU = 1

Move out smm_create_map as this was not run if concurrent_save_states
is 1. The cpus struct array is used in the smm_get_cpu_smbase()
callback so it is necessary to create this.

Change-Id: I07a98bbc9ff6dce548171ee6cd0c303db94087aa
Signed-off-by: Arthur Heymans 
---
M src/cpu/x86/smm/smm_module_loaderv2.c
1 file changed, 17 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/50783/1

diff --git a/src/cpu/x86/smm/smm_module_loaderv2.c b/src/cpu/x86/smm/smm_module_loaderv2.c
index 8eef2f6..5a06e3e 100644
--- a/src/cpu/x86/smm/smm_module_loaderv2.c
+++ b/src/cpu/x86/smm/smm_module_loaderv2.c
@@ -214,24 +214,20 @@
 {
    unsigned int i;
    unsigned int size;
-	if (smm_create_map(smbase, num_cpus, params)) {
-		/*
-		 * Ensure there was enough space and the last CPUs smbase
-		 * did not encroach upon the stack. Stack top is smram start
-		 * + size of stack.
-		 */
-		if (cpus[num_cpus].active) {
-			if (cpus[num_cpus - 1].smbase +
-				params->smm_main_entry_offset < stack_top) {
-				printk(BIOS_ERR, "%s: stack encroachment\n", __func__);
+
+	/*
+	 * Ensure there was enough space and the last CPUs smbase
+	 * did not encroach upon the stack. Stack top is smram start
+	 * + size of stack.
+	 */
+	if (cpus[num_cpus].active) {
+		if (cpus[num_cpus - 1].smbase +
+		    params->smm_main_entry_offset < stack_top) {
+			printk(BIOS_ERR, "%s: stack encroachment\n", __func__);
    			printk(BIOS_ERR, "%s: smbase %zx, stack_top %lx\n",
-					__func__, cpus[num_cpus].smbase, stack_top);
+				       __func__, cpus[num_cpus].smbase, stack_top);
    			return 0;
-			}
    	}
-	} else {
-		printk(BIOS_ERR, "%s: unable to place smm entry code\n", __func__);
-		return 0;
    }

printk(BIOS_INFO, "%s: smbase %zx, stack_top %lx\n",
@@ -643,5 +639,11 @@
    printk(BIOS_DEBUG, "%s: cpu0 entry: %p\n",
    	 __func__, base);
    params->smm_entry = (uintptr_t)base + params->smm_main_entry_offset;
+
+	if (!smm_create_map((uintptr_t)base, params->num_concurrent_save_states, params)) {
+		printk(BIOS_ERR, "%s: Error creating CPU map\n", __func__);
+		return -1;
+	}
+
    return smm_module_setup_stub(base, size, params, fxsave_area);
 }