commit 9637856b533ee6eaa7cd3e1c1b2ec4d816f58dff
author Bora Guvendik <bora.guvendik@intel.com> Fri May 24 14:41:31 2019 -0700
committer Duncan Laurie <dlaurie@chromium.org> Tue May 28 20:13:59 2019 +0000
tree d5bf5dfed1dd780ebaf46cfa29d2813e2b314bda
parent 48b2adae1c3ba0c23630f912fd7f7c87f0a7528c

soc/intel/cannonlake: Dump ME status info before notify EndOfFirmware

Dumping ME status displays wrong information if we disable Heci1 because
it is called after fsp notifies EndOfFirmware and disables Heci1. This patch
moves the ME status dump before fsp notify EndOfFirmware.

TEST=Boot to OS, check ME dump information

Change-Id: Ifd8b18a41c502c4ecfb84698a7669028394589fd
Signed-off-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32991
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

src/soc/intel/cannonlake/finalize.c

diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index eb4c5c2..4dfd15b 100644
--- a/src/soc/intel/cannonlake/finalize.c
+++ b/src/soc/intel/cannonlake/finalize.c
@@ -26,7 +26,6 @@
 #include <intelblocks/tco.h>
 #include <reg_script.h>
 #include <spi-generic.h>
-#include <soc/me.h>
 #include <soc/p2sb.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
@@ -95,8 +94,6 @@
 {
 	printk(BIOS_DEBUG, "Finalizing chipset.\n");
 
-	dump_me_status();
-
 	pch_finalize();
 
 	printk(BIOS_DEBUG, "Finalizing SMM.\n");

src/soc/intel/cannonlake/include/soc/me.h

diff --git a/src/soc/intel/cannonlake/include/soc/me.h b/src/soc/intel/cannonlake/include/soc/me.h
index 1d782c1..5b411d3 100644
--- a/src/soc/intel/cannonlake/include/soc/me.h
+++ b/src/soc/intel/cannonlake/include/soc/me.h
@@ -16,6 +16,6 @@
 #ifndef _CANNONLAKE_ME_H_
 #define _CANNONLAKE_ME_H_
 
-void dump_me_status(void);
+void dump_me_status(void *unused);
 
 #endif /* _CANNONLAKE_ME_H_ */

src/soc/intel/cannonlake/me.c

diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index 3fedc63..c9748b7 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -235,7 +235,7 @@
 }
 BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_EXIT, print_me_version, NULL);
 
-void dump_me_status(void)
+void dump_me_status(void *unused)
 {
 	union hfsts1 hfsts1;
 	union hfsts2 hfsts2;
@@ -297,3 +297,6 @@
 	printk(BIOS_DEBUG, "ME: TXT Support             : %s\n",
 		hfsts6.fields.txt_support ? "YES" : "NO");
 }
+
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_ENTRY, dump_me_status, NULL);
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME_CHECK, BS_ON_EXIT, dump_me_status, NULL);