From: Phil Elwell <phil@raspberrypi.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Wander Lairson Costa <wander@redhat.com>,
Johan Hovold <johan@kernel.org>,
"Maciej W. Rozycki" <macro@orcam.me.uk>,
Lukas Wunner <lukas@wunner.de>,
Florian Fainelli <f.fainelli@gmail.com>,
linux-serial@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org
Cc: Phil Elwell <phil@raspberrypi.com>
Subject: [PATCH] serial: 8250: Fix ...console_fifo_write on BCM283x
Date: Wed, 26 Jan 2022 14:11:24 +0000 [thread overview]
Message-ID: <20220126141124.4086065-1-phil@raspberrypi.com> (raw)
The mini-UART on BCM283x is doubly crippled - it has 8-byte FIFOs and
the THRE bit indicates that the TX FIFO is not-full rather than empty.
The optimisation to enable the use of the FIFO assumes that it is safe
to write fifosize bytes whenever THRE is set, but the BCM283x quirk
(indicated by the presence of UART_CAP_MINI) makes it necessary to
check the FIFO state after each byte.
See: https://github.com/raspberrypi/linux/issues/4849
Fixes: 5021d709b31b ("tty: serial: Use fifo in 8250 console driver")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
drivers/tty/serial/8250/8250_port.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 2abb3de11a48..8a2b462d363c 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -3357,6 +3357,13 @@ static void serial8250_console_fifo_write(struct uart_8250_port *up,
serial_out(up, UART_TX, *s++);
cr_sent = false;
}
+ /*
+ * The BCM2835 MINI UART THRE bit is really a not-full
+ * bit, so be prepared to bail out early.
+ */
+ if ((up->capabilities & UART_CAP_MINI) &&
+ !(serial_in(up, UART_LSR) & UART_LSR_THRE))
+ break;
}
}
}
--
2.25.1
next reply other threads:[~2022-01-26 14:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 14:11 Phil Elwell [this message]
2022-01-26 14:21 ` [PATCH] serial: 8250: Fix ...console_fifo_write on BCM283x Greg Kroah-Hartman
2022-01-26 14:27 ` Phil Elwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220126141124.4086065-1-phil@raspberrypi.com \
--to=phil@raspberrypi.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=macro@orcam.me.uk \
--cc=wander@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).