f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
From e071e9b36cb053f06a10986d987bfeb0e362657c Mon Sep 17 00:00:00 2001
|
|
From: P33M <p33m@github.com>
|
|
Date: Tue, 13 Feb 2018 15:41:35 +0000
|
|
Subject: [PATCH 205/454] dwc_otg: Fix a regression when dequeueing isochronous
|
|
transfers
|
|
|
|
In 282bed95 (dwc_otg: make nak_holdoff work as intended with empty queues)
|
|
the dequeue mechanism was changed to leave FIQ-enabled transfers to run
|
|
to completion - to avoid leaving hub TT buffers with stale packets lying
|
|
around.
|
|
|
|
This broke FIQ-accelerated isochronous transfers, as this then meant that
|
|
dozens of transfers were performed after the dequeue function returned.
|
|
|
|
Restore the state machine fence for isochronous transfers.
|
|
---
|
|
drivers/usb/host/dwc_otg/dwc_otg_hcd.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
|
|
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
|
|
@@ -189,13 +189,21 @@ static void kill_urbs_in_qh_list(dwc_otg
|
|
|
|
}
|
|
if(qh->channel) {
|
|
+ int n = qh->channel->hc_num;
|
|
/* Using hcchar.chen == 1 is not a reliable test.
|
|
* It is possible that the channel has already halted
|
|
* but not yet been through the IRQ handler.
|
|
*/
|
|
if (fiq_fsm_enable && (hcd->fiq_state->channel[qh->channel->hc_num].fsm != FIQ_PASSTHROUGH)) {
|
|
+ local_fiq_disable();
|
|
+ fiq_fsm_spin_lock(&hcd->fiq_state->lock);
|
|
qh->channel->halt_status = DWC_OTG_HC_XFER_URB_DEQUEUE;
|
|
qh->channel->halt_pending = 1;
|
|
+ if (hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_TURBO ||
|
|
+ hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_SLEEPING)
|
|
+ hcd->fiq_state->channel[n].fsm = FIQ_HS_ISOC_ABORTED;
|
|
+ fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
|
|
+ local_fiq_enable();
|
|
} else {
|
|
dwc_otg_hc_halt(hcd->core_if, qh->channel,
|
|
DWC_OTG_HC_XFER_URB_DEQUEUE);
|
|
@@ -596,9 +604,15 @@ int dwc_otg_hcd_urb_dequeue(dwc_otg_hcd_
|
|
/* In FIQ FSM mode, we need to shut down carefully.
|
|
* The FIQ may attempt to restart a disabled channel */
|
|
if (fiq_fsm_enable && (hcd->fiq_state->channel[n].fsm != FIQ_PASSTHROUGH)) {
|
|
+ local_fiq_disable();
|
|
+ fiq_fsm_spin_lock(&hcd->fiq_state->lock);
|
|
qh->channel->halt_status = DWC_OTG_HC_XFER_URB_DEQUEUE;
|
|
qh->channel->halt_pending = 1;
|
|
- //hcd->fiq_state->channel[n].fsm = FIQ_DEQUEUE_ISSUED;
|
|
+ if (hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_TURBO ||
|
|
+ hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_SLEEPING)
|
|
+ hcd->fiq_state->channel[n].fsm = FIQ_HS_ISOC_ABORTED;
|
|
+ fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
|
|
+ local_fiq_enable();
|
|
} else {
|
|
dwc_otg_hc_halt(hcd->core_if, qh->channel,
|
|
DWC_OTG_HC_XFER_URB_DEQUEUE);
|