[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-77-g0a20e78b7

[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  0a20e78b759efa86a676b4a9fed4027fdd84e90c (commit)
      from  c99c043f3f6e79e391debee29371360b0965b2d6 (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 0a20e78b759efa86a676b4a9fed4027fdd84e90c
Author: Peter Collingbourne <pc...@go...>
Date:   Fri Feb 17 18:26:05 2023 -0800

    jtag/drivers/cmsis_dap: run queue on reaching transaction limit
    
    We currently fail the transfer when issuing more than 255 transactions
    at once, e.g.
    
    > read_memory 0x10000000 32 256
    CMSIS-DAP transfer count mismatch: expected 257, got 1
    
    This is because the protocol only supports 255 transactions per packet
    (65535 for block transactions), and as a result we truncate the
    transaction count when assembling the packet. Fix it by running the
    queue when we hit the limit.
    
    Change-Id: Ia9e01e3af5ad035f2cf2a32292c9d66e57eafae9
    Signed-off-by: Peter Collingbourne <pc...@go...>
    Fixes: 40bac8e8c4e5 ("jtag/drivers/cmsis_dap: improve USB packets filling")
    Reviewed-on: https://review.openocd.org/c/openocd/+/7483
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 0c42a7f1e..1e7a851e4 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -1001,12 +1001,14 @@ static void cmsis_dap_swd_queue_cmd(uint8_t cmd, uint32_t *dst, uint32_t data)
 													block_cmd);
 	unsigned int resp_size = cmsis_dap_tfer_resp_size(write_count, read_count,
 													block_cmd);
+	unsigned int max_transfer_count = block_cmd ? 65535 : 255;
 
 	/* Does the DAP Transfer command and the expected response fit into one packet?
 	 * Run the queue also before a targetsel - it cannot be queued */
 	if (cmd_size > tfer_max_command_size
 			|| resp_size > tfer_max_response_size
-			|| targetsel_cmd) {
+			|| targetsel_cmd
+			|| write_count + read_count > max_transfer_count) {
 		if (cmsis_dap_handle->pending_fifo_block_count)
 			cmsis_dap_swd_read_process(cmsis_dap_handle, 0);
 

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

Summary of changes:
 src/jtag/drivers/cmsis_dap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository