kernel: bump 4.14 to 4.14.125 (FS#2305 FS#2297)

[openwrt/staging/wigyori.git] / target / linux / bcm53xx / patches-4.14 / 180-usb-xhci-add-support-for-performing-fake-doorbell.patch

diff --git a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
index f7dd241e2f0b4865900a71d41ed7e25d0e2147da..5784f5e5abf10a92fbc76f62d50d3badf3810943 100644 (file)
--- a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
+++ b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
@@ -40,7 +40,7 @@ it on BCM4708 family.
  /* called during probe() after chip reset completes */
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -168,6 +168,49 @@ int xhci_start(struct xhci_hcd *xhci)
+@@ -166,6 +166,49 @@ int xhci_start(struct xhci_hcd *xhci)
        return ret;
  }
  
@@ -90,7 +90,7 @@ it on BCM4708 family.
  /*
   * Reset a halted HC.
   *
-@@ -551,10 +594,20 @@ static int xhci_init(struct usb_hcd *hcd
+@@ -549,10 +592,20 @@ static int xhci_init(struct usb_hcd *hcd
  
  static int xhci_run_finished(struct xhci_hcd *xhci)
  {
@@ -114,7 +114,7 @@ it on BCM4708 family.
        xhci->shared_hcd->state = HC_STATE_RUNNING;
        xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
  
-@@ -564,6 +617,10 @@ static int xhci_run_finished(struct xhci
+@@ -562,6 +615,10 @@ static int xhci_run_finished(struct xhci
        xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                        "Finished xhci_run for USB3 roothub");
        return 0;
@@ -127,11 +127,11 @@ it on BCM4708 family.
  /*
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1839,6 +1839,7 @@ struct xhci_hcd {
- #define XHCI_SUSPEND_DELAY    BIT_ULL(30)
+@@ -1840,6 +1840,7 @@ struct xhci_hcd {
  #define XHCI_INTEL_USB_ROLE_SW        BIT_ULL(31)
  #define XHCI_RESET_PLL_ON_DISCONNECT  BIT_ULL(34)
-+#define XHCI_FAKE_DOORBELL    BIT_ULL(35)
+ #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
++#define XHCI_FAKE_DOORBELL    BIT_ULL(36)
  
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;