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

Revert "riscv: Use write-1-to-clear for CMDERR, not write 0 to clear." 

This reverts commit eb90a5e05e.
This commit is contained in:
Palmer Dabbelt 2017-03-30 19:08:35 -07:00
parent 91518871f1
commit 647e1b784d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,7 +571,7 @@ static int execute_abstract_command(struct target *target, uint32_t command)
command, errors[get_field(abstractcs, DMI_ABSTRACTCS_CMDERR)],
abstractcs);
// Clear the error.
dmi_write(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
dmi_write(target, DMI_ABSTRACTCS, 0);
return ERROR_FAIL;
}
@ -1886,6 +1886,7 @@ static int read_memory(struct target *target, uint32_t address,
abstract_register_size(xlen(target)) | reg_number_to_no(S1)) != ERROR_OK) {
return ERROR_FAIL;
}
dmi_write(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
uint32_t abstractcs;
for (uint32_t i = 0; i < count; i++) {
@ -1918,11 +1919,11 @@ static int read_memory(struct target *target, uint32_t address,
}
}
dmi_write(target, DMI_ABSTRACTAUTO, 0);
abstractcs = dmi_read(target, DMI_ABSTRACTCS);
dmi_write(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
abstractcs = dmi_read(target, DMI_ABSTRACTCS);
unsigned cmderr = get_field(abstractcs, DMI_ABSTRACTCS_CMDERR);
if (cmderr == CMDERR_BUSY) {
// Clear the error and wait longer.
dmi_write(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
dmi_write(target, DMI_ABSTRACTCS, 0);
increase_ac_busy_delay(target);
} else if (cmderr) {
LOG_ERROR("read_memory(): cmderr=%d", get_field(abstractcs, DMI_ABSTRACTCS_CMDERR));
@ -2008,6 +2009,9 @@ static int write_memory(struct target *target, uint32_t address,
AC_ACCESS_REGISTER_WRITE | AC_ACCESS_REGISTER_POSTEXEC
| abstract_register_size(xlen(target)) |
reg_number_to_no(S1), true);
scans_add_dmi_write(scans, DMI_ABSTRACTCS,
DMI_ABSTRACTCS_CMDERR,
false);
scans_add_dmi_write(scans, DMI_ABSTRACTAUTO,
0x1 << DMI_ABSTRACTAUTO_AUTOEXECDATA_OFFSET,
false);
@ -2026,7 +2030,7 @@ static int write_memory(struct target *target, uint32_t address,
uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS);
unsigned cmderr = get_field(abstractcs, DMI_ABSTRACTCS_CMDERR);
if (cmderr == CMDERR_BUSY) {
dmi_write(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
dmi_write(target, DMI_ABSTRACTCS, 0);
increase_ac_busy_delay(target);
} else if (cmderr) {
LOG_ERROR("write_memory: cmderr=%d", get_field(abstractcs, DMI_ABSTRACTCS_CMDERR));