diff options
| author | Nikolai Artemiev <nartemiev@google.com> | 2022-04-27 10:24:10 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-05-23 00:24:32 +0000 |
| commit | b86ae179adfb4acb4190ef2abe2ee8905c44f26a (patch) | |
| tree | 4524646360a3e55d148a49564cfcb7ed3225f07d /flashrom.c | |
| parent | 6f781bdaea5cbd8c315930f3bcf5b69cfd06d504 (diff) | |
| download | flashrom-b86ae179adfb4acb4190ef2abe2ee8905c44f26a.tar.gz flashrom-b86ae179adfb4acb4190ef2abe2ee8905c44f26a.tar.bz2 flashrom-b86ae179adfb4acb4190ef2abe2ee8905c44f26a.zip | |
flashrom: initialize restore func count in correct place
Set `flash->chip_restore_fn_count` to zero before calling the chip's
unlock funciton in `prepare_flash_access()`.
Previously `flash->chip_restore_fn_count` was uninitialized before
calling `chip->unlock()` and subsequently reset after the dispatch by
initializing it. This caused the restore handler that is registered
within `spi_disable_blockprotect_generic()` to be lost.
BUG=b:228945411
BRANCH=none
TEST=enable wp; flashrom -w; check wp still enabled.
Change-Id: I4c7df424bd2ae2b5fb2a2ab6b47a3c9ff3233acf
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/63881
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'flashrom.c')
| -rw-r--r-- | flashrom.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/flashrom.c b/flashrom.c index 7f5448859..8d6b3db1d 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1825,6 +1825,9 @@ int prepare_flash_access(struct flashctx *const flash, if (map_flash(flash) != 0) return 1; + /* Initialize chip_restore_fn_count before chip unlock calls. */ + flash->chip_restore_fn_count = 0; + /* Given the existence of read locks, we want to unlock for read, erase and write. */ if (flash->chip->unlock) @@ -1832,7 +1835,6 @@ int prepare_flash_access(struct flashctx *const flash, flash->address_high_byte = -1; flash->in_4ba_mode = false; - flash->chip_restore_fn_count = 0; /* Be careful about 4BA chips and broken masters */ if (flash->chip->total_size > 16 * 1024 && spi_master_no_4ba_modes(flash)) { |