soc/intel: Treat time-out as failure in HECI
If HECI gets times out when waiting for read slots, there's no need to
read back reply message to decide if the HECI recieve successed or not.
Otherwise, system will stuck after global reset required.
BUG=b:707290799
TEST=Boot up meowth board without battery, and confirm hard reset got
trigged after heci time out.
Change-Id: I7c1655284d7027294d8ff5d6a5dbbebe4cbd0c47
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/22910
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c
index 03f9cb8..512fbbe 100644
--- a/src/soc/intel/cannonlake/reset.c
+++ b/src/soc/intel/cannonlake/reset.c
@@ -25,6 +25,7 @@
/* Reset Request */
#define MKHI_GLOBAL_RESET 0x0b
+#define MKHI_STATUS_SUCCESS 0
#define GR_ORIGIN_BIOS_MEM_INIT 0x01
#define GR_ORIGIN_BIOS_POST 0x02
@@ -67,13 +68,13 @@
reply_size = sizeof(reply);
memset(&reply, 0, reply_size);
- heci_receive(&reply, &reply_size);
- /* get reply result from HECI MSG */
- if (reply.result != 0) {
- printk(BIOS_DEBUG, "%s: Exit with Failure\n", __func__);
+ if (!heci_receive(&reply, &reply_size))
+ return -1;
+ if (reply.result != MKHI_STATUS_SUCCESS) {
+ printk(BIOS_DEBUG, "Returned Mkhi Status is not success!\n");
return -1;
}
- printk(BIOS_DEBUG, "%s: Exit with Success\n", __func__);
+ printk(BIOS_DEBUG, "Heci recieve success!\n");
return 0;
}
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 370074e..0ff999e 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -438,6 +438,10 @@
*/
do {
received = recv_one_message(&hdr, p, left);
+ if (!received) {
+ printk(BIOS_ERR, "HECI: Failed to recieve!\n");
+ return 0;
+ }
left -= received;
p += received;
/* If we read out everything ping to send more */