diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-07-10 12:14:11 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2022-03-17 12:25:49 +0000 |
| commit | 723a1d106718bf194dfabadacc48fdb94c2749f1 (patch) | |
| tree | 48d349ecd77fd72d0dd14d0dcf1cd955bccfc8bf | |
| parent | cf3800dc203727bfd44a6a0f4a4416758a089169 (diff) | |
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)
| -rw-r--r-- | sys/dev/usb/controller/xhci.h | 4 |
1 files changed, 3 insertions, 1 deletions
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]; |