diff options
Diffstat (limited to 'common/ap_ro_integrity_check.c')
| -rw-r--r-- | common/ap_ro_integrity_check.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/common/ap_ro_integrity_check.c b/common/ap_ro_integrity_check.c index 986fa8676f..8c12e851a4 100644 --- a/common/ap_ro_integrity_check.c +++ b/common/ap_ro_integrity_check.c @@ -497,8 +497,7 @@ static int verify_keyblock(const struct kb_container *kbc, /* Clear validate_ap_ro_boot state. */ void ap_ro_device_reset(void) { - if (apro_result == AP_RO_NOT_RUN || apro_result == AP_RO_IN_PROGRESS || - ec_rst_override()) + if (apro_result == AP_RO_NOT_RUN || ec_rst_override()) return; CPRINTS("%s: clear apro result", __func__); apro_result = AP_RO_NOT_RUN; @@ -1399,7 +1398,6 @@ static void keep_ec_in_reset(void) hook_call_deferred(&keep_ec_in_reset_data, 100 * MSEC); } - static void release_ec_reset_override(void) { hook_call_deferred(&keep_ec_in_reset_data, -1); @@ -1421,7 +1419,6 @@ static uint8_t do_ap_ro_check(void) enum ap_ro_check_vc_errors support_status; bool v1_record_found; - apro_result = AP_RO_IN_PROGRESS; support_status = ap_ro_check_unsupported(true); if ((support_status == ARCVE_BOARD_ID_BLOCKED) || (support_status == ARCVE_FLASH_READ_FAILED)) { @@ -1486,9 +1483,9 @@ static uint8_t do_ap_ro_check(void) return EC_ERROR_UNIMPLEMENTED; } - apro_result = AP_RO_PASS_UNVERIFIED_GBB; + apro_result = AP_RO_PASS; ap_ro_add_flash_event(APROF_CHECK_SUCCEEDED); - CPRINTS("AP RO PASS!"); + CPRINTS("AP RO verification SUCCEEDED!"); release_ec_reset_override(); return EC_SUCCESS; |