From nobody Tue May 3 19:45:57 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 28D1E1ACC919; Tue, 3 May 2022 19:45:58 +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 4Kt9S53Km9z4Vpb; Tue, 3 May 2022 19:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651607157; 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=RaVkm5ip6/5bhF/O+omHnQGu1QxhtQc2o5JVEOvLX6s=; b=FJtesLw/CSgEvJZV2H/w36Fx5VpRGM7Mt9LnskHITMeQzy6N2s8uKUFRGkvr+P3lSTrYOx Ba/JwGThGqZnML+oZxh0ZGZDZTAn+F9C0YQD8WU+l9CeQ6abBOiYuHTbprxVAeHv3gYo66 nX4TMcdEidgz8FvGbbrrHjmNos07Pxp4qviAblMU+sLU+P0tkm538pNZtUjlEl8JNNG8Iz dWOQZbgJ8Ph52jMyivs6xO/BzyIWrURHv0vP/nBBixw4i3hZKR298ow2XYv+EzxGmMqSUC HfZWbvrM86C153KGyYgIF6EQnBN/A/ThfVgNkTsx76imZNVJU8F6w+6MlELN8w== 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 537F024822; Tue, 3 May 2022 19:45:57 +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 243Jjvxu039617; Tue, 3 May 2022 19:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243JjvMA039616; Tue, 3 May 2022 19:45:57 GMT (envelope-from git) Date: Tue, 3 May 2022 19:45:57 GMT Message-Id: <202205031945.243JjvMA039616@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: 6d8c6b24ee0a - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d8c6b24ee0a0416204356a98e4e7606489894c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651607157; 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=RaVkm5ip6/5bhF/O+omHnQGu1QxhtQc2o5JVEOvLX6s=; b=qcg4Zr4+vfb3ih5atrkSyaU1SziGJDCmcaBxESXeTJhoo+o/fvOktBpFEHpFSZaWZrcUaj 8iSkBYnPIiZj4/8j9B7gnj7SPD/+0+OkjYtkGP5tT/J9CNcat14PYfaMDhm/iljooLKufK Y02VxlqTF1IeJoU3SWCYRPyJaatBDD4AB4Ity6CivH1jlZYOMceg11AsXKniaFgc0UabAU 4Nekb/FjM+v9zTSY0Ty9gB+egD9IPBgcIcGgSiExujCLodJpdRI8YL4cHw9QpP+vJEkEz/ OeU4+xqmHQLBJ21+4i9ZXt02i2iF3DeMPm8CJ+V3v5/2VG+y2WfjG2e7bf7EQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651607157; a=rsa-sha256; cv=none; b=EZd4UFPwb5nHFwctRgVQLJxEFn65en9RsFtuJoxX8sc3CWiuvvXAKInqNA3TeZniofYx/3 2trefX505iQlqbKQ7LgF455VLgNEcMrs1KrlYD/aRe9NDrxx6iY5STEDQT4HQ46xdtNDK3 3xo+S8QNe+3GDt/uKxj4hpfeS8nCre4Lra4owVqH6igYaH/Ffxg4EHNy+BQBNe53yJ8tTN 1M/tdIYZAI719SJqfN8W+kesNO/f8SxEzGH9Z7+XXL9qYpmxp6I8hDFAGgpyzhtbY17VX4 pY65Nolgh+7ZWYSbM7qFu/HJCEaBY8C3tJJHY3eVhx15Ls8uoFSO1q0ko1JIQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=6d8c6b24ee0a0416204356a98e4e7606489894c5 commit 6d8c6b24ee0a0416204356a98e4e7606489894c5 Author: Hans Petter Selasky AuthorDate: 2022-05-03 16:10:49 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-03 19:43:13 +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) --- 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);