mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-09-23 02:19:22 +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>
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 4dccc6e881f1e8d93c895a4b89e266d79e2746df Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.org>
|
|
Date: Mon, 26 Oct 2020 14:03:35 +0000
|
|
Subject: [PATCH] xhci: quirks: add link TRB quirk for VL805
|
|
|
|
The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint
|
|
being set to a Link TRB. The hardware-maintained endpoint context ends up
|
|
stuck at the address of the Link TRB, leading to erroneous ring expansion
|
|
events whenever the enqueue pointer wraps to the dequeue position.
|
|
|
|
If the search for the end of the current TD and ring cycle state lands on
|
|
a Link TRB, move to the next segment.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/3919
|
|
|
|
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
---
|
|
drivers/usb/host/xhci-pci.c | 1 +
|
|
drivers/usb/host/xhci-ring.c | 9 +++++++++
|
|
drivers/usb/host/xhci.h | 1 +
|
|
3 files changed, 11 insertions(+)
|
|
|
|
--- a/drivers/usb/host/xhci-pci.c
|
|
+++ b/drivers/usb/host/xhci-pci.c
|
|
@@ -338,6 +338,7 @@ static void xhci_pci_quirks(struct devic
|
|
if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == PCI_DEVICE_ID_VIA_VL805) {
|
|
xhci->quirks |= XHCI_LPM_SUPPORT;
|
|
xhci->quirks |= XHCI_TRB_OVERFETCH;
|
|
+ xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
|
|
}
|
|
|
|
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
|
--- a/drivers/usb/host/xhci-ring.c
|
|
+++ b/drivers/usb/host/xhci-ring.c
|
|
@@ -667,6 +667,15 @@ static int xhci_move_dequeue_past_td(str
|
|
} while (!cycle_found || !td_last_trb_found);
|
|
|
|
deq_found:
|
|
+ /*
|
|
+ * Quirk: the xHC does not correctly parse link TRBs if the HW Dequeue
|
|
+ * pointer is set to one. Advance to the next TRB (and next segment).
|
|
+ */
|
|
+ if (xhci->quirks & XHCI_AVOID_DQ_ON_LINK && trb_is_link(new_deq)) {
|
|
+ if (link_trb_toggles_cycle(new_deq))
|
|
+ new_cycle ^= 0x1;
|
|
+ next_trb(xhci, ep_ring, &new_seg, &new_deq);
|
|
+ }
|
|
|
|
/* Don't update the ring cycle state for the producer (us). */
|
|
addr = xhci_trb_virt_to_dma(new_seg, new_deq);
|
|
--- a/drivers/usb/host/xhci.h
|
|
+++ b/drivers/usb/host/xhci.h
|
|
@@ -1671,6 +1671,7 @@ struct xhci_hcd {
|
|
#define XHCI_WRITE_64_HI_LO BIT_ULL(47)
|
|
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48)
|
|
#define XHCI_LIMIT_ENDPOINT_INTERVAL_9 BIT_ULL(49)
|
|
+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(50)
|
|
|
|
unsigned int num_active_eps;
|
|
unsigned int limit_active_eps;
|