]> www.infradead.org Git - users/borneoa/openocd-next.git/commitdiff
drivers/cmsis_dap_usb_bulk: allow waiting for bulk write
authorTomas Vanek <vanekt@fbl.cz>
Tue, 10 Dec 2024 07:53:49 +0000 (08:53 +0100)
committerTomas Vanek <vanekt@fbl.cz>
Thu, 9 Jan 2025 20:15:59 +0000 (20:15 +0000)
No driver directly working with the USB hardware needs additional
time to complete the write op, they always return transfer complete
status immediately after submitting the transfer.

Although there is implemented correct waiting path in cmsis_dap_usb_write()
it was marked by error logs to catch any suspicious behaviour during
debugging of asynchronous libusb transfers.

However there are drivers which need waiting to finish write op:
at least usbipd-win, IP tunnelled USB driver, was reported
to flood the log with the related errors.

Change LOG_ERROR to LOG_DEBUG_IO in the code waiting to finish write op.

Reported-by: Quentis Ghyll <quentisgh@gmail.com>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Change-Id: Iedf2c96d851f22e694efaf13a2d6a2a408cee1ad
Reviewed-on: https://review.openocd.org/c/openocd/+/8640
Tested-by: jenkins
src/jtag/drivers/cmsis_dap_usb_bulk.c

index 50d4a9f8d3f651dd6e512d03363b7ccc1690403d..8fbcb029dd8eb457e3a54142e9580389458afd62 100644 (file)
@@ -532,7 +532,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
        tr = &dap->bdata->command_transfers[dap->pending_fifo_put_idx];
 
        if (tr->status == CMSIS_DAP_TRANSFER_PENDING) {
-               LOG_ERROR("busy command USB transfer at %u", dap->pending_fifo_put_idx);
+               LOG_DEBUG_IO("busy command USB transfer at %u", dap->pending_fifo_put_idx);
                struct timeval tv = {
                        .tv_sec = timeout_ms / 1000,
                        .tv_usec = timeout_ms % 1000 * 1000
@@ -547,7 +547,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
                tr->status = CMSIS_DAP_TRANSFER_IDLE;
        }
        if (tr->status == CMSIS_DAP_TRANSFER_COMPLETED) {
-               LOG_ERROR("USB write: late transfer competed");
+               LOG_DEBUG_IO("USB write: late transfer competed");
                tr->status = CMSIS_DAP_TRANSFER_IDLE;
        }
        if (tr->status != CMSIS_DAP_TRANSFER_IDLE) {