[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/cannonlake: Dump ME status info before notify EndOfFirmware

[Duncan Laurie (Code Review)]

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32991 )

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

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32991
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Tim Wawrzynczak 
---
M src/soc/intel/cannonlake/finalize.c
M src/soc/intel/cannonlake/include/soc/me.h
M src/soc/intel/cannonlake/me.c
3 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Subrata Banik: Looks good to me, but someone else must approve
  Tim Wawrzynczak: Looks good to me, approved

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");
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_ */
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);