target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch

   1 From 510fccc1a7533aa9f46d97ad500fe45ab7f91010 Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.org>
   3 Date: Mon, 26 Oct 2020 14:03:35 +0000
   4 Subject: [PATCH] xhci: quirks: add link TRB quirk for VL805
   5
   6 The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint
   7 being set to a Link TRB. The hardware-maintained endpoint context ends up
   8 stuck at the address of the Link TRB, leading to erroneous ring expansion
   9 events whenever the enqueue pointer wraps to the dequeue position.
  10
  11 If the search for the end of the current TD and ring cycle state lands on
  12 a Link TRB, move to the next segment.
  13
  14 See: https://github.com/raspberrypi/linux/issues/3919
  15
  16 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  17 ---
  18  drivers/usb/host/xhci-pci.c  |  1 +
  19  drivers/usb/host/xhci-ring.c | 10 ++++++++++
  20  drivers/usb/host/xhci.h      |  1 +
  21  3 files changed, 12 insertions(+)
  22
  23 --- a/drivers/usb/host/xhci-pci.c
  24 +++ b/drivers/usb/host/xhci-pci.c
  25 @@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct devic
  26                         pdev->device == 0x3483) {
  27                 xhci->quirks |= XHCI_LPM_SUPPORT;
  28                 xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
  29 +               xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
  30         }
  31
  32         if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
  33 --- a/drivers/usb/host/xhci-ring.c
  34 +++ b/drivers/usb/host/xhci-ring.c
  35 @@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct
  36
  37         } while (!cycle_found || !td_last_trb_found);
  38
  39 +       /*
  40 +        * Quirk: the xHC does not correctly parse link TRBs if the HW Dequeue
  41 +        * pointer is set to one. Advance to the next TRB (and next segment).
  42 +        */
  43 +       if (xhci->quirks & XHCI_AVOID_DQ_ON_LINK && trb_is_link(new_deq)) {
  44 +               if (link_trb_toggles_cycle(new_deq))
  45 +                       state->new_cycle_state ^= 0x1;
  46 +               next_trb(xhci, ep_ring, &new_seg, &new_deq);
  47 +       }
  48 +
  49         state->new_deq_seg = new_seg;
  50         state->new_deq_ptr = new_deq;
  51
  52 --- a/drivers/usb/host/xhci.h
  53 +++ b/drivers/usb/host/xhci.h
  54 @@ -1876,6 +1876,7 @@ struct xhci_hcd {
  55  #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36)
  56  #define XHCI_SKIP_PHY_INIT     BIT_ULL(37)
  57  #define XHCI_DISABLE_SPARSE    BIT_ULL(38)
  58 +#define XHCI_AVOID_DQ_ON_LINK  BIT_ULL(39)
  59  #define XHCI_NO_SOFT_RETRY     BIT_ULL(40)
  60
  61         unsigned int            num_active_eps;