mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
67d998e25d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6)
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From db675d9894cea3a30ba50695a3e1ea9739782bd2 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 29 Jan 2020 09:35:19 +0000
|
|
Subject: [PATCH] tty: amba-pl011: Avoid rare write-when-full error
|
|
|
|
Under some circumstances on BCM283x processors data loss can be
|
|
observed - a single byte missing from the TX output stream. These bytes
|
|
are always the last byte of a batch of 8 written from pl011_tx_chars
|
|
when from_irq is true, meaning that the FIFO full flag is not checked
|
|
before writing.
|
|
|
|
The transmit optimisation relies on the FIFO being half-empty when the
|
|
TX interrupt is raised. Instrumenting the driver further showed that
|
|
the failure case correlated with the TX FIFO full flag being set at the
|
|
point where the last byte was written to the data register, which
|
|
explains the data loss but not how the FIFO appeared to be prematurely
|
|
full. A possible explanation is that a FIFO write was in flight at the
|
|
time the interrupt was raised, but as yet there is no hypothesis as to
|
|
how this might occur.
|
|
|
|
In the absence of a clear understanding of the failure mechanism, avoid
|
|
the problem by checking the FIFO levels before writing the last byte of
|
|
the group, which will have minimal performance impact.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/tty/serial/amba-pl011.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
@@ -1492,6 +1492,10 @@ static bool pl011_tx_chars(struct uart_a
|
|
if (likely(from_irq) && count-- == 0)
|
|
break;
|
|
|
|
+ if (likely(from_irq) && count == 0 &&
|
|
+ pl011_read(uap, REG_FR) & UART01x_FR_TXFF)
|
|
+ break;
|
|
+
|
|
if (!pl011_tx_char(uap, xmit->buf[xmit->tail], from_irq))
|
|
break;
|
|
|