zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash/nor/core: adjust flash_iterate_address_range_inner() for 64-bit 

Use target_addr_t exclusively for comparison of sector boudaries and
address range.

Use the last addres for both address range end and sector end.
It avoids problems with a flash bank mapped at the very end of
target address space.

Change-Id: Idf97c837453d97cbc4cf8a1c76ad799f4142f19e
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4985
Tested-by: jenkins
Reviewed-by: Tim Newsome <tim@sifive.com>
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
reverse-resume-order
Tomas Vanek 2019-03-02 09:51:23 +01:00 committed by Matthias Welwarsky
parent bc72695f67
commit 21ef7e30d4
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/flash/nor/core.c
View File

@ -422,7 +422,7 @@ static int flash_iterate_address_range_inner(struct target *target,
{ {
struct flash_bank *c; struct flash_bank *c;
struct flash_sector *block_array; struct flash_sector *block_array;
target_addr_t last_addr = addr + length; /* first address AFTER end */ target_addr_t last_addr = addr + length - 1; /* the last address of range */
int first = -1; int first = -1;
int last = -1; int last = -1;
int i; int i;
@ -448,7 +448,7 @@ static int flash_iterate_address_range_inner(struct target *target,
} }
/* check whether it all fits in this bank */ /* check whether it all fits in this bank */
if (addr + length - 1 > c->base + c->size - 1) { if (last_addr > c->base + c->size - 1) {
LOG_ERROR("Flash access does not fit into bank."); LOG_ERROR("Flash access does not fit into bank.");
return ERROR_FLASH_DST_BREAKS_ALIGNMENT; return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
} }
@ -466,21 +466,19 @@ static int flash_iterate_address_range_inner(struct target *target,
num_blocks = c->num_sectors; num_blocks = c->num_sectors;
} }
addr -= c->base;
last_addr -= c->base;
for (i = 0; i < num_blocks; i++) { for (i = 0; i < num_blocks; i++) {
struct flash_sector *f = &block_array[i]; struct flash_sector *f = &block_array[i];
uint32_t end = f->offset + f->size; target_addr_t sector_addr = c->base + f->offset;
target_addr_t sector_last_addr = sector_addr + f->size - 1;
/* start only on a sector boundary */ /* start only on a sector boundary */
if (first < 0) { if (first < 0) {
/* scanned past the first sector? */ /* scanned past the first sector? */
if (addr < f->offset) if (addr < sector_addr)
break; break;
/* is this the first sector? */ /* is this the first sector? */
if (addr == f->offset) if (addr == sector_addr)
first = i; first = i;
/* Does this need head-padding? If so, pad and warn; /* Does this need head-padding? If so, pad and warn;
@ -490,12 +488,12 @@ static int flash_iterate_address_range_inner(struct target *target,
* ever know if that data was in use. The warning * ever know if that data was in use. The warning
* should help users sort out messes later. * should help users sort out messes later.
*/ */
else if (addr < end && pad_reason) { else if (addr <= sector_last_addr && pad_reason) {
/* FIXME say how many bytes (e.g. 80 KB) */ /* FIXME say how many bytes (e.g. 80 KB) */
LOG_WARNING("Adding extra %s range, " LOG_WARNING("Adding extra %s range, "
"%#8.8x to " TARGET_ADDR_FMT, TARGET_ADDR_FMT " .. " TARGET_ADDR_FMT,
pad_reason, pad_reason,
(unsigned) f->offset, sector_addr,
addr - 1); addr - 1);
first = i; first = i;
} else } else
@ -503,7 +501,7 @@ static int flash_iterate_address_range_inner(struct target *target,
} }
/* is this (also?) the last sector? */ /* is this (also?) the last sector? */
if (last_addr == end) { if (last_addr == sector_last_addr) {
last = i; last = i;
break; break;
} }
@ -511,19 +509,19 @@ static int flash_iterate_address_range_inner(struct target *target,
/* Does this need tail-padding? If so, pad and warn; /* Does this need tail-padding? If so, pad and warn;
* or else force an error. * or else force an error.
*/ */
if (last_addr < end && pad_reason) { if (last_addr < sector_last_addr && pad_reason) {
/* FIXME say how many bytes (e.g. 80 KB) */ /* FIXME say how many bytes (e.g. 80 KB) */
LOG_WARNING("Adding extra %s range, " LOG_WARNING("Adding extra %s range, "
"%#8.8x to %#8.8x", TARGET_ADDR_FMT " .. " TARGET_ADDR_FMT,
pad_reason, pad_reason,
(unsigned) last_addr, last_addr + 1,
(unsigned) end - 1); sector_last_addr);
last = i; last = i;
break; break;
} }
/* MUST finish on a sector boundary */ /* MUST finish on a sector boundary */
if (last_addr <= f->offset) if (last_addr < sector_addr)
break; break;
} }
@ -531,8 +529,8 @@ static int flash_iterate_address_range_inner(struct target *target,
if (first == -1 || last == -1) { if (first == -1 || last == -1) {
LOG_ERROR("address range " TARGET_ADDR_FMT " .. " TARGET_ADDR_FMT LOG_ERROR("address range " TARGET_ADDR_FMT " .. " TARGET_ADDR_FMT
" is not sector-aligned", " is not sector-aligned",
c->base + addr, addr,
c->base + last_addr - 1); last_addr);
return ERROR_FLASH_DST_BREAKS_ALIGNMENT; return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
} }