aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/cannonlake/finalize.c3
-rw-r--r--src/soc/intel/cannonlake/include/soc/me.h2
-rw-r--r--src/soc/intel/cannonlake/me.c5
3 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index eb4c5c2c9d..4dfd15bc4a 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 @@ static void soc_finalize(void *unused)
{
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 1d782c153c..5b411d3621 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 3fedc6374e..c9748b7343 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -235,7 +235,7 @@ fail:
}
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 @@ void dump_me_status(void)
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);