mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From 3cec61f1b19a6f589f8b2aef97977e1c38eb7b70 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Fri, 24 Jan 2020 11:38:28 +0000
|
|
Subject: [PATCH] tty: amba-pl011: Add un/throttle support
|
|
|
|
The PL011 driver lacks throttle and unthrottle methods. As a result,
|
|
sending more data to the Pi than it can immediately sink while CRTSCTS
|
|
is enabled causes a NULL pointer to be followed.
|
|
|
|
Add a throttle handler that disables the RX interrupts, and an
|
|
unthrottle handler that reenables them.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/tty/serial/amba-pl011.c | 28 ++++++++++++++++++++++++++++
|
|
1 file changed, 28 insertions(+)
|
|
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
@@ -1317,6 +1317,32 @@ static void pl011_start_tx(struct uart_p
|
|
pl011_start_tx_pio(uap);
|
|
}
|
|
|
|
+static void pl011_throttle(struct uart_port *port)
|
|
+{
|
|
+ struct uart_amba_port *uap =
|
|
+ container_of(port, struct uart_amba_port, port);
|
|
+ unsigned long flags;
|
|
+
|
|
+ spin_lock_irqsave(&uap->port.lock, flags);
|
|
+ uap->im &= ~(UART011_RTIM | UART011_RXIM);
|
|
+ pl011_write(uap->im, uap, REG_IMSC);
|
|
+ spin_unlock_irqrestore(&uap->port.lock, flags);
|
|
+}
|
|
+
|
|
+static void pl011_unthrottle(struct uart_port *port)
|
|
+{
|
|
+ struct uart_amba_port *uap =
|
|
+ container_of(port, struct uart_amba_port, port);
|
|
+ unsigned long flags;
|
|
+
|
|
+ spin_lock_irqsave(&uap->port.lock, flags);
|
|
+ uap->im |= UART011_RTIM;
|
|
+ if (!pl011_dma_rx_running(uap))
|
|
+ uap->im |= UART011_RXIM;
|
|
+ pl011_write(uap->im, uap, REG_IMSC);
|
|
+ spin_unlock_irqrestore(&uap->port.lock, flags);
|
|
+}
|
|
+
|
|
static void pl011_stop_rx(struct uart_port *port)
|
|
{
|
|
struct uart_amba_port *uap =
|
|
@@ -2139,6 +2165,8 @@ static const struct uart_ops amba_pl011_
|
|
.stop_tx = pl011_stop_tx,
|
|
.start_tx = pl011_start_tx,
|
|
.stop_rx = pl011_stop_rx,
|
|
+ .throttle = pl011_throttle,
|
|
+ .unthrottle = pl011_unthrottle,
|
|
.enable_ms = pl011_enable_ms,
|
|
.break_ctl = pl011_break_ctl,
|
|
.startup = pl011_startup,
|