[PATCH]: 97d97dedb8 jtag/drivers/cmsis_dap: prevent conn/discon workaround before line reset

[gerrit]

This is an automated email from Gerrit.

"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which 
you can find at https://review.openocd.org/c/openocd/+/7381

-- gerrit

commit 97d97dedb8ae514534d03ba017addec0a5fa1b11
Author: Tomas Vanek <van...@fbl.cz>
Date:   Thu Nov 24 14:21:59 2022 +0100

    jtag/drivers/cmsis_dap: prevent conn/discon workaround before line reset
    
    The line reset SWD sequence is used quite often in SWD multidrop mode.
    Prevent the ugly connect/disconnect adapter firmware bug workaround
    to be called before each line reset.
    
    Signed-off-by: Tomas Vanek <van...@fbl.cz>
    Change-Id: Id85bff075dba9077e4e501e2cdcfd64d5d9d0531

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 0315d7bee7..5d2c5b7ac3 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -1158,7 +1158,9 @@ static int cmsis_dap_swd_switch_seq(enum swd_special_seq 
seq)
        unsigned int s_len;
        int retval;
 
-       if ((output_pins & (SWJ_PIN_SRST | SWJ_PIN_TRST)) == (SWJ_PIN_SRST | 
SWJ_PIN_TRST)) {
+       if (seq != LINE_RESET &&
+                       (output_pins & (SWJ_PIN_SRST | SWJ_PIN_TRST))
+                               == (SWJ_PIN_SRST | SWJ_PIN_TRST)) {
                /* Following workaround deasserts reset on most adapters.
                 * Do not reconnect if a reset line is active!
                 * Reconnecting would break connecting under reset. */

--