From nobody Wed May 04 07:31:01 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 69A7C11DD50A; Wed, 4 May 2022 07:31:01 +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 4KtT5d2BL4z3nH1; Wed, 4 May 2022 07:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649461; 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=BJRc1yJn3U7fgXaxdz4zO6TqUJhP5DvlT0ka87TiQAk=; b=cRoCvP14H2hLfHuWc3jBQ9VgzWf6n5CjQIIrnmnyAoTeU1wjizm3xZhoNoIOvNo2eW5l7x b5wzlbkr78jLKDYMgK3zJTHlkJ7e7LfbsB06MfPHRM1UqzzFgkNA4ar4Xc3wF8Zyp63bwj C/rnWdljftGqiwr86AZq5VciV3f5f9zN9hrRFJXlozUAYWk7QWfdRfkyMA4kBrEMCLR7FS s1BqAzTtLa76znXuyp+8Owfr2chiHccKsTLSXl28yoABE5G1AmHVOE5DuDt7dYsvma0L/E m8BkGHlsLn2rphpftlqUIvLn2g24hoqdOM+33JjDTOaniaf/ziWK0skKhrA5jA== 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 2AAE46D43; Wed, 4 May 2022 07:31:01 +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 2447V1TY093427; Wed, 4 May 2022 07:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2447V1op093426; Wed, 4 May 2022 07:31:01 GMT (envelope-from git) Date: Wed, 4 May 2022 07:31:01 GMT Message-Id: <202205040731.2447V1op093426@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: cacb5f3ea5d3 - stable/11 - 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/11 X-Git-Reftype: branch X-Git-Commit: cacb5f3ea5d39d9ee02e6f278993fb1b308ca9ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649461; 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=BJRc1yJn3U7fgXaxdz4zO6TqUJhP5DvlT0ka87TiQAk=; b=uKLP4cpNwpKLpM9BoyeAQDAneXuQv4UgJK/lNtO+AF9zv7kpSnt/AmI9Gw8dathWWbRzP6 D/iFqKTtIRh6Gon8gWSBdrCccnk1Sftr5bgz2Vkx276Mk1LjbUIgpl62SMA8u9rJXM7kwf 2nuZnjZIe8OKvRnuy6ZIKuXJenrPxiaIg1svyqQ8MmSFpNA2lQ0jY3+FGkeVj584HBBbHT lcb7HbxeQc1vUlKYeq0/FWWKYWARtQMzwe9erGjCTktZMnE0Z2E/UA2zjXFg7y/FjCV7gi UaInEZ+2kP9b3/mFPl2rpyou1y94lUGNwkh9aNH5nRKKARxv1jt8YUuqqnDL2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651649461; a=rsa-sha256; cv=none; b=JSztsnfgAWt/MKPLyDBx3EeYeyGSeYQA0L5Td+KGP6XSraqztgJCkt1HVNKkBNjPEFMI2i 5C6aNYJH7zv2zD312Wl5rRRMcvSx9ESp3GamU55p0C5ga0W8Bz4r/5+J8uHujcX5MS1e+Q x+XrfYY5OYtlnz4/d9orvyaDmJQTswqo/cDoIdD+egLh26y53/Tcvg13n11OpMtyjHr0aq Bx+uiAkeJxMU1UORp2nDsOvvHRaxy50cYqc1ZAcaFewbYZfyDqb+0XT2S7vp9Xuv7sfBxG EDkM7hzki8D2CsFCd94XHOBX9givDxgVLGD8AFusu9alnsGmzPKeoy1ojiL5/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/11 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=cacb5f3ea5d39d9ee02e6f278993fb1b308ca9ba commit cacb5f3ea5d39d9ee02e6f278993fb1b308ca9ba Author: Hans Petter Selasky AuthorDate: 2022-05-03 16:10:49 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-04 07:30:12 +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 17fcc3ee09cf..4d7d9a199807 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);