scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-11 02:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

rwsig: do not jump if reset source is hard pin reset

Browse Source 
According to the new MCU secure update model, EC should wait for host if
reset source is reset-pin.

BRANCH=none
BUG=b:37584134
TEST=on rose, toggle reset pin from host. EC should stay in RO, showing

     [0.426089 Hard pin-reset detected, disable RW jump]

     in console.

Change-Id: Ie1908cb0744773e2e3ca8b3d8c627b8a9ef4567f
Reviewed-on: https://chromium-review.googlesource.com/485199
Commit-Ready: Wei-Ning Huang <wnhuang@chromium.org>
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
This commit is contained in:
Wei-Ning Huang
2017-04-22 01:42:56 +08:00
committed by chrome-bot
parent 4bc509b060
commit ba105838f5
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/main.c
View File

@@ -168,9 +168,21 @@ test_mockable __keep int main(void)
*
* Only the Read-Only firmware needs to do the signature check.
*/
if (system_get_image_copy() == SYSTEM_IMAGE_RO &&
rwsig_check_signature())
rwsig_jump_now();
if (system_get_image_copy() == SYSTEM_IMAGE_RO) {
#if defined(CONFIG_RWSIG_DONT_CHECK_ON_PIN_RESET)
/*
* If system was reset by reset-pin, do not jump and wait for
* command from host
*/
if (system_get_reset_flags() == RESET_FLAG_RESET_PIN) {
CPRINTS("Hard pin-reset detected, disable RW jump");
} else
#endif
{
if (rwsig_check_signature())
rwsig_jump_now();
}
}
#endif
/*

6
include/config.h
View File

@@ -1818,6 +1818,12 @@
*/
#undef CONFIG_RWSIG
/*
* Disable rwsig jump when the reset source is hard pin-reset. This only work
* for the case where rwsig task is not used.
*/
#undef CONFIG_RWSIG_DONT_CHECK_ON_PIN_RESET
/*
* When RWSIG verification is performed as a task, time to wait from signature
* verification to an automatic jump to RW (if AP does not request the wait to