summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/google/wilco/commands.c43
-rw-r--r--src/ec/google/wilco/commands.h14
2 files changed, 46 insertions, 11 deletions
diff --git a/src/ec/google/wilco/commands.c b/src/ec/google/wilco/commands.c
index a97a28ecce..9d4170f539 100644
--- a/src/ec/google/wilco/commands.c
+++ b/src/ec/google/wilco/commands.c
@@ -182,8 +182,45 @@ int wilco_ec_signed_fw(void)
return !!ec_read(EC_RAM_SIGNED_FW);
}
-int wilco_ec_err_code(enum ec_err_code err_code)
+struct err_code_entry {
+ uint8_t post_code;
+ enum ec_err_code ec_err;
+};
+
+/*
+ * Any post codes not listed in the post_code_err_map[] use default.
+ */
+static const enum ec_err_code default_ec_err = DLED_ROM;
+static const struct err_code_entry post_code_err_map[] = {
+ { .post_code = POST_RAM_FAILURE, .ec_err = DLED_MEMORY, },
+ { .post_code = POST_VIDEO_FAILURE, .ec_err = DLED_PANEL, },
+};
+
+/* Records the most recent post code during boot */
+static uint8_t wilco_ec_saved_post_code;
+
+void wilco_ec_save_post_code(uint8_t post_code)
+{
+ wilco_ec_saved_post_code = post_code;
+}
+
+/* Send error code to the EC based on last saved post code */
+void die_notify(void)
{
- return wilco_ec_mailbox(WILCO_EC_MSG_DEFAULT, KB_ERR_CODE,
- &err_code, 1, NULL, 0);
+ size_t i;
+ enum ec_err_code err_code = default_ec_err;
+
+ for (i = 0; i < ARRAY_SIZE(post_code_err_map); i++) {
+ if (post_code_err_map[i].post_code ==
+ wilco_ec_saved_post_code) {
+ err_code = post_code_err_map[i].ec_err;
+ break;
+ }
+ }
+
+ printk(BIOS_EMERG, "Fatal error: post_code 0x%02x, EC err 0x%02x\n",
+ wilco_ec_saved_post_code, err_code);
+
+ wilco_ec_mailbox(WILCO_EC_MSG_DEFAULT, KB_ERR_CODE,
+ &err_code, 1, NULL, 0);
}
diff --git a/src/ec/google/wilco/commands.h b/src/ec/google/wilco/commands.h
index fafb7fd8ba..9b7f2e5d07 100644
--- a/src/ec/google/wilco/commands.h
+++ b/src/ec/google/wilco/commands.h
@@ -319,16 +319,14 @@ enum ec_acpi_wake_events {
int wilco_ec_signed_fw(void);
/**
- * wilco_ec_err_code
+ * wilco_ec_save_post_code
*
- * Send an error code to the EC to indicate a failed boot. The EC flashes the
- * platform LED amber and white to provide user indication of the failure type.
+ * Save this post code as the most recent progress step. If the boot fails
+ * and calls die_notify() this post code will be used to send an error code
+ * to the EC indicating the failure.
*
- * @err_code: Error code to send to the EC
- *
- * Returns 0 if EC command was successful
- * Returns -1 if EC command failed
+ * @post_code: Post code to save
*/
-int wilco_ec_err_code(enum ec_err_code err_code);
+void wilco_ec_save_post_code(uint8_t post_code);
#endif /* EC_GOOGLE_WILCO_COMMANDS_H */