interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve TDO stuck high/low checks. 

Change-Id: I89fcfcfa9dacceba8144a7cddb1cbe1480fe5fd7
This commit is contained in:
Tim Newsome 2018-06-20 14:39:36 -07:00
parent f896522fba
commit 7605e44bcd
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,7 +544,8 @@ static int dmi_op_timeout(struct target *target, uint32_t *data_in, int dmi_op,
status = dmi_scan(target, &address_in, data_in, dmi_op, address, status = dmi_scan(target, &address_in, data_in, dmi_op, address,
data_out, false); data_out, false);
LOG_DEBUG("address_in=0x%x; data_in=0x%x", address_in, *data_in); LOG_DEBUG("address_in=0x%x; data_in=0x%x", address_in, *data_in);
if (address_in == (1U << info->abits) - 1 && *data_in == 0xffffffff) { if (status == 3 && address_in == (1U << info->abits) - 1 &&
*data_in == 0xffffffff) {
LOG_ERROR("TDO seems to be stuck high; target might be held in " LOG_ERROR("TDO seems to be stuck high; target might be held in "
"reset, or there might be a connection failure"); "reset, or there might be a connection failure");
return ERROR_FAIL; return ERROR_FAIL;
@ -571,7 +572,19 @@ static int dmi_op_timeout(struct target *target, uint32_t *data_in, int dmi_op,
while (1) { while (1) {
status = dmi_scan(target, &address_in, data_in, DMI_OP_NOP, address, 0, status = dmi_scan(target, &address_in, data_in, DMI_OP_NOP, address, 0,
false); false);
if (status == DMI_STATUS_BUSY) { if (status == 3 && address_in == (1U << info->abits) - 1 &&
*data_in == 0xffffffff) {
LOG_ERROR("TDO seems to be stuck high; target might be held in "
"reset, or there might be a connection failure");
return ERROR_FAIL;
} else if (dmi_op == DMI_OP_READ && address != 0 && status == 0 &&
address_in == 0 && *data_in == 0) {
/* On read ops we should at least get back the address as non-zero.
* */
LOG_ERROR("TDO seems to be stuck low; target might be held in "
"reset, or there might be a connection failure");
return ERROR_FAIL;
} else if (status == DMI_STATUS_BUSY) {
increase_dmi_busy_delay(target); increase_dmi_busy_delay(target);
} else if (status == DMI_STATUS_SUCCESS) { } else if (status == DMI_STATUS_SUCCESS) {
break; break;