diff options
| author | Sergii Dmytruk <sergii.dmytruk@3mdeb.com> | 2021-12-19 18:45:16 +0200 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2022-04-29 00:54:42 +0000 |
| commit | bfbec45de0963b76081f5ff95681ce887ba1ef90 (patch) | |
| tree | f1cd56b2c6e4f42837071338218f7fd6c67a2825 | |
| parent | dbbe1588b208204e19acebfb8b579bbdbe2e145e (diff) | |
| download | flashrom-git-bfbec45de0963b76081f5ff95681ce887ba1ef90.tar.gz | |
writeprotect: add WPS bit and always set it to zero
WPS bit controls use of individual block protection which is mutually
exclusive with protection based on ranges. Proper support requires
extension of the API as well as implementation, so here we're just
making sure that range-based protection is enabled and our WP
configuration is not ignored by the chip.
Change-Id: I2c26ec65d64a3b6fb1f1a73690bc771415db2744
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/60231
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
| -rw-r--r-- | flash.h | 3 | ||||
| -rw-r--r-- | writeprotect.c | 6 |
2 files changed, 9 insertions, 0 deletions
@@ -307,6 +307,9 @@ struct flashchip { /* Complement bit (CMP) */ struct reg_bit_info cmp; + + /* Write Protect Selection (per sector protection when set) */ + struct reg_bit_info wps; } reg_bits; /* Function that takes a set of WP config bits (e.g. BP, SEC, TB, etc) */ diff --git a/writeprotect.c b/writeprotect.c index 58935932..ab6b1761 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -73,6 +73,8 @@ static enum flashrom_wp_result read_wp_bits(struct wp_bits *bits, struct flashct if (ret != FLASHROM_WP_OK) return ret; + /* Note: WPS bit isn't read here, because it's not part of any range. */ + for (i = 0; i < ARRAY_SIZE(bits->bp); i++) { if (bit_map->bp[i].reg == INVALID_REG) break; @@ -115,6 +117,8 @@ static enum flashrom_wp_result write_wp_bits(struct flashctx *flash, struct wp_b set_reg_bit(reg_values, write_masks, reg_bits->cmp, bits.cmp); set_reg_bit(reg_values, write_masks, reg_bits->srp, bits.srp); set_reg_bit(reg_values, write_masks, reg_bits->srl, bits.srl); + /* Note: always setting WPS bit to zero until its fully supported. */ + set_reg_bit(reg_values, write_masks, reg_bits->wps, 0); /* Write each register */ for (enum flash_reg reg = STATUS1; reg < MAX_REGISTERS; reg++) { @@ -253,6 +257,8 @@ static enum flashrom_wp_result get_ranges_and_wp_bits(struct flashctx *flash, st *count = 1 << bit_count; *ranges = calloc(*count, sizeof(struct wp_range_and_bits)); + /* TODO: take WPS bit into account. */ + for (size_t range_index = 0; range_index < *count; range_index++) { /* * Extract bits from the range index and assign them to members |