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

target/riscv: Deal with DMI busy in sample_memory_bus_v1() (#758) 

* target/riscv: Deal with DMI busy in sample_memory_bus_v1()

Change-Id: I810a4c4b7f02cb40ea99b7a500dce23c1bbd9231
Signed-off-by: Tim Newsome <tim@sifive.com>

* Comment code more clearly.

Co-authored-by: Jan Matyas <50193733+JanMatCodasip@users.noreply.github.com>
Signed-off-by: Tim Newsome <tim@sifive.com>

* Remove extra tab

Co-authored-by: Jan Matyas <50193733+JanMatCodasip@users.noreply.github.com>
Signed-off-by: Tim Newsome <tim@sifive.com>

Signed-off-by: Tim Newsome <tim@sifive.com>
Co-authored-by: Jan Matyas <50193733+JanMatCodasip@users.noreply.github.com>
This commit is contained in:
Tim Newsome 2022-11-09 14:39:19 -08:00 committed by GitHub
parent 70980e7f57
commit ae3ad22311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2231,16 +2231,27 @@ static int sample_memory_bus_v1(struct target *target,
break; break;
} }
size_t sbcs_key = riscv_batch_add_dmi_read(batch, DM_SBCS); size_t sbcs_read_index = riscv_batch_add_dmi_read(batch, DM_SBCS);
int result = batch_run(target, batch); int result = batch_run(target, batch);
if (result != ERROR_OK) if (result != ERROR_OK) {
riscv_batch_free(batch);
return result; return result;
}
uint32_t sbcs_read = riscv_batch_get_dmi_read_data(batch, sbcs_key); /* Discard the batch when we encounter a busy state on the DMI level.
* It's too much hassle to try to recover partial data. We'll try again
* with a larger DMI delay. */
unsigned int sbcs_read_op = riscv_batch_get_dmi_read_op(batch, sbcs_read_index);
if (sbcs_read_op == DTM_DMI_OP_BUSY) {
increase_dmi_busy_delay(target);
continue;
}
uint32_t sbcs_read = riscv_batch_get_dmi_read_data(batch, sbcs_read_index);
if (get_field(sbcs_read, DM_SBCS_SBBUSYERROR)) { if (get_field(sbcs_read, DM_SBCS_SBBUSYERROR)) {
/* Discard this batch (too much hassle to try to recover partial /* Discard this batch when we encounter "busy error" state on the System Bus level.
* data) and try again with a larger delay. */ * We'll try next time with a larger System Bus read delay. */
info->bus_master_read_delay += info->bus_master_read_delay / 10 + 1; info->bus_master_read_delay += info->bus_master_read_delay / 10 + 1;
dmi_write(target, DM_SBCS, sbcs_read | DM_SBCS_SBBUSYERROR | DM_SBCS_SBERROR); dmi_write(target, DM_SBCS, sbcs_read | DM_SBCS_SBBUSYERROR | DM_SBCS_SBERROR);
riscv_batch_free(batch); riscv_batch_free(batch);