From nobody Thu Mar 17 12:28:05 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 EA0E71A24FFE; Thu, 17 Mar 2022 12:28:05 +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 4KK5yY4rVDz4r0J; Thu, 17 Mar 2022 12:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520085; 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=9hBAbkSviTm+akGSWFO895TnKnYX7cJTzC3/X0NQ6ik=; b=eqKVWcUqERv3Wzxi9pFryitrtYvHHf/x1PlcskTj90A92rzRgXdeniHdUfw16ToSgIi3/x lA0a0U+8apOPqxUIQVnq4BIQWylFfRzjNd4f/mqLBtJXi71MwjfJlhXvdvL/mRXIMEwRy6 twGbxGhTx6WH+Iut+SL41OO4/lM9UbHGg+Zzn566kc/qtIWGMd90zhTth21dWw3332z5j3 yS66EXsGsHBsvXHeiMejHWXzEXiftkQba93maykFeywaKF9kMvOboPPPBiuyBuhzXnS2iV PeWNw01t4xX4L4YuPMuCJ3/iJIwmSst1g5N3YTeYcgQPZouggFR2/Yh38NFdWw== 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 7B1F82780; Thu, 17 Mar 2022 12:28:05 +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 22HCS572083735; Thu, 17 Mar 2022 12:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HCS5EF083734; Thu, 17 Mar 2022 12:28:05 GMT (envelope-from git) Date: Thu, 17 Mar 2022 12:28:05 GMT Message-Id: <202203171228.22HCS5EF083734@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: 723a1d106718 - releng/13.1 - Let the xhci_hw_root structure span exactly XHCI_PAGE_SIZE bytes by increasing the number of completion event TRBs. This avoids wasting memory. 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 723a1d106718bf194dfabadacc48fdb94c2749f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520085; 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=9hBAbkSviTm+akGSWFO895TnKnYX7cJTzC3/X0NQ6ik=; b=iRQFPsco1TRDJTXs34Qu4nppfjwrivHer6uAaSrhqOYlkUaZpkQNasMtGrCiBFhLL3GT0h yXEyPBkBfc1N8orWipsflEw/CartUDiBtpMAO/Z7MT6pkm8q/SiDzRY+ZpALegh4Oz3DdP u/P6qA5HtUaX5igQWSYeCzY8M3a5nQ5ISUXRLdTEwtbLCbeAO43sON8aT23Rdo231kirYX 5npnixO5zwpdtnoPUcPUUulAn3O2DLeAnTz9T67TW+AINaB2ozoCXMAQrAbGG1milAWsJv EspTDrvgFg5fj6jNBLhYTjEg3vG896FV0M3X4vmFJ9XZqqOQ1hgZxgTANuCaIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647520085; a=rsa-sha256; cv=none; b=pn+xYDvqbcahAzlGibEE5C5HOOY50BjLHQG9NWOx/ywfkXeZWwyZAWBYGuMOsLyeJ64q/E uhlA2i6IhHVc73Rh7YJefBxuDvb8ELf0AKSbjK+sutFq3tBsHIhFWF7S95hQ2r2w++0bb3 I7IwXfWwrfqu9WhfanclExSfKJJMJ8c8qdYK8VW9iniOpfRZd8SyEpOOWy2jCJFg0kfG7x UvvuxKVWaaMVoGVo6QmTRTgEpbzZO6vyhkORfqbw139vQS1XDv7dZVB3u0RbebFaNeiWx/ rBWKnWqZsZwWJuHWYrHlMK0ymyrMS9ECpOBgF2mT+/IU19U2R4fxgBdfXZmx1A== 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=723a1d106718bf194dfabadacc48fdb94c2749f1 commit 723a1d106718bf194dfabadacc48fdb94c2749f1 Author: Hans Petter Selasky AuthorDate: 2021-07-10 12:14:11 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-17 12:25:49 +0000 Let the xhci_hw_root structure span exactly XHCI_PAGE_SIZE bytes by increasing the number of completion event TRBs. This avoids wasting memory. Sponsored by: NVIDIA Networking Approved by: re (gjb) (cherry picked from commit e036ee6ce2e4d6fe0564f8bb3aa99a2f61d48fc6) (cherry picked from commit afeeccfbed271f4f6ba7b300d01eea34281395fd) --- sys/dev/usb/controller/xhci.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index c0427e0cf11f..e8841a05b134 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -33,7 +33,7 @@ #define XHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) #define XHCI_MAX_ENDPOINTS 32 /* hardcoded - do not change */ #define XHCI_MAX_SCRATCHPADS 256 /* theoretical max is 1023 */ -#define XHCI_MAX_EVENTS (16 * 13) +#define XHCI_MAX_EVENTS 232 #define XHCI_MAX_COMMANDS (16 * 1) #define XHCI_MAX_RSEG 1 #define XHCI_MAX_TRANSFERS 4 @@ -383,6 +383,8 @@ struct xhci_hw_root { struct xhci_trb hwr_commands[XHCI_MAX_COMMANDS]; }; +CTASSERT(sizeof(struct xhci_hw_root) == XHCI_PAGE_SIZE); + struct xhci_endpoint_ext { struct xhci_trb *trb; struct usb_xfer *xfer[XHCI_MAX_TRANSFERS * XHCI_MAX_STREAMS];