mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-09-20 00:19:23 +00:00
6dcf9882e4
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.189 Manually rebased patches: bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch[1] bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch[1] bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch[1] bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch[1] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.189&id=e262ff8d634cf6e0028fb7b3643cdd8b758513be Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19466 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From d631e7354399aa2fb6079b72f515acd6d080c203 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.com>
|
|
Date: Thu, 13 Jul 2023 14:43:21 +0100
|
|
Subject: [PATCH 0481/1085] xhci: Use more event ring segment table entries
|
|
|
|
Users have reported log spam created by "Event Ring Full" xHC event
|
|
TRBs. These are caused by interrupt latency in conjunction with a very
|
|
busy set of devices on the bus. The errors are benign, but throughput
|
|
will suffer as the xHC will pause processing of transfers until the
|
|
event ring is drained by the kernel. Expand the number of event TRB slots
|
|
available by increasing the number of event ring segments in the ERST.
|
|
|
|
Controllers have a hardware-defined limit as to the number of ERST
|
|
entries they can process, so make the actual number in use
|
|
min(ERST_MAX_SEGS, hw_max).
|
|
|
|
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
---
|
|
drivers/usb/host/xhci-mem.c | 9 +++++++--
|
|
drivers/usb/host/xhci.h | 5 +++--
|
|
2 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/usb/host/xhci-mem.c
|
|
+++ b/drivers/usb/host/xhci-mem.c
|
|
@@ -2282,6 +2282,7 @@ xhci_alloc_interrupter(struct xhci_hcd *
|
|
{
|
|
struct device *dev = xhci_to_hcd(xhci)->self.sysdev;
|
|
struct xhci_interrupter *ir;
|
|
+ unsigned int nr_event_segs;
|
|
u64 erst_base;
|
|
u32 erst_size;
|
|
int ret;
|
|
@@ -2302,7 +2303,11 @@ xhci_alloc_interrupter(struct xhci_hcd *
|
|
return NULL;
|
|
|
|
ir->ir_set = &xhci->run_regs->ir_set[intr_num];
|
|
- ir->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, 1, TYPE_EVENT,
|
|
+ nr_event_segs = min_t(unsigned int,
|
|
+ 1 << HCS_ERST_MAX(xhci->hcs_params2),
|
|
+ ERST_MAX_SEGS);
|
|
+
|
|
+ ir->event_ring = xhci_ring_alloc(xhci, nr_event_segs, 1, TYPE_EVENT,
|
|
0, flags);
|
|
if (!ir->event_ring) {
|
|
xhci_warn(xhci, "Failed to allocate interrupter %d event ring\n", intr_num);
|
|
@@ -2318,7 +2323,7 @@ xhci_alloc_interrupter(struct xhci_hcd *
|
|
/* set ERST count with the number of entries in the segment table */
|
|
erst_size = readl(&ir->ir_set->erst_size);
|
|
erst_size &= ERST_SIZE_MASK;
|
|
- erst_size |= ERST_NUM_SEGS;
|
|
+ erst_size |= ir->event_ring->num_segs;
|
|
writel(erst_size, &ir->ir_set->erst_size);
|
|
|
|
erst_base = xhci_read_64(xhci, &ir->ir_set->erst_base);
|
|
--- a/drivers/usb/host/xhci.h
|
|
+++ b/drivers/usb/host/xhci.h
|
|
@@ -1429,8 +1429,9 @@ struct urb_priv {
|
|
* Each segment table entry is 4*32bits long. 1K seems like an ok size:
|
|
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
|
|
* meaning 64 ring segments.
|
|
- * Initial allocated size of the ERST, in number of entries */
|
|
-#define ERST_NUM_SEGS 1
|
|
+ */
|
|
+/* Maximum number of segments in the ERST */
|
|
+#define ERST_MAX_SEGS 8
|
|
/* Poll every 60 seconds */
|
|
#define POLL_TIMEOUT 60
|
|
/* Stop endpoint command timeout (secs) for URB cancellation watchdog timer */
|