diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2018-06-15 16:37:18 +0200 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2018-06-22 09:24:59 +0100 |
| commit | 1dc466f5156741f643c946485cdf280a1054fc7a (patch) | |
| tree | 90fcb7ff1bc4ed5cdae6836121bfaddc21a3b9da /src/target/arm_adi_v5.c | |
| parent | 0057c71ab6b81d0679b232318fc5f84b4becc471 (diff) | |
| download | riscv-openocd-1dc466f5156741f643c946485cdf280a1054fc7a.zip riscv-openocd-1dc466f5156741f643c946485cdf280a1054fc7a.tar.gz riscv-openocd-1dc466f5156741f643c946485cdf280a1054fc7a.tar.bz2 | |
target/arm_adi_v5: keep CSW and TAR cache updated
The call to dap_queue_ap_write() can fail and the value in CSW and
TAR becomes unknown.
Invalidate the OpenOCD cache if dap_queue_ap_write() fails.
Change-Id: Id6ec370b4c5ad07e454464780c1a1c8ae34ac870
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4564
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/target/arm_adi_v5.c')
| -rw-r--r-- | src/target/arm_adi_v5.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index 6795b31..4dc2594 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -102,8 +102,10 @@ static int mem_ap_setup_csw(struct adiv5_ap *ap, uint32_t csw) if (csw != ap->csw_value) { /* LOG_DEBUG("DAP: Set CSW %x",csw); */ int retval = dap_queue_ap_write(ap, MEM_AP_REG_CSW, csw); - if (retval != ERROR_OK) + if (retval != ERROR_OK) { + ap->csw_value = 0; return retval; + } ap->csw_value = csw; } return ERROR_OK; @@ -114,8 +116,10 @@ static int mem_ap_setup_tar(struct adiv5_ap *ap, uint32_t tar) if (!ap->tar_valid || tar != ap->tar_value) { /* LOG_DEBUG("DAP: Set TAR %x",tar); */ int retval = dap_queue_ap_write(ap, MEM_AP_REG_TAR, tar); - if (retval != ERROR_OK) + if (retval != ERROR_OK) { + ap->tar_valid = false; return retval; + } ap->tar_value = tar; ap->tar_valid = true; } |