[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-628-gdde096e03

[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  dde096e03fa4912aa44b2b72cfbdb7676340a3d1 (commit)
      from  198fecf5e4b03c2024c9d75fd5e6045daf681ed5 (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 dde096e03fa4912aa44b2b72cfbdb7676340a3d1
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Sep 17 11:15:22 2023 +0200

    itm: fix default initialization
    
    Commit f9509c92dba3 ("itm: rework itm commands before 'init'")
    ignores the default enable of ITM channel 0, that is applied when
    no 'itm port[s]' is issued.
    
    Call armv7m_trace_itm_config() unconditionally to handle it.
    
    Change-Id: I3e85d0b063ed38c1552f6af9ea9eea2e76aa9025
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Paul Fertser <fer...@gm...>
    Fixes: f9509c92dba3 ("itm: rework itm commands before 'init'")
    Reviewed-on: https://review.openocd.org/c/openocd/+/7900
    Reviewed-by: <po...@fr...>
    Tested-by: jenkins

diff --git a/src/target/armv7m_trace.c b/src/target/armv7m_trace.c
index 45117d2db..556568d71 100644
--- a/src/target/armv7m_trace.c
+++ b/src/target/armv7m_trace.c
@@ -92,11 +92,14 @@ COMMAND_HANDLER(handle_itm_port_command)
 	else
 		armv7m->trace_config.itm_ter[reg_idx] &= ~(1 << port);
 
-	if (CMD_CTX->mode == COMMAND_EXEC)
-		return armv7m_trace_itm_config(target);
+	/*
+	 * In config mode ITM is not accessible yet.
+	 * Keep the value and it will be programmed at target init.
+	 */
+	if (CMD_CTX->mode == COMMAND_CONFIG)
+		return ERROR_OK;
 
-	armv7m->trace_config.itm_deferred_config = true;
-	return ERROR_OK;
+	return armv7m_trace_itm_config(target);
 }
 
 COMMAND_HANDLER(handle_itm_ports_command)
@@ -112,11 +115,14 @@ COMMAND_HANDLER(handle_itm_ports_command)
 	memset(armv7m->trace_config.itm_ter, enable ? 0xff : 0,
 	       sizeof(armv7m->trace_config.itm_ter));
 
-	if (CMD_CTX->mode == COMMAND_EXEC)
-		return armv7m_trace_itm_config(target);
+	/*
+	 * In config mode ITM is not accessible yet.
+	 * Keep the value and it will be programmed at target init.
+	 */
+	if (CMD_CTX->mode == COMMAND_CONFIG)
+		return ERROR_OK;
 
-	armv7m->trace_config.itm_deferred_config = true;
-	return ERROR_OK;
+	return armv7m_trace_itm_config(target);
 }
 
 static const struct command_registration itm_command_handlers[] = {
diff --git a/src/target/armv7m_trace.h b/src/target/armv7m_trace.h
index 5abb0b940..02eca932d 100644
--- a/src/target/armv7m_trace.h
+++ b/src/target/armv7m_trace.h
@@ -35,8 +35,6 @@ struct armv7m_trace_config {
 	bool itm_async_timestamps;
 	/** Enable synchronisation packet transmission (for sync port only) */
 	bool itm_synchro_packets;
-	/** Config ITM after target examine */
-	bool itm_deferred_config;
 };
 
 extern const struct command_registration armv7m_trace_command_handlers[];
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 7f62a6de2..34c7cd4d2 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2659,8 +2659,8 @@ int cortex_m_examine(struct target *target)
 		if (retval != ERROR_OK)
 			return retval;
 
-		if (armv7m->trace_config.itm_deferred_config)
-			armv7m_trace_itm_config(target);
+		/* Configure ITM */
+		armv7m_trace_itm_config(target);
 
 		/* NOTE: FPB and DWT are both optional. */
 

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

Summary of changes:
 src/target/armv7m_trace.c | 22 ++++++++++++++--------
 src/target/armv7m_trace.h |  2 --
 src/target/cortex_m.c     |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository