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.

[Hans Petter Selasky]

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 <hsela...@freebsd.org>
AuthorDate: 2021-07-10 12:14:11 +0000
Commit:     Hans Petter Selasky <hsela...@freebsd.org>
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];