[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-16-g169e5bf18

[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  169e5bf1862ab52c4ba28a26f15124293d2bf443 (commit)
       via  fa76e036b92b22e07c9e7b70fa9c4cf504170a45 (commit)
      from  547fa6eeb737b349b463269c3baea726e69662b4 (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 169e5bf1862ab52c4ba28a26f15124293d2bf443
Author: Adrian Negreanu <adr...@nx...>
Date:   Fri Nov 20 18:53:51 2020 +0200

    armv7m_trace_itm_config: wait for ITMBusy to be cleared
    
    pg315 of CoreSight Components:
    
    It is recommended that the ITMEn bit is cleared and waits for the
    ITMBusy bit to be cleared, before changing any fields in the
    Control Register, otherwise the behavior can be unpredictable.
    
    Change-Id: Ie9a2b842825c98ee5edc9a35776320c668047769
    Signed-off-by: Adrian Negreanu <adr...@nx...>
    Reviewed-on: http://openocd.zylin.com/6043
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/armv7m_trace.c b/src/target/armv7m_trace.c
index 10f14221d..32b48a7c5 100644
--- a/src/target/armv7m_trace.c
+++ b/src/target/armv7m_trace.c
@@ -24,6 +24,7 @@
 #include <target/cortex_m.h>
 #include <target/armv7m_trace.h>
 #include <jtag/interface.h>
+#include <helper/time_support.h>
 
 #define TRACE_BUF_SIZE	4096
 
@@ -162,6 +163,33 @@ int armv7m_trace_itm_config(struct target *target)
 	if (retval != ERROR_OK)
 		return retval;
 
+	/* pg315 of CoreSight Components
+	 * It is recommended that the ITMEn bit is cleared and waits for the
+	 * ITMBusy bit to be cleared, before changing any fields in the
+	 * Control Register, otherwise the behavior can be unpredictable.
+	 */
+	uint32_t itm_tcr;
+	retval = target_read_u32(target, ITM_TCR, &itm_tcr);
+	if (retval != ERROR_OK)
+		return retval;
+	retval = target_write_u32(target,
+			ITM_TCR,
+			itm_tcr & ~ITM_TCR_ITMENA_BIT
+			);
+	if (retval != ERROR_OK)
+		return retval;
+
+	int64_t then = timeval_ms() + 1000;
+	do {
+		retval = target_read_u32(target, ITM_TCR, &itm_tcr);
+		if (retval != ERROR_OK)
+			return retval;
+		if (timeval_ms() > then) {
+			LOG_ERROR("timeout waiting for ITM_TCR_BUSY_BIT");
+			return ERROR_FAIL;
+		}
+	} while (itm_tcr & ITM_TCR_BUSY_BIT);
+
 	/* Enable ITM, TXENA, set TraceBusID and other parameters */
 	retval = target_write_u32(target, ITM_TCR, (1 << 0) | (1 << 3) |
 				  (trace_config->itm_diff_timestamps << 1) |
diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index b470fbd70..1e2197b1a 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -35,6 +35,8 @@
 #define ITM_TER0	0xE0000E00
 #define ITM_TPR		0xE0000E40
 #define ITM_TCR		0xE0000E80
+#define ITM_TCR_ITMENA_BIT	BIT(0)
+#define ITM_TCR_BUSY_BIT	BIT(23)
 #define ITM_LAR		0xE0000FB0
 #define ITM_LAR_KEY	0xC5ACCE55
 

commit fa76e036b92b22e07c9e7b70fa9c4cf504170a45
Author: Adrian Negreanu <adr...@nx...>
Date:   Mon Dec 7 14:54:05 2020 +0200

    cmsis_dap: remove DAP_MAX_CLOCK
    
    Discussed here:
    
        https://sourceforge.net/p/openocd/mailman/message/35466010/
    
    Change-Id: Ic4d38a872f4b13b794ad0a8a2abdbe5bb21eced3
    Signed-off-by: Adrian Negreanu <adr...@nx...>
    Reviewed-on: http://openocd.zylin.com/5964
    Tested-by: jenkins
    Reviewed-by: Bohdan Tymkiv <bh...@cy...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 16480ae1e..fd565398f 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -169,10 +169,6 @@ static const char * const info_caps_str[] = {
 	"JTAG Supported"
 };
 
-/* max clock speed (kHz) */
-#define DAP_MAX_CLOCK             5000
-
-
 struct pending_transfer_result {
 	uint8_t cmd;
 	uint32_t data;
@@ -1544,9 +1540,6 @@ static int cmsis_dap_execute_queue(void)
 
 static int cmsis_dap_speed(int speed)
 {
-	if (speed > DAP_MAX_CLOCK)
-		LOG_INFO("High speed (adapter speed %d) may be limited by adapter firmware.", speed);
-
 	if (speed == 0) {
 		LOG_ERROR("RTCK not supported. Set nonzero \"adapter speed\".");
 		return ERROR_JTAG_NOT_IMPLEMENTED;

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

Summary of changes:
 src/jtag/drivers/cmsis_dap.c |  7 -------
 src/target/armv7m_trace.c    | 28 ++++++++++++++++++++++++++++
 src/target/cortex_m.h        |  2 ++
 3 files changed, 30 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository