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

rp: Switched to the unified mass erase command and added progress dots to stop GDB timing out

This commit is contained in:
dragonmux 2022-07-11 21:00:59 -04:00 committed by Piotr Esden-Tempski
parent ffd358824f
commit e9b75ba4bc
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/target/rp.c
View File

@ -138,8 +138,7 @@ static bool rp2040_fill_table(struct rp_priv_s *priv, uint16_t *table, int max)
* timout == 0: Do not wait for poll, use for reset_usb_boot() * timout == 0: Do not wait for poll, use for reset_usb_boot()
* timeout > 500 (ms) : display spinner * timeout > 500 (ms) : display spinner
*/ */
static bool rp_rom_call(target *t, uint32_t *regs, uint32_t cmd, static bool rp_rom_call(target *t, uint32_t *regs, uint32_t cmd, uint32_t timeout)
uint32_t timeout)
{ {
const char spinner[] = "|/-\\"; const char spinner[] = "|/-\\";
int spinindex = 0; int spinindex = 0;
@ -156,21 +155,21 @@ static bool rp_rom_call(target *t, uint32_t *regs, uint32_t cmd,
if (!timeout) if (!timeout)
return false; return false;
DEBUG_INFO("Call cmd %04" PRIx32 "\n", cmd); DEBUG_INFO("Call cmd %04" PRIx32 "\n", cmd);
platform_timeout to; platform_timeout operation_timeout;
platform_timeout_set(&to, timeout); platform_timeout_set(&operation_timeout, timeout);
platform_timeout to_spinner; platform_timeout spinner_timeout;
if (timeout > 500) if (timeout > 500)
platform_timeout_set(&to_spinner, 500); platform_timeout_set(&spinner_timeout, 500);
else else
/* never trigger if timeout is short */ /* never trigger if timeout is short */
platform_timeout_set(&to_spinner, timeout + 1); platform_timeout_set(&spinner_timeout, timeout + 1);
do { do {
if (platform_timeout_is_expired(&to_spinner)) { if (platform_timeout_is_expired(&spinner_timeout)) {
if (ps->is_monitor) if (ps->is_monitor)
tc_printf(t, "\b%c", spinner[spinindex++ % 4]); tc_printf(t, "\b%c", spinner[spinindex++ % 4]);
platform_timeout_set(&to_spinner, 500); platform_timeout_set(&spinner_timeout, 500);
} }
if (platform_timeout_is_expired(&to)) { if (platform_timeout_is_expired(&operation_timeout)) {
DEBUG_WARN("RP Run timout %d ms reached: ", (int)timeout); DEBUG_WARN("RP Run timout %d ms reached: ", (int)timeout);
break; break;
} }
@ -217,8 +216,7 @@ static void rp_flash_resume(target *t)
* chip erase 5000/25000 ms * chip erase 5000/25000 ms
* page programm 0.4/ 3 ms * page programm 0.4/ 3 ms
*/ */
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); DEBUG_INFO("Erase addr 0x%08" PRIx32 " len 0x%" PRIx32 "\n", addr, (uint32_t)len);
target *t = f->t; target *t = f->t;
@ -234,12 +232,16 @@ static int rp_flash_erase(struct target_flash *f, target_addr addr,
len = ALIGN(len, FLASHSIZE_4K_SECTOR); len = ALIGN(len, FLASHSIZE_4K_SECTOR);
len = MIN(len, t->flash->length - addr); len = MIN(len, t->flash->length - addr);
struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage; struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage;
const bool full_erase = addr == f->start && len == f->length;
platform_timeout timeout;
platform_timeout_set(&timeout, 500);
/* erase */ /* erase */
rp_flash_prepare(t); rp_flash_prepare(t);
bool ret = 0; bool ret = 0;
while (len) { while (len) {
if (len >= FLASHSIZE_64K_BLOCK) { if (len >= FLASHSIZE_64K_BLOCK) {
uint32_t chunk = len & ~(FLASHSIZE_64K_BLOCK - 1); const uint32_t chunk = len & ~(FLASHSIZE_64K_BLOCK - 1U);
ps->regs[0] = addr; ps->regs[0] = addr;
ps->regs[1] = chunk; ps->regs[1] = chunk;
ps->regs[2] = FLASHSIZE_64K_BLOCK; ps->regs[2] = FLASHSIZE_64K_BLOCK;
@ -249,7 +251,7 @@ static int rp_flash_erase(struct target_flash *f, target_addr addr,
len -= chunk ; len -= chunk ;
addr += chunk; addr += chunk;
} else if (len >= FLASHSIZE_32K_BLOCK) { } else if (len >= FLASHSIZE_32K_BLOCK) {
uint32_t chunk = len & ~(FLASHSIZE_32K_BLOCK - 1); const uint32_t chunk = len & ~(FLASHSIZE_32K_BLOCK - 1U);
ps->regs[0] = addr; ps->regs[0] = addr;
ps->regs[1] = chunk; ps->regs[1] = chunk;
ps->regs[2] = FLASHSIZE_32K_BLOCK; ps->regs[2] = FLASHSIZE_32K_BLOCK;
@ -271,14 +273,15 @@ static int rp_flash_erase(struct target_flash *f, target_addr addr,
DEBUG_WARN("Erase failed!\n"); DEBUG_WARN("Erase failed!\n");
break; break;
} }
if (full_erase)
target_print_progress(&timeout);
} }
rp_flash_resume(t); rp_flash_resume(t);
DEBUG_INFO("Erase done!\n"); DEBUG_INFO("Erase done!\n");
return ret; return ret;
} }
static int rp_flash_write(struct target_flash *f, static int rp_flash_write(struct target_flash *f, target_addr dest, const void *src, size_t len)
target_addr dest, const void *src, size_t len)
{ {
DEBUG_INFO("RP Write 0x%08" PRIx32 " len 0x%" PRIx32 "\n", dest, (uint32_t)len); DEBUG_INFO("RP Write 0x%08" PRIx32 " len 0x%" PRIx32 "\n", dest, (uint32_t)len);
target *t = f->t; target *t = f->t;
@ -333,23 +336,19 @@ static bool rp_cmd_reset_usb_boot(target *t, int argc, const char *argv[])
return true; return true;
} }
static bool rp_cmd_erase_mass(target *t, int argc, const char *argv[]) static bool rp_mass_erase(target *t)
{ {
(void) argc;
(void) argv;
struct target_flash f;
f.t = t;
struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage; struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage;
ps->is_monitor = true; ps->is_monitor = true;
bool res = (rp_flash_erase(&f, t->flash->start, t->flash->length)) ? false: true; const bool result = rp_flash_erase(t->flash, t->flash->start, t->flash->length) == 0;
ps->is_monitor = false; ps->is_monitor = false;
return res; return result;
} }
static bool rp_cmd_erase_sector(target *t, int argc, const char *argv[]) static bool rp_cmd_erase_sector(target *t, int argc, const char *argv[])
{ {
uint32_t length = t->flash->length;
uint32_t start = t->flash->start; uint32_t start = t->flash->start;
uint32_t length;
if (argc == 3) { if (argc == 3) {
start = strtoul(argv[1], NULL, 0); start = strtoul(argv[1], NULL, 0);
@ -360,17 +359,14 @@ static bool rp_cmd_erase_sector(target *t, int argc, const char *argv[])
else else
return -1; return -1;
struct target_flash f;
f.t = t;
struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage; struct rp_priv_s *ps = (struct rp_priv_s*)t->target_storage;
ps->is_monitor = true; ps->is_monitor = true;
bool res = (rp_flash_erase(&f, start, length)) ? false: true; const bool result = rp_flash_erase(t->flash, start, length) == 0;
ps->is_monitor = false; ps->is_monitor = false;
return res; return result;
} }
const struct command_s rp_cmd_list[] = { const struct command_s rp_cmd_list[] = {
{"erase_mass", rp_cmd_erase_mass, "Erase entire flash memory"},
{"erase_sector", rp_cmd_erase_sector, "Erase a sector: [start address] length" }, {"erase_sector", rp_cmd_erase_sector, "Erase a sector: [start address] length" },
{"reset_usb_boot", rp_cmd_reset_usb_boot, "Reboot the device into BOOTSEL mode"}, {"reset_usb_boot", rp_cmd_reset_usb_boot, "Reboot the device into BOOTSEL mode"},
{NULL, NULL, NULL} {NULL, NULL, NULL}
@ -519,6 +515,7 @@ bool rp_probe(target *t)
} }
t->target_storage = (void*)priv_storage; t->target_storage = (void*)priv_storage;
t->mass_erase = rp_mass_erase;
t->driver = RP_ID; t->driver = RP_ID;
t->target_options |= CORTEXM_TOPT_INHIBIT_NRST; t->target_options |= CORTEXM_TOPT_INHIBIT_NRST;
t->attach = rp_attach; t->attach = rp_attach;
@ -530,8 +527,7 @@ bool rp_probe(target *t)
static bool rp_rescue_do_reset(target *t) static bool rp_rescue_do_reset(target *t)
{ {
ADIv5_AP_t *ap = (ADIv5_AP_t *)t->priv; ADIv5_AP_t *ap = (ADIv5_AP_t *)t->priv;
ap->dp->low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_DP_CTRLSTAT, ap->dp->low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_DP_CTRLSTAT, ADIV5_DP_CTRLSTAT_CDBGPWRUPREQ);
ADIV5_DP_CTRLSTAT_CDBGPWRUPREQ);
ap->dp->low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_DP_CTRLSTAT, 0); ap->dp->low_access(ap->dp, ADIV5_LOW_WRITE, ADIV5_DP_CTRLSTAT, 0);
return false; return false;
} }
@ -551,5 +547,5 @@ void rp_rescue_probe(ADIv5_AP_t *ap)
t->attach = (void*)rp_rescue_do_reset; t->attach = (void*)rp_rescue_do_reset;
t->priv = ap; t->priv = ap;
t->priv_free = (void*)adiv5_ap_unref; t->priv_free = (void*)adiv5_ap_unref;
t->driver = "Raspberry RP2040 Rescue(Attach to reset!)"; t->driver = "Raspberry RP2040 Rescue (Attach to reset!)";
} }