From c431c0eb251bf6d02959a6f55be3baba04552b5d Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 15 May 2017 17:40:28 -0700 Subject: Check for abstractcs.busy, not just CMDERR_BUSY This fixes a race condition when reading/writing memory. --- src/target/riscv/riscv-013.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index b43322e..f24afe1 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -1378,6 +1378,8 @@ static int read_memory(struct target *target, uint32_t address, // catches the case where no writes went through at all. uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS); + while (get_field(abstractcs, DMI_ABSTRACTCS_BUSY)) + abstractcs = dmi_read(target, DMI_ABSTRACTCS); switch (get_field(abstractcs, DMI_ABSTRACTCS_CMDERR)) { case CMDERR_NONE: LOG_DEBUG("successful (partial?) memory write"); @@ -1560,6 +1562,8 @@ static int write_memory(struct target *target, uint32_t address, // catches the case where no writes went through at all. uint32_t abstractcs = dmi_read(target, DMI_ABSTRACTCS); + while (get_field(abstractcs, DMI_ABSTRACTCS_BUSY)) + abstractcs = dmi_read(target, DMI_ABSTRACTCS); switch (get_field(abstractcs, DMI_ABSTRACTCS_CMDERR)) { case CMDERR_NONE: LOG_DEBUG("successful (partial?) memory write"); -- cgit v1.1