diff --git a/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch b/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch deleted file mode 100644 index b4455122..00000000 --- a/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5d9d9ba7547ad27d76dd36791f54a57ff555ff8a Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -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 ---- - drivers/usb/host/xhci-pci.c | 1 + - drivers/usb/host/xhci-ring.c | 10 ++++++++++ - drivers/usb/host/xhci.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 5238fa29ea978..b975e6803d485 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -251,6 +251,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) - pdev->device == 0x3483) { - xhci->quirks |= XHCI_LPM_SUPPORT; - xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; -+ xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; - } - - if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && -diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index d99e636f3844c..8149abff857c2 100644 ---- a/drivers/usb/host/xhci-ring.c -+++ b/drivers/usb/host/xhci-ring.c -@@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, - - } while (!cycle_found || !td_last_trb_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)) -+ state->new_cycle_state ^= 0x1; -+ next_trb(xhci, ep_ring, &new_seg, &new_deq); -+ } -+ - state->new_deq_seg = new_seg; - state->new_deq_ptr = new_deq; - -diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 2033bb8683033..90ccc71231c1a 100644 ---- a/drivers/usb/host/xhci.h -+++ b/drivers/usb/host/xhci.h -@@ -1874,7 +1874,8 @@ struct xhci_hcd { - #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) - #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) - #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) -+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(37) - #define XHCI_DISABLE_SPARSE BIT_ULL(38) - - unsigned int num_active_eps; - unsigned int limit_active_eps;