mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
c6ddf8d502
Many changes were done in drivers/pinctrl/bcm/pinctrl-bcm2835.c between 5.4.171 and 5.4.179. The following 3 patches do not apply any more: * target/linux/bcm27xx/patches-5.4/950-0316-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch This was already integrated in kernel v5.4-rc1, it was never needed. * target/linux/bcm27xx/patches-5.4/950-0328-Revert-pinctrl-bcm2835-Pass-irqchip-when-adding-gpio.patch * target/linux/bcm27xx/patches-5.4/950-0362-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch I think these were done to fix the problem which was really fixed in commit 75278f1aff5e ("pinctrl: bcm2835: Change init order for gpio hogs") from v5.4.175 target/linux/generic/backport-5.4/716-v5.5-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch Move fwnode_device_is_available to the same position as in kernel 5.10. target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch Applied in commit 65816c1034769e714edb70f59a33bc5472d9e55f ("arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus") Compile-tested: lantiq/xrx200, bcm27xx/bcm2710 Run-tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From a3749ee48539fa832b1832cdcae26d34e5d20f00 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
|
|
@@ -1326,6 +1326,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 =
|
|
@@ -2150,6 +2176,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,
|