git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From c2b82650365540cc1e1b93b7ad2c44103fc8bb76 Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.com>
   3 Date: Wed, 11 Aug 2021 15:33:57 +0100
   4 Subject: [PATCH] usb: xhci: workaround for bogus SET_DEQ_PENDING
   5  endpoint state
   6
   7 See https://github.com/raspberrypi/linux/issues/3981
   8
   9 An unknown unsafe memory access can result in the ep_state variable
  10 in xhci_virt_ep being trampled with a stuck SET_DEQ_PENDING state
  11 despite successful completion of a Set TR Deq Pointer command.
  12
  13 All URB enqueue/dequeue calls for the endpoint will fail in this state
  14 so no transfers are possible until the device is reconnected.
  15
  16 As a workaround, clear the flag if we see it set and issue a new Set
  17 TR Deq command anyway - this should be harmless, as a prior Set TR Deq
  18 command will only have been issued in the Stopped state, and if the
  19 endpoint is Running then the controller is required to ignore it and
  20 respond with a Context State Error event TRB.
  21
  22 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  23 ---
  24  drivers/usb/host/xhci-ring.c | 6 +++---
  25  1 file changed, 3 insertions(+), 3 deletions(-)
  26
  27 --- a/drivers/usb/host/xhci-ring.c
  28 +++ b/drivers/usb/host/xhci-ring.c
  29 @@ -697,9 +697,9 @@ deq_found:
  30         }
  31
  32         if ((ep->ep_state & SET_DEQ_PENDING)) {
  33 -               xhci_warn(xhci, "Set TR Deq already pending, don't submit for 0x%pad\n",
  34 -                         &addr);
  35 -               return -EBUSY;
  36 +               xhci_warn(xhci, "WARN A Set TR Deq Ptr command is pending for slot %u ep %u\n",
  37 +                         slot_id, ep_index);
  38 +               ep->ep_state &= ~SET_DEQ_PENDING;
  39         }
  40
  41         /* This function gets called from contexts where it cannot sleep */