mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
1e6c6a36f5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.68 Removed upstreamed: generic/backport-6.1/795-v6.6-12-r8152-Rename-RTL8152_UNPLUG-to-RTL8152_INACCESSIBLE.patch[1] Manually rebased: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.68&id=3759e735562a31e44fee825498f05c06e64b25a8 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From d3a78e76b3ff06c53fb85f47be90fdd0b8314134 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
|
|
@@ -1487,6 +1487,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;
|
|
|