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

Don't reset DMI when an abstract command is busy.

This commit is contained in:
Tim Newsome 2017-08-25 12:00:06 -07:00
parent a9bcc48064
commit 92ef328161
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,17 +364,6 @@ static void increase_dmi_busy_delay(struct target *target)
dtmcontrol_scan(target, DTM_DTMCS_DMIRESET); dtmcontrol_scan(target, DTM_DTMCS_DMIRESET);
} }
static void increase_ac_busy_delay(struct target *target)
{
riscv013_info_t *info = get_info(target);
info->ac_busy_delay += info->ac_busy_delay / 10 + 1;
LOG_INFO("dtmcontrol_idle=%d, dmi_busy_delay=%d, ac_busy_delay=%d",
info->dtmcontrol_idle, info->dmi_busy_delay,
info->ac_busy_delay);
dtmcontrol_scan(target, DTM_DTMCS_DMIRESET);
}
/** /**
* exec: If this is set, assume the scan results in an execution, so more * exec: If this is set, assume the scan results in an execution, so more
* run-test/idle cycles may be required. * run-test/idle cycles may be required.
@ -531,6 +520,23 @@ static void dmi_write(struct target *target, uint16_t address, uint64_t value)
} }
} }
static void increase_ac_busy_delay(struct target *target)
{
riscv013_info_t *info = get_info(target);
info->ac_busy_delay += info->ac_busy_delay / 10 + 1;
LOG_INFO("dtmcontrol_idle=%d, dmi_busy_delay=%d, ac_busy_delay=%d",
info->dtmcontrol_idle, info->dmi_busy_delay,
info->ac_busy_delay);
// Wait for busy to go away.
uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS);
while (get_field(abstractcs, DMI_ABSTRACTCS_BUSY)) {
abstractcs = dmi_read(target, DMI_ABSTRACTCS);
}
// Clear the error status.
dmi_write(target, DMI_ABSTRACTCS, abstractcs & DMI_ABSTRACTCS_CMDERR);
}
uint32_t abstract_register_size(unsigned width) uint32_t abstract_register_size(unsigned width)
{ {
switch (width) { switch (width) {
@ -1412,8 +1418,8 @@ static int read_memory(struct target *target, target_addr_t address,
case CMDERR_BUSY: case CMDERR_BUSY:
LOG_DEBUG("memory read resulted in busy response; " LOG_DEBUG("memory read resulted in busy response; "
"this_is_last_read=%d", this_is_last_read); "this_is_last_read=%d", this_is_last_read);
riscv013_clear_abstract_error(target);
increase_ac_busy_delay(target); increase_ac_busy_delay(target);
riscv013_clear_abstract_error(target);
retry_batch_transaction = true; retry_batch_transaction = true;
riscv_batch_free(batch); riscv_batch_free(batch);
break; break;