From nobody Wed May 04 12:27:33 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9C9EA1ACC8E4; Wed, 4 May 2022 12:27:33 +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 4Ktbgn3JKYz53T8; Wed, 4 May 2022 12:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651667253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmgOprP+aSMAcycH/CaiaWpqY+5+nrMyT5oc0oi6X2k=; b=tOIv7j8qXHo/MZi7uEk7Mvd5rpYqjFvbHz3cghcwX5WCHOWu5ucuNrhrpuW9iLVwiqya2Y JuEGiGUnYhcOsWzCtNlwOCLT/QtADEasqCMG2QnRNEE4T0Sh3AfSoKfKIoT5pQe9regUFe U+kaWTZsn11oPdhcQHgKO6CC0B52R7dw644KvkhU1NFnjTxTe41JkJ2C2FxyrwSEvuM/e8 eKBRDg7UWf7bnO2/qQQfJ70khY0/KbxLTXU/CgXpW2J/Hiwb18xKrH+6c7MpB+vGDT++PM pb3xap92B6MA2G2eTq6GT6FHXwadNtjTBZ2hsuy6PAvrfnAc5TRxXukEHgswzw== 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 4D08412F36; Wed, 4 May 2022 12:27:33 +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 244CRXWk088998; Wed, 4 May 2022 12:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244CRXHx088997; Wed, 4 May 2022 12:27:33 GMT (envelope-from git) Date: Wed, 4 May 2022 12:27:33 GMT Message-Id: <202205041227.244CRXHx088997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 465c5bd88e64 - releng/13.1 - xhci(4): Always add and evaluate the slot context. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 465c5bd88e64852b39d711ea3e565edc90d65210 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651667253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmgOprP+aSMAcycH/CaiaWpqY+5+nrMyT5oc0oi6X2k=; b=T2CdP99FZv8CV7Oqk7eIEVpCE74vSZvkINr9hB2ziag3Wb0RiJqMCeGwKmz3M0oX7Yh0Gw iK/DHIuFWPyyYtY3os3PxSU3SEca91y8NFWKyhwLR7mD1tGQ6jXB+0oUTual/jUY//gM8R uV+9DZvvjO5vKXDqpKRBaXjejrmwohcTCjg3ueinBvyol7dfgW0C3rb372v6vXs+OvtaB3 shIlfBaDnNDWusT7sziWSrvM3ZDPG5i+g+t/FF4GLitX0isc7cjiXp7zsfFu4AOVX9yLwa IHFuA51EkffdgxgR3h7jc3sDywYzQz9GXkmanQxC/qFQR8G73DdNaf0mfQa4WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651667253; a=rsa-sha256; cv=none; b=J7wsQgFzz3lYT/A+2zHqPVCBfyAdxBKmyqjmbicUB4S7oAs6khkTZ+ueYOvFas3eCKNz5q xT5cW2lJR+cukx32HdYEWN9D5TlLLCwABpc0b1w6XQChbI6ldB49E3wK2fhsKYv/egIW0Q 8Y3Q6ZcS5p4u0k/yMWwDoBVuzMcMR2Bi4VEVvOOtZQAhzBgXEV433B9ucNDyQrc0x7MOkA gFHLI4fy67HjGQcP8Fs2kdnQrKj4gwkeqLamQrwC9BE6TVLWjArn3tH4VcEZ3X6Bxtr0j3 oHFOTVOVbCSQDYf0R1XTsGn258SbstF6JuR4o336MBsdvZEpGpyRMqfE7ug7gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=465c5bd88e64852b39d711ea3e565edc90d65210 commit 465c5bd88e64852b39d711ea3e565edc90d65210 Author: Hans Petter Selasky AuthorDate: 2022-05-03 16:10:49 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-04 07:20:54 +0000 xhci(4): Always add and evaluate the slot context. Because the maximum number of endpoint contexts is stored there. Tested by: ehaupt@ PR: 262882 Approved by: re (gjb, early MFC) Sponsored by: NVIDIA Networking (cherry picked from commit 09dd1adfa4c9bb1b49f4ef5524a308732883e132) (cherry picked from commit 6d8c6b24ee0a0416204356a98e4e7606489894c5) --- sys/dev/usb/controller/xhci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 9e812edae991..aa8ea280eb8b 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3917,7 +3917,11 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) } } - xhci_configure_mask(udev, mask, 0); + /* + * Always need to evaluate the slot context, because the maximum + * number of endpoint contexts is stored there. + */ + xhci_configure_mask(udev, mask | 1U, 0); if (!(sc->sc_hw.devs[index].ep_configured & mask)) { err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index);