summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-02-22 23:39:43 -0800
committerFurquan Shaikh <furquan@google.com>2018-02-28 02:19:02 +0000
commit51700313f547f0b68e6e4945d4e300eadb16e3ac (patch)
tree7e5385d38b74917b8e5d5cfa086df053d117233a
parentd2d2aef6a3222af909183fb96dc7bc908fac3cd4 (diff)
downloadcoreboot-51700313f547f0b68e6e4945d4e300eadb16e3ac.tar.xz
soc/intel/skylake: Add support to print ME version
This change adds a boot state callback to print ME version after DEV_ENABLE is complete. Information is printed only if UART_DEBUG is enabled because talking to ME to get the firmware version adds ~1 second to boot time. TEST=Verified on Soraka that ME version printed is correct. Change-Id: I360d5d7420950d5aa255df08be6d7123621b87a8 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/23857 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Julien Viard de Galbert <jviarddegalbert@online.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/intel/skylake/include/soc/me.h4
-rw-r--r--src/soc/intel/skylake/me.c74
2 files changed, 78 insertions, 0 deletions
diff --git a/src/soc/intel/skylake/include/soc/me.h b/src/soc/intel/skylake/include/soc/me.h
index e4b6abf193..590bfb722d 100644
--- a/src/soc/intel/skylake/include/soc/me.h
+++ b/src/soc/intel/skylake/include/soc/me.h
@@ -202,9 +202,13 @@ union me_hfs6 {
} __packed fields;
};
+#define MKHI_GEN_GROUP_ID 0xff
+
/* Reset Request */
#define MKHI_GLOBAL_RESET 0x0b
+#define MKHI_GET_FW_VERSION 0x02
+
#define GR_ORIGIN_BIOS_MEM_INIT 0x01
#define GR_ORIGIN_BIOS_POST 0x02
#define GR_ORIGIN_MEBX 0x03
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 2569bcff00..67d7bc0362 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -14,6 +14,7 @@
*/
#include <arch/io.h>
+#include <bootstate.h>
#include <commonlib/helpers.h>
#include <compiler.h>
#include <console/console.h>
@@ -203,6 +204,79 @@ static const char * const me_progress_bup_values[] = {
"M0 kernel load",
};
+static void print_me_version(void *unused)
+{
+ struct mkhi_hdr {
+ uint8_t group_id;
+ uint8_t command:7;
+ uint8_t is_resp:1;
+ uint8_t rsvd;
+ uint8_t result;
+ } __packed;
+
+ struct version {
+ uint16_t minor;
+ uint16_t major;
+ uint16_t build;
+ uint16_t hotfix;
+ } __packed;
+
+ struct fw_ver_resp {
+ struct mkhi_hdr hdr;
+ struct version code;
+ struct version rec;
+ struct version fitc;
+ } __packed;
+
+ const struct mkhi_hdr fw_ver_msg = {
+ .group_id = MKHI_GEN_GROUP_ID,
+ .command = MKHI_GET_FW_VERSION,
+ };
+
+ struct fw_ver_resp resp;
+ size_t resp_size = sizeof(resp);
+ union me_hfs hfs;
+
+ /*
+ * Print ME version only if UART debugging is enabled. Else, it takes ~1
+ * second to talk to ME and get this information.
+ */
+ if (!IS_ENABLED(CONFIG_UART_DEBUG))
+ return;
+
+ hfs.data = me_read_config32(PCI_ME_HFSTS1);
+ /*
+ * This command can be run only if:
+ * - Working state is normal and
+ * - Operation mode is normal.
+ */
+ if ((hfs.fields.working_state != ME_HFS_CWS_NORMAL) ||
+ (hfs.fields.operation_mode != ME_HFS_MODE_NORMAL))
+ goto failed;
+
+ if (!heci_send(&fw_ver_msg, sizeof(fw_ver_msg), BIOS_HOST_ADD,
+ HECI_MKHI_ADD))
+ goto failed;
+
+ if (!heci_receive(&resp, &resp_size))
+ goto failed;
+
+ if (resp.hdr.result)
+ goto failed;
+
+ printk(BIOS_DEBUG, "ME: Version : %d.%d.%d.%d\n", resp.code.major,
+ resp.code.minor, resp.code.hotfix, resp.code.build);
+ return;
+
+failed:
+ printk(BIOS_DEBUG, "ME: Version : Unavailable\n");
+}
+/*
+ * This can't be put in intel_me_status because by the time control
+ * reaches there, ME doesn't respond to GET_FW_VERSION command.
+ */
+BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_EXIT, print_me_version, NULL);
+
void intel_me_status(void)
{
union me_hfs hfs;