[PATCH]: ba55278834 jtag/drivers/jlink: allow SWD multidrop

[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/+/7383

-- gerrit

commit ba55278834ca34ee1f1a958a2995604c637a9022
Author: Tomas Vanek <van...@fbl.cz>
Date:   Mon Nov 28 10:54:48 2022 +0100

    jtag/drivers/jlink: allow SWD multidrop
    
    SW-DPv2 and SWJ-DPv2 devices do not reply to DP_TARGETSEL write cmd.
    
    Ignore the received ACK after TARGETSEL write.
    
    While on it, use swd_ack_to_error_code() for unified error code
    translation of the received ACK value for all other commands.
    
    Signed-off-by: Tomas Vanek <van...@fbl.cz>
    Change-Id: If978c88c8496e31581175385e59c32faebfd20aa

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 0a96ac255d..0bdfacb6a5 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1976,6 +1976,8 @@ struct pending_scan_result {
        void *buffer;
        /** Offset in the destination buffer */
        unsigned buffer_offset;
+       /** SWD command */
+       uint8_t swd_cmd;
 };
 
 #define MAX_PENDING_SCAN_RESULTS 256
@@ -2179,12 +2181,13 @@ static int jlink_swd_run_queue(void)
        }
 
        for (i = 0; i < pending_scan_results_length; i++) {
+               /* Devices do not reply to DP_TARGETSEL write cmd, ignore 
received ack */
+               bool check_ack = 
swd_cmd_returns_ack(pending_scan_results_buffer[i].swd_cmd);
                int ack = buf_get_u32(tdo_buffer, 
pending_scan_results_buffer[i].first, 3);
-
-               if (ack != SWD_ACK_OK) {
+               if (check_ack && ack != SWD_ACK_OK) {
                        LOG_DEBUG("SWD ack not OK: %d %s", ack,
                                  ack == SWD_ACK_WAIT ? "WAIT" : ack == 
SWD_ACK_FAULT ? "FAULT" : "JUNK");
-                       queued_retval = ack == SWD_ACK_WAIT ? ERROR_WAIT : 
ERROR_FAIL;
+                       queued_retval = swd_ack_to_error_code(ack);
                        goto skip;
                } else if (pending_scan_results_buffer[i].length) {
                        uint32_t data = buf_get_u32(tdo_buffer, 3 + 
pending_scan_results_buffer[i].first, 32);
@@ -2221,6 +2224,8 @@ static void jlink_swd_queue_cmd(uint8_t cmd, uint32_t 
*dst, uint32_t data, uint3
        if (queued_retval != ERROR_OK)
                return;
 
+       assert(pending_scan_results_length < MAX_PENDING_SCAN_RESULTS);
+       pending_scan_results_buffer[pending_scan_results_length].swd_cmd = cmd;
        cmd |= SWD_CMD_START | SWD_CMD_PARK;
 
        jlink_queue_data_out(&cmd, 8);

--