git: bcb195d91717 - main - Partial revert of f83f5d58394db57576bbed6dc7531997cabeb102 for uftdi(4). Apparently devices with bcdDevice less than 0x0600, have problems receiving ZLPs.

[Hans Petter Selasky]

The branch main has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=bcb195d91717bf182d27b9ce8cf0e43595c6e763

commit bcb195d91717bf182d27b9ce8cf0e43595c6e763
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-08-20 07:52:32 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-08-20 07:54:34 +0000

    Partial revert of f83f5d58394db57576bbed6dc7531997cabeb102 for uftdi(4).
    Apparently devices with bcdDevice less than 0x0600, have problems receiving ZLPs.
    
    Reported by:    kevlo@
    MFC after:      1 week
    Sponsored by:   NVIDIA Networking
---
 sys/dev/usb/serial/uftdi.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index eaf4a9e78086..7fd531b3e381 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -1117,7 +1117,7 @@ uftdi_attach(device_t dev)
 	}
 	/* clear stall at first run */
 	mtx_lock(&sc->sc_mtx);
-	usbd_xfer_set_zlp(sc->sc_xfer[UFTDI_BULK_DT_WR]);
+	usbd_xfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_WR]);
 	mtx_unlock(&sc->sc_mtx);
 
 	/* set a valid "lcr" value */
@@ -1215,9 +1215,6 @@ uftdi_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_SETUP:
 	case USB_ST_TRANSFERRED:
 tr_setup:
-		if (usbd_xfer_get_and_clr_zlp(xfer))
-			break;
-
 		/*
 		 * If output packets don't require headers (the common case) we
 		 * can just load the buffer up with payload bytes all at once.