[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-190-gb40dc09dd

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b40dc09dd9e05497bf956ca91f7153aa34b24854 (commit)
      from  3b4e40120bc9c56442d1e177ecfbc8c4faa0ac7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b40dc09dd9e05497bf956ca91f7153aa34b24854
Author: micbis <mic...@re...>
Date:   Wed May 26 19:11:05 2021 +0200

    target/arm_adi_v5: Fix clear sticky overrun flag during replay of commands
    
    When a WAIT occurs the commands after the WAIT are replayed and the
    STICKYORUN is cleared. However if another WAIT occurs during the
    command replay, the command itself is resent but the STICKYORUN bit
    shall also be cleared. If this is not done, the MEM-AP hangs.
    
    Change-Id: I14e8340cd5d8f58f4de31509da96cfa2ecb630d1
    Signed-off-by: micbis <mic...@re...>
    Reviewed-on: http://openocd.zylin.com/6278
    Tested-by: jenkins
    Reviewed-by: Matthias Welwarsky <mat...@we...>

diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index 6dede972c..239253d20 100644
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -574,6 +574,13 @@ static int jtagdp_overrun_check(struct adiv5_dap *dap)
 					retval = ERROR_JTAG_DEVICE_ERROR;
 					break;
 				}
+				LOG_INFO("DAP transaction stalled during replay (WAIT) - resending");
+				/* clear the sticky overrun condition */
+				retval = adi_jtag_scan_inout_check_u32(dap, JTAG_DP_DPACC,
+						DP_CTRL_STAT, DPAP_WRITE,
+						dap->dp_ctrl_stat | SSTICKYORUN, NULL, 0);
+				if (retval != ERROR_OK)
+					break;
 			} while (timeval_ms() - time_now < 1000);
 
 			if (retval == ERROR_OK) {

-----------------------------------------------------------------------

Summary of changes:
 src/target/adi_v5_jtag.c | 7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository