diff options
| author | Bohdan Tymkiv <bhdt@cypress.com> | 2018-12-05 11:57:26 +0200 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2018-12-12 18:13:00 +0000 |
| commit | 02279e2f5e99885106bbd3acbb5926b3f2146296 (patch) | |
| tree | b52259021e87b41fb9281e1ff02c8c1528b86010 | |
| parent | f197483f571ac537b97de721012ba1253d2a8542 (diff) | |
flash/nor/core: Fix chunk size calculation in default_flash_mem_blank_check
Slow version of blank check procedure reads target memory sector-by-sector
using 1 KB chunks. Due to bug in chunk size calculation algorithm the actual
size of the chunk is always 1 KB even if sector size is smaller.
This causes out-of-boundary read of the last sector.
Steps to reproduce:
1) Use target with small sectors (e.g. psoc6 with 512-byte sectors)
2) set WORKAREASIZE_CM0 0
3) flash erase_check 1
Running slow fallback erase check - add working memory
Info : SWD DPIDR 0x6ba02477
Error: Failed to read memory at 0x14008000
unknown error when checking erase state of flash bank #1 at 0x14000000
Bank is erased
Change-Id: I03d0d5fb3a1950ae6aac425f5e24c7fd94b38325
Signed-off-by: Bohdan Tymkiv <bhdt@cypress.com>
Reviewed-on: http://openocd.zylin.com/4785
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
| -rw-r--r-- | src/flash/nor/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c index 0aaa7d26..c541afcd 100644 --- a/src/flash/nor/core.c +++ b/src/flash/nor/core.c @@ -322,8 +322,8 @@ static int default_flash_mem_blank_check(struct flash_bank *bank) for (j = 0; j < bank->sectors[i].size; j += buffer_size) { uint32_t chunk; chunk = buffer_size; - if (chunk > (j - bank->sectors[i].size)) - chunk = (j - bank->sectors[i].size); + if (chunk > (bank->sectors[i].size - j)) + chunk = (bank->sectors[i].size - j); retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, |