[coreboot-gerrit] Change in coreboot[master]: cpu/x86/mp_init: Fix false error message on parking APs twice

[Arthur Heymans (Code Review)]

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

Change subject: cpu/x86/mp_init: Fix false error message on parking APs twice
......................................................................

cpu/x86/mp_init: Fix false error message on parking APs twice

With Intel TXT APs are parked before LockConfig is called.
With CONFIG_PARALLEL_MP_AP_WORK mp_park_aps() will be called again
before launching the payload, however if APs are already parked this
results in a spurious error message.

Change-Id: I60095cffcb9b31d965b0525ddc3018b592a3e52e
Signed-off-by: Arthur Heymans 
---
M src/cpu/x86/mp_init.c
1 file changed, 10 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/55071/1

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 893e8f1..a21fd48 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -1050,6 +1050,12 @@
    struct stopwatch sw;
    int ret;
    long duration_msecs;
+	static bool parked;
+
+	if (parked) {
+		printk(BIOS_DEBUG, "%s: CPUs already parked\n", __func__);
+		return;
+	}

stopwatch_init(&sw);

@@ -1058,12 +1064,14 @@

duration_msecs = stopwatch_duration_msecs(&sw);

-	if (!ret)
+	if (!ret) {
    	printk(BIOS_DEBUG, "%s done after %ld msecs.\n", __func__,
    	       duration_msecs);
-	else
+		parked = true;
+	} else {
    	printk(BIOS_ERR, "%s failed after %ld msecs.\n", __func__,
    	       duration_msecs);
+	}

return ret;
 }