diff options
author | Nicolas Boichat <drinkcat@google.com> | 2017-02-13 17:17:01 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-02-23 19:06:16 -0800 |
commit | 83cf8d0a7a3e952da34740b9a1e255eaa64395af (patch) | |
tree | 0e14cd038b2b1e49998d8b0ef9fc8fecaee54851 /chip/stm32 | |
parent | ed396c5efbadefaf7b6a7dee64258f063f4b9fd3 (diff) | |
download | chrome-ec-83cf8d0a7a3e952da34740b9a1e255eaa64395af.tar.gz |
flash: Add EC_FLASH_PROTECT_RW_[AT_BOOT|NOW] flagsstabilize-9313.B
The idea of this flag is to be able to protect/unprotect only the
RW portion of the flash. In the (usual) case where ALL=RO+RW, with
no other region, this makes no difference compared to the existing
EC_FLASH_PROTECT_ALL_* flag, and this flag may not be supported.
This is necessary for futher work, where a ROLLBACK region is added,
so that RW/ROLLBACK can be protected/unprotected individually.
Only support for stm32f0 is added, as this is the target for hammer.
BRANCH=none
BUG=chrome-os-partner:61671
TEST=build and flash hammer (stm32f072)
flashinfo => RO+RW not protected
flashwp true; reboot => only RO protected
flashwp all; reboot => RO+RW protected
flashwp noall; reboot => only RO protected
flashwp rw/norw not available
TEST=enable CONFIG_FLASH_PROTECT_RW
build and flash hammer (stm32f072)
flashinfo => RO+RW not protected
flashwp true; reboot => only RO protected
flashwp all; reboot => RO+RW protected
flashwp noall; reboot => only RO protected
flashwp rw; reboot => RO+RW protected
flashwp norw; reboot => only RO protected
TEST=build and flash reef (npcx)
flashinfo => RO+RW not protected
flashwp true => RO protected
flashwp all; flashinfo => all_now displayed
reboot => RO protected
flashwp rw/norw not available
Change-Id: Ica6f499cf2e8a9345b08ef52c915655a983ffe3c
Reviewed-on: https://chromium-review.googlesource.com/442265
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip/stm32')
-rw-r--r-- | chip/stm32/flash-f.c | 13 | ||||
-rw-r--r-- | chip/stm32/flash-stm32f0.c | 86 |
2 files changed, 95 insertions, 4 deletions
diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c index 0c99ec398d..2ab05859fa 100644 --- a/chip/stm32/flash-f.c +++ b/chip/stm32/flash-f.c @@ -356,6 +356,10 @@ int flash_physical_protect_at_boot(uint32_t new_flags) if (block >= WP_BANK_OFFSET && block < WP_BANK_OFFSET + WP_BANK_COUNT) protect |= new_flags & EC_FLASH_PROTECT_RO_AT_BOOT; +#ifdef CONFIG_FLASH_PROTECT_RW + else + protect |= new_flags & EC_FLASH_PROTECT_RW_AT_BOOT; +#endif if (protect) val[byte_off] = val[byte_off] & (~(1 << (block % 8))); @@ -476,6 +480,15 @@ int flash_pre_init(void) need_reset = 1; } +#ifdef CONFIG_FLASH_PROTECT_RW + if ((flash_physical_get_valid_flags() & EC_FLASH_PROTECT_RW_AT_BOOT) && + (!!(prot_flags & EC_FLASH_PROTECT_RW_AT_BOOT) != + !!(prot_flags & EC_FLASH_PROTECT_RW_NOW))) { + /* RW_AT_BOOT and RW_NOW do not match. */ + need_reset = 1; + } +#endif + if (need_reset) system_reset(SYSTEM_RESET_HARD | SYSTEM_RESET_PRESERVE_FLAGS); diff --git a/chip/stm32/flash-stm32f0.c b/chip/stm32/flash-stm32f0.c index 229fd108af..e047854d0a 100644 --- a/chip/stm32/flash-stm32f0.c +++ b/chip/stm32/flash-stm32f0.c @@ -8,6 +8,7 @@ #include "common.h" #include "flash.h" #include "registers.h" +#include "util.h" /*****************************************************************************/ /* Physical layer APIs */ @@ -17,6 +18,10 @@ int flash_physical_get_protect(int block) return !(STM32_FLASH_WRPR & (1 << block)); } +/* + * Note: This does not need to update _NOW flags, as get_protect_flags + * in common code already does so. + */ uint32_t flash_physical_get_protect_flags(void) { uint32_t flags = 0; @@ -25,8 +30,71 @@ uint32_t flash_physical_get_protect_flags(void) uint32_t wrp23 = REG32(STM32_OPTB_BASE + STM32_OPTB_WRP23); #endif - if (STM32_FLASH_WRPR == 0) - flags |= EC_FLASH_PROTECT_ALL_NOW; + /* + * We only need to return detailed flags if we want to protect RW or + * ROLLBACK independently (EC_FLASH_PROTECT_RO_AT_BOOT should be set + * by pstate logic). + */ +#if defined(CONFIG_FLASH_PROTECT_RW) + /* Flags that must be set for each region. */ + const int mask_flags[] = { + [FLASH_REGION_RW] = EC_FLASH_PROTECT_RW_AT_BOOT, + [FLASH_REGION_RO] = EC_FLASH_PROTECT_RO_AT_BOOT, + }; + /* + * Sets up required mask for wrp01/23 registers: for protection to be + * set, values set in the mask must be zeros, values in the mask << 8 + * must be ones. + * + * Note that these masks are actually static, and could be precomputed + * at build time to save flash space. + */ + uint32_t wrp_mask[FLASH_REGION_COUNT][2]; + int i; + int shift = 0; + int reg = 0; + + memset(wrp_mask, 0, sizeof(wrp_mask)); + + /* Scan flash protection */ + for (i = 0; i < PHYSICAL_BANKS; i++) { + /* Default: RW. */ + int region = FLASH_REGION_RW; + + if (i >= WP_BANK_OFFSET && + i < WP_BANK_OFFSET + WP_BANK_COUNT) + region = FLASH_REGION_RO; + + switch (i) { + case 8: +#if CONFIG_FLASH_SIZE > 64 * 1024 + case 24: +#endif + shift += 8; + break; +#if CONFIG_FLASH_SIZE > 64 * 1024 + case 16: + reg = 1; + shift = 0; + break; +#endif + } + + wrp_mask[region][reg] |= 1 << shift; + shift++; + } + + for (i = 0; i < FLASH_REGION_COUNT; i++) { + if (!(wrp01 & wrp_mask[i][0]) && + (wrp01 & wrp_mask[i][0] << 8) == (wrp_mask[i][0] << 8)) +#if CONFIG_FLASH_SIZE > 64 * 1024 + if (!(wrp23 & wrp_mask[i][1]) && + (wrp23 & wrp_mask[i][1] << 8) == + (wrp_mask[i][1] << 8)) +#endif + flags |= mask_flags[i]; + } +#endif /* CONFIG_FLASH_PROTECT_RW */ if (wrp01 == 0xff00ff00) #if CONFIG_FLASH_SIZE > 64 * 1024 @@ -51,8 +119,12 @@ int flash_physical_restore_state(void) uint32_t flash_physical_get_valid_flags(void) { return EC_FLASH_PROTECT_RO_AT_BOOT | - EC_FLASH_PROTECT_ALL_AT_BOOT | EC_FLASH_PROTECT_RO_NOW | +#ifdef CONFIG_FLASH_PROTECT_RW + EC_FLASH_PROTECT_RW_AT_BOOT | + EC_FLASH_PROTECT_RW_NOW | +#endif + EC_FLASH_PROTECT_ALL_AT_BOOT | EC_FLASH_PROTECT_ALL_NOW; } @@ -65,12 +137,18 @@ uint32_t flash_physical_get_writable_flags(uint32_t cur_flags) ret |= EC_FLASH_PROTECT_RO_AT_BOOT; /* - * RW at-boot state can be set if WP GPIO is asserted and can always + * ALL/RW at-boot state can be set if WP GPIO is asserted and can always * be cleared. */ if (cur_flags & (EC_FLASH_PROTECT_ALL_AT_BOOT | EC_FLASH_PROTECT_GPIO_ASSERTED)) ret |= EC_FLASH_PROTECT_ALL_AT_BOOT; +#ifdef CONFIG_FLASH_PROTECT_RW + if (cur_flags & (EC_FLASH_PROTECT_RW_AT_BOOT | + EC_FLASH_PROTECT_GPIO_ASSERTED)) + ret |= EC_FLASH_PROTECT_RW_AT_BOOT; +#endif + return ret; } |