[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-615-g4892e3229

[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  4892e32294c6ea4cf53251adb81dee4e85aee0b0 (commit)
      from  bf4be566a7e7f510977533a0402716d92f208f95 (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 4892e32294c6ea4cf53251adb81dee4e85aee0b0
Author: Tomas Vanek <va...@fb...>
Date:   Fri May 17 21:27:24 2024 +0200

    target/cortex_m: allow poll quickly get out of TARGET_RESET state
    
    cortex_m_poll_one() detects reset testing S_RESET_ST sticky bit.
    If the signal comes unexpectedly, poll must return TARGET_RESET state.
    
    On the contrary in case of polling inside of an OpenOCD reset command,
    TARGET_RESET has been has already been set and we need to get out of
    it as quickly as possible.
    
    The original code needs 2 polls: the first clears S_RESET_ST
    and keeps TARGET_RESET state, the current TARGET_RUNNING or TARGET_HALTED
    is reflected as late as the second poll is done.
    
    Change the logic to keep in TARGET_RESET only when necessary.
    
    See also [1]
    
    Link: [1] 8284: tcl/target: ti_cc3220sf: Use halt for CC3320SF targets | https://review.openocd.org/c/openocd/+/8284
    Fixes: https://sourceforge.net/p/openocd/tickets/360/
    Signed-off-by: Tomas Vanek <va...@fb...>
    Change-Id: I759461e5f89ca48a6e16e4b4101570260421dba1
    Reviewed-on: https://review.openocd.org/c/openocd/+/8285
    Tested-by: jenkins
    Reviewed-by: Dhruva Gole <d-...@ti...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index c225b1aa9..7f62a6de2 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -931,8 +931,12 @@ static int cortex_m_poll_one(struct target *target)
 		if (target->state != TARGET_RESET) {
 			target->state = TARGET_RESET;
 			LOG_TARGET_INFO(target, "external reset detected");
+			/* In case of an unexpected S_RESET_ST set TARGET_RESET state
+			 * and keep it until the next poll to allow its detection */
+			return ERROR_OK;
 		}
-		return ERROR_OK;
+		/* S_RESET_ST was expected (in a reset command). Continue processing
+		 * to quickly get out of TARGET_RESET state */
 	}
 
 	if (target->state == TARGET_RESET) {

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

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


hooks/post-receive
-- 
Main OpenOCD repository