[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-514-gc6e7e48b0

[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  c6e7e48b053c281ef4a9dd50f2d94fa12184a956 (commit)
      from  7295ddc15c0516a64c9996d2b351accb50175803 (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 c6e7e48b053c281ef4a9dd50f2d94fa12184a956
Author: N S <nl...@ya...>
Date:   Mon Jan 22 21:47:34 2024 -0800

    jtag/drivers: fix reset logic handling in OpenJTAG
    
    The OpenJTAG driver behaviour always forces a system reset on jtag_init.
    The driver was incorrectly assuming that when execute_reset is called
    with trst set to 1 - perform a software TAP reset, otherwise perform a
    system reset when trst is 0.
    
    The set_state call assumes the that OpenJTAG hardware will perform a
    software TLR reset if the target state is TAP_RESET. This is not the
    case: the published VHDL will simply find the shortest path to TLR and
    not perform a fixed 5 cycle operation with TMS held high.
    
    Fix the code to only perform system resets when srst is 1 in
    execute_reset and to force a software TAP reset operation in set_state
    when the target state is TAP_RESET.
    
    Change-Id: I7e0f76f8491efefff1ccaeb4b1ae16e722d76df4
    Signed-off-by: N S <nl...@ya...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8121
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c
index 1c79a2c9b..086a411d6 100644
--- a/src/jtag/drivers/openjtag.c
+++ b/src/jtag/drivers/openjtag.c
@@ -671,14 +671,12 @@ static void openjtag_execute_reset(struct jtag_command *cmd)
 
 	uint8_t buf = 0x00;
 
-	if (cmd->cmd.reset->trst) {
-		buf = 0x03;
-	} else {
+	/* Pull SRST low for 5 TCLK cycles */
+	if (cmd->cmd.reset->srst) {
 		buf |= 0x04;
 		buf |= 0x05 << 4;
+		openjtag_add_byte(buf);
 	}
-
-	openjtag_add_byte(buf);
 }
 
 static void openjtag_execute_sleep(struct jtag_command *cmd)
@@ -691,8 +689,14 @@ static void openjtag_set_state(uint8_t openocd_state)
 	uint8_t state = openjtag_get_tap_state(openocd_state);
 
 	uint8_t buf = 0;
-	buf = 0x01;
-	buf |= state << 4;
+
+	if (state != OPENJTAG_TAP_RESET) {
+		buf = 0x01;
+		buf |= state << 4;
+	} else {
+		/* Force software TLR */
+		buf = 0x03;
+	}
 
 	openjtag_add_byte(buf);
 }

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

Summary of changes:
 src/jtag/drivers/openjtag.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository