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

Cope better if the target unexpectedly resets. 

Change-Id: I713f7f8a3afbbb02be0e2f19f4d32778366d37f9
__archive__
Tim Newsome 2016-11-25 09:46:55 -08:00
parent bb7dedcbaa
commit 7dd48acdc0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/target/riscv/riscv.c
View File

@ -722,22 +722,29 @@ static bits_t read_bits(struct target *target)
uint64_t value; uint64_t value;
dbus_status_t status; dbus_status_t status;
uint16_t address_in; uint16_t address_in;
riscv_info_t *info = (riscv_info_t *) target->arch_info;
bits_t err_result = {
.haltnot = 0,
.interrupt = 0
};
do { do {
unsigned i = 0; unsigned i = 0;
do { do {
status = dbus_scan(target, &address_in, &value, DBUS_OP_READ, 0, 0); status = dbus_scan(target, &address_in, &value, DBUS_OP_READ, 0, 0);
if (status == DBUS_STATUS_BUSY) { if (status == DBUS_STATUS_BUSY) {
if (address_in == (1<<info->addrbits) - 1 &&
value == (1ULL<<DBUS_DATA_SIZE) - 1) {
LOG_ERROR("TDO seems to be stuck high.");
return err_result;
}
increase_dbus_busy_delay(target); increase_dbus_busy_delay(target);
} }
} while (status == DBUS_STATUS_BUSY && i++ < 256); } while (status == DBUS_STATUS_BUSY && i++ < 256);
if (i >= 256) { if (i >= 256) {
LOG_ERROR("Failed to read from 0x%x; status=%d", address_in, status); LOG_ERROR("Failed to read from 0x%x; status=%d", address_in, status);
bits_t err_result = {
.haltnot = 0,
.interrupt = 0
};
return err_result; return err_result;
} }
} while (address_in > 0x10 && address_in != DMCONTROL); } while (address_in > 0x10 && address_in != DMCONTROL);