sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rp: Refactor rp_flash_erase 

Always align erase length to 4k sector size.
Check that start address and length are actually inside the flash.
This commit is contained in:
James Turton 2022-06-14 17:17:05 +03:00 committed by Rachel Mant
parent dd571467b5
commit f4261c465e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/target/rp.c
View File

@ -216,22 +216,22 @@ static void rp_flash_resume(target *t)
static int rp_flash_erase(struct target_flash *f, target_addr addr, static int rp_flash_erase(struct target_flash *f, target_addr addr,
size_t len) size_t len)
{ {
DEBUG_INFO("Erase addr 0x%08" PRIx32 " len 0x%" PRIx32 "\n", addr, (uint32_t)len);
target *t = f->t;
if (addr & (FLASHSIZE_4K_SECTOR - 1)) { if (addr & (FLASHSIZE_4K_SECTOR - 1)) {
DEBUG_WARN("Unaligned erase\n"); DEBUG_WARN("Unaligned erase\n");
return -1; return -1;
} }
if (len & (FLASHSIZE_4K_SECTOR - 1)) { if ((addr < t->flash->start) || (addr >= t->flash->start + t->flash->length)) {
DEBUG_WARN("Unaligned len\n"); DEBUG_WARN("Address is invalid\n");
len = ALIGN(len, FLASHSIZE_4K_SECTOR); return -1;
} }
DEBUG_INFO("Erase addr 0x%08" PRIx32 " len 0x%" PRIx32 "\n", addr, (uint32_t)len);
target *t = f->t;
rp_flash_prepare(t);
struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage;
/* Register playground*/
/* erase */
addr -= t->flash->start; addr -= t->flash->start;
len = MIN(len, t->flash->length); len = ALIGN(len, FLASHSIZE_4K_SECTOR);
len = MIN(len, t->flash->length - addr);
struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage;
/* erase */
rp_flash_prepare(t);
bool ret = 0; bool ret = 0;
while (len) { while (len) {
if (len >= FLASHSIZE_64K_BLOCK) { if (len >= FLASHSIZE_64K_BLOCK) {