diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-29 22:42:38 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:21:01 +0200 |
| commit | 2d5ee43dc6390d84620807c741d2cb0e272b49ce (patch) | |
| tree | 8a446db7162217f8536fd099bc4d027aa591e091 /target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch | |
| parent | a205de55941b025f6f85ac19005496c726d6e157 (diff) | |
| download | upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.gz upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.bz2 upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.zip | |
kernel: bump 5.4 to 5.4.137
Manually rebased
generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
All others updated automatically.
Compile-tested on: ramips/mt7621, armvirt/32
Runtime-tested on: ramips/mt7621, armvirt/32
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index e60468c848..0c3f290ea2 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -37,7 +37,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -527,7 +527,10 @@ void xhci_find_new_dequeue_state(struct +@@ -550,7 +550,10 @@ void xhci_find_new_dequeue_state(struct struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_ring *ep_ring; struct xhci_segment *new_seg; @@ -48,7 +48,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> dma_addr_t addr; u64 hw_dequeue; bool cycle_found = false; -@@ -565,7 +568,28 @@ void xhci_find_new_dequeue_state(struct +@@ -588,7 +591,28 @@ void xhci_find_new_dequeue_state(struct hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id); new_seg = ep_ring->deq_seg; new_deq = ep_ring->dequeue; @@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1873,6 +1873,7 @@ struct xhci_hcd { +@@ -1874,6 +1874,7 @@ struct xhci_hcd { #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) |