[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-506-g386169907

[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  38616990744b2bac7026f0d41da9247b42494379 (commit)
      from  0d3d4c981ac77b600ce95c9ea6f1cdb280127342 (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 38616990744b2bac7026f0d41da9247b42494379
Author: Tomas Vanek <va...@fb...>
Date:   Sun Jan 21 10:15:07 2024 +0100

    target/cortex_m: prevent asserting reset if examine is deferred
    
    In a corner case when debug_ap is not available,
    cortex_m_assert_reset() asserts reset to restore
    communication with the target.
    
    Prevent to do so on targets with defer_examine,
    as such targets need some special handling to enable them
    after reset anyway.
    
    The change makes possible to handle a multicore Cortex-M SoC with
    an auxiliary Cortex-M core(s) switched of by default
    even with 'reset_config srst_gates_jtag'
    
    Change-Id: I8cec7a816423e588d5e2e4f7904c81c776eddc42
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8097
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 6a29a5fd4..8bb852f4f 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1625,7 +1625,8 @@ static int cortex_m_assert_reset(struct target *target)
 	bool srst_asserted = false;
 
 	if ((jtag_reset_config & RESET_HAS_SRST) &&
-		((jtag_reset_config & RESET_SRST_NO_GATING) || !armv7m->debug_ap)) {
+		((jtag_reset_config & RESET_SRST_NO_GATING)
+		 || (!armv7m->debug_ap && !target->defer_examine))) {
 		/* If we have no debug_ap, asserting SRST is the only thing
 		 * we can do now */
 		adapter_assert_reset();

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

Summary of changes:
 src/target/cortex_m.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository