interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #107 from riscv/infloop 

Add timeout to another infinite loop.
This commit is contained in:
Tim Newsome 2017-09-11 12:19:44 -07:00 committed by GitHub
parent 16efac59af f9b2549e20
commit 1cd8ecfdcd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/target/riscv/riscv-013.c
View File

@ -574,7 +574,7 @@ static int wait_for_idle(struct target *target, uint32_t *abstractcs)
errors[info->cmderr], *abstractcs); errors[info->cmderr], *abstractcs);
} }
LOG_ERROR("Timed out after %ds waiting for busy to go low. (abstractcs=0x%x)" LOG_ERROR("Timed out after %ds waiting for busy to go low (abstractcs=0x%x). "
"Increase the timeout with riscv set_command_timeout_sec.", "Increase the timeout with riscv set_command_timeout_sec.",
riscv_command_timeout_sec, riscv_command_timeout_sec,
*abstractcs); *abstractcs);
@ -1897,7 +1897,7 @@ void riscv013_reset_current_hart(struct target *target)
} }
if (time(NULL) - start > riscv_reset_timeout_sec) { if (time(NULL) - start > riscv_reset_timeout_sec) {
LOG_ERROR("Hart didn't halt coming out of reset in %ds; " LOG_ERROR("Hart didn't halt coming out of reset in %ds; "
"dmstatus=0x%x" "dmstatus=0x%x; "
"Increase the timeout with riscv set_reset_timeout_sec.", "Increase the timeout with riscv set_reset_timeout_sec.",
riscv_reset_timeout_sec, dmstatus); riscv_reset_timeout_sec, dmstatus);
return; return;
@ -2041,9 +2041,19 @@ int riscv013_debug_buffer_register(struct target *target, riscv_addr_t addr)
void riscv013_clear_abstract_error(struct target *target) void riscv013_clear_abstract_error(struct target *target)
{ {
// Wait for busy to go away. // Wait for busy to go away.
time_t start = time(NULL);
uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS); uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS);
while (get_field(abstractcs, DMI_ABSTRACTCS_BUSY)) { while (get_field(abstractcs, DMI_ABSTRACTCS_BUSY)) {
abstractcs = dmi_read(target, DMI_ABSTRACTCS); abstractcs = dmi_read(target, DMI_ABSTRACTCS);
if (time(NULL) - start > riscv_command_timeout_sec) {
LOG_ERROR("abstractcs.busy is not going low after %d seconds "
"(abstractcs=0x%x). The target is either really slow or "
"broken. You could increase the timeout with riscv "
"set_reset_timeout_sec.",
riscv_command_timeout_sec, abstractcs);
break;
}
} }
// Clear the error status. // Clear the error status.
dmi_write(target, DMI_ABSTRACTCS, abstractcs & DMI_ABSTRACTCS_CMDERR); dmi_write(target, DMI_ABSTRACTCS, abstractcs & DMI_ABSTRACTCS_CMDERR);