mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
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>
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From 659c52fe8a86264c5119c0592654898d09fe8f28 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Fri, 13 Oct 2017 17:12:55 -0700
|
|
Subject: [PATCH 176/454] drm/vc4: Fix sleeps during the IRQ handler for DSI
|
|
transactions.
|
|
|
|
VC4's DSI1 has a bug where the AXI connection is broken for 32-bit
|
|
writes from the CPU, so we use the DMA engine to DMA 32-bit values
|
|
into registers instead. That sleeps, so we can't do it from the top
|
|
half.
|
|
|
|
As a solution, use an interrupt thread so that all our writes happen
|
|
when sleeping is is allowed.
|
|
|
|
v2: Use IRQF_ONESHOT (suggested by Boris)
|
|
v3: Style nitpicks.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20171014001255.32005-1-eric@anholt.net
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> (v2)
|
|
(cherry picked from commit af0c8c10564aac5b6d67308129ec09c4ad5db476)
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 32 ++++++++++++++++++++++++++++++--
|
|
1 file changed, 30 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
@@ -1383,6 +1383,27 @@ static void dsi_handle_error(struct vc4_
|
|
*ret = IRQ_HANDLED;
|
|
}
|
|
|
|
+/*
|
|
+ * Initial handler for port 1 where we need the reg_dma workaround.
|
|
+ * The register DMA writes sleep, so we can't do it in the top half.
|
|
+ * Instead we use IRQF_ONESHOT so that the IRQ gets disabled in the
|
|
+ * parent interrupt contrller until our interrupt thread is done.
|
|
+ */
|
|
+static irqreturn_t vc4_dsi_irq_defer_to_thread_handler(int irq, void *data)
|
|
+{
|
|
+ struct vc4_dsi *dsi = data;
|
|
+ u32 stat = DSI_PORT_READ(INT_STAT);
|
|
+
|
|
+ if (!stat)
|
|
+ return IRQ_NONE;
|
|
+
|
|
+ return IRQ_WAKE_THREAD;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Normal IRQ handler for port 0, or the threaded IRQ handler for port
|
|
+ * 1 where we need the reg_dma workaround.
|
|
+ */
|
|
static irqreturn_t vc4_dsi_irq_handler(int irq, void *data)
|
|
{
|
|
struct vc4_dsi *dsi = data;
|
|
@@ -1566,8 +1587,15 @@ static int vc4_dsi_bind(struct device *d
|
|
/* Clear any existing interrupt state. */
|
|
DSI_PORT_WRITE(INT_STAT, DSI_PORT_READ(INT_STAT));
|
|
|
|
- ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
|
|
- vc4_dsi_irq_handler, 0, "vc4 dsi", dsi);
|
|
+ if (dsi->reg_dma_mem)
|
|
+ ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0),
|
|
+ vc4_dsi_irq_defer_to_thread_handler,
|
|
+ vc4_dsi_irq_handler,
|
|
+ IRQF_ONESHOT,
|
|
+ "vc4 dsi", dsi);
|
|
+ else
|
|
+ ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
|
|
+ vc4_dsi_irq_handler, 0, "vc4 dsi", dsi);
|
|
if (ret) {
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(dev, "Failed to get interrupt: %d\n", ret);
|