From nobody Wed May 4 07:29:26 2022 X-Original-To: dev-commits-src-all@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 94D1611DC656; Wed, 4 May 2022 07:29:26 +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 4KtT3p2fwTz3m75; Wed, 4 May 2022 07:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649366; 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=auDlRZrmPWIspf8PcO/9wOdfza4LsG6J2gO2jjc2slo=; b=bzXNgcAD46pqQ+IwLXBOgNT8H+mwCbf00eWULg5JbbIC0yCKfYbVptyByuX1RDQcI7Gxq/ P7devOi0jJNOPeet1EqBmoSMYwt2qXGolX59NDqH0/rylGweExG50PsiZRHzcgDytxH0Lw VBluBLqpPgAGKKyJvPcgZ8qkZK+DZWYa/73btHAPY39H7CKGXwYUN3P35/f4Eum2HvVtEm 5l35Xdys6AUNJYd+zJEfWSWZu8VjGDcM5RUSap5ogE9v4Us3H9HdJTUmO8+tuFD2NEkTqg iOcI0UefMjN+trMjWqKQ2qXVQplbRGabfPQzEW8aQaf8e7Fi6ECNJv9JN083Fg== 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 34018667B; Wed, 4 May 2022 07:29:26 +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 2447TQON084880; Wed, 4 May 2022 07:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2447TQEw084879; Wed, 4 May 2022 07:29:26 GMT (envelope-from git) Date: Wed, 4 May 2022 07:29:26 GMT Message-Id: <202205040729.2447TQEw084879@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: 11a732b28031 - stable/12 - xhci(4): Always add and evaluate the slot context. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 11a732b280319e2babb5d575d14e89e12127d06a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649366; 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=auDlRZrmPWIspf8PcO/9wOdfza4LsG6J2gO2jjc2slo=; b=I4pW1Z1uNauhwUdnPI07uHDfnMeFIQtAq/J295box737FfLt7RfWbyt5tYMGqjtWpEyt9v DAbUfnOQFpWA1i5AYXGYG/U+Q8BB8+UnJ9t/dyX5uW5YsMaqQO/iFPsSCeGARaKWkmKVpJ oF3Xalm71QyrNsjxAyI5R9hppw0tX1SleBv4/m/RTADZMadYxwpcJereBYagPqcUOKyph1 q5Dx8RF57stOZii5A31uUxr275jvQTCQvTZhevjJam9bS1lQEjUoWF+BGXDL5i8+wbbFG8 GFsVuFYfkZ1JxoTPTQQXK6hYBMnsOcaAfuzRS7DfLGHYgDdQf1IKaPQAappBFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651649366; a=rsa-sha256; cv=none; b=mRe2R2nnFFDU/EJqV2XgFbZuA1VwVQsYvxiIOdRvCM33FrnmM7gPH3AQAEFRDFXV+BRpNC fiXm7mYaFU/kMPDlmO6CDm4HEvxH2Vw/VtEXTp4875sMqA6fw1VZTm9w2F1NFccO7K/oCu Rquel68rDBvaGW1+L+q1DXnqeQLUoyQ2eXFuAJXfXQ5/tvSAKpXCayoJAfHKfo1vBcOT8K 4DM05cBnZHb5Sdc6ltpmK1UbcOrdmJ9LQHeOb0l/jVVsr5oiBLHY6278pnDzHKZsUQ43fI HmY/SLvaw6iVKagRYJ9LHWfCYHo3V8rKQeb8/V9pXy1LhSdBfJ0YrK8ZyaxzPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=11a732b280319e2babb5d575d14e89e12127d06a commit 11a732b280319e2babb5d575d14e89e12127d06a Author: Hans Petter Selasky AuthorDate: 2022-05-03 16:10:49 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-04 07:28:46 +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 Sponsored by: NVIDIA Networking (cherry picked from commit 09dd1adfa4c9bb1b49f4ef5524a308732883e132) --- 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 c2c111525e81..1d335fa6ee8d 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3951,7 +3951,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);