diff options
| author | Wei-Ning Huang <wnhuang@google.com> | 2017-05-08 08:02:06 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-05-10 02:08:30 -0700 |
| commit | d3b49deb809faee08137219bf3184abfacad2a76 (patch) | |
| tree | 1877c6b1825139589c6fa3314dbd40c690f35813 | |
| parent | 375b60776156036ef458069c408e5ed4b24692f0 (diff) | |
| download | chrome-ec-d3b49deb809faee08137219bf3184abfacad2a76.tar.gz | |
rwsig: protect flash with EC_FLASH_PROTECT_ALL_NOW whenever possible
Use EC_FLASH_PROTECT_ALL_NOW to protect all flash before jump if
posisble. If EC_FLASH_PROTECT_ALL_NOW does not work, try
EC_FLASH_PROTECT_ALL_AT_BOOT next.
BUG=b:37584134
TEST=on rose:
1) `flashwp enable`
2) `reboot`
3) `flashinfo` flags contains 'all_now'
Change-Id: I2773410e97fae082fc6c20d47bdae3d991c57063
Reviewed-on: https://chromium-review.googlesource.com/497155
Commit-Ready: Wei-Ning Huang <wnhuang@chromium.org>
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | common/rwsig.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/common/rwsig.c b/common/rwsig.c index 31174798a2..1471008122 100644 --- a/common/rwsig.c +++ b/common/rwsig.c @@ -36,23 +36,30 @@ void rwsig_jump_now(void) { /* Protect all flash before jumping to RW. */ + /* This may do nothing if WP is not enabled, RO is not protected. */ + flash_set_protect(EC_FLASH_PROTECT_ALL_NOW, -1); + /* - * This may do nothing if WP is not enabled, RO is not - * protected, or if ALL_AT_BOOT is already set. + * For chips that does not support EC_FLASH_PROTECT_ALL_NOW, use + * EC_FLASH_PROTECT_ALL_AT_BOOT. */ - flash_set_protect(EC_FLASH_PROTECT_ALL_AT_BOOT, -1); - - if (!(flash_get_protect() & EC_FLASH_PROTECT_ALL_NOW) && - flash_get_protect() & EC_FLASH_PROTECT_ALL_AT_BOOT) { - /* - * If flash protection is still not enabled (some chips may - * be able to enable it immediately), reboot. - */ - cflush(); - system_reset(SYSTEM_RESET_HARD | SYSTEM_RESET_PRESERVE_FLAGS); + if (system_is_locked() && + !(flash_get_protect() & EC_FLASH_PROTECT_ALL_NOW)) { + flash_set_protect(EC_FLASH_PROTECT_ALL_AT_BOOT, -1); + + if (!(flash_get_protect() & EC_FLASH_PROTECT_ALL_NOW) && + flash_get_protect() & EC_FLASH_PROTECT_ALL_AT_BOOT) { + /* + * If flash protection is still not enabled (some chips + * may be able to enable it immediately), reboot. + */ + cflush(); + system_reset(SYSTEM_RESET_HARD | + SYSTEM_RESET_PRESERVE_FLAGS); + } } - /* When system is locked, only boot to RW is all flash is protected. */ + /* When system is locked, only boot to RW if all flash is protected. */ if (!system_is_locked() || flash_get_protect() & EC_FLASH_PROTECT_ALL_NOW) system_run_image_copy(SYSTEM_IMAGE_RW); |