From owner-dev-commits-src-main@freebsd.org Fri Aug 20 07:55:53 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76D7965B030; Fri, 20 Aug 2021 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GrYpx2wDyz4wtq; Fri, 20 Aug 2021 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47C4F15790; Fri, 20 Aug 2021 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17K7trXa074998; Fri, 20 Aug 2021 07:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17K7trx6074997; Fri, 20 Aug 2021 07:55:53 GMT (envelope-from git) Date: Fri, 20 Aug 2021 07:55:53 GMT Message-Id: <202108200755.17K7trx6074997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: bcb195d91717 - main - Partial revert of f83f5d58394db57576bbed6dc7531997cabeb102 for uftdi(4). Apparently devices with bcdDevice less than 0x0600, have problems receiving ZLPs. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcb195d91717bf182d27b9ce8cf0e43595c6e763 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2021 07:55:53 -0000 The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=bcb195d91717bf182d27b9ce8cf0e43595c6e763 commit bcb195d91717bf182d27b9ce8cf0e43595c6e763 Author: Hans Petter Selasky AuthorDate: 2021-08-20 07:52:32 +0000 Commit: Hans Petter Selasky 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.