From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Christoph Baumann <cbaumann@visteon.com>,
linux-serial@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 2/2] serial: sh-sci: Fix hang in sci_reset()
Date: Fri, 2 Dec 2016 13:35:11 +0100 [thread overview]
Message-ID: <1480682111-9299-3-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1480682111-9299-1-git-send-email-geert+renesas@glider.be>
When the .set_termios() callback resets the UART, it first waits until
all characters in the transmit FIFO have been transmitted, to prevent a
port configuration change from impacting these characters.
However, if the previous user of the UART had dedicated RTS/CTS hardware
flow control enabled, these characters may have been stuck in the FIFO
due to CTS not being asserted. When the new user opens the port,
.set_termios() is called while transmission is still disabled, leading
to an infinite loop:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s!
This has been observed with SCIFA (on r8a7740/armadillo) and SCIFB (on
r8a7791/koelsch).
The issue does not seem to happen when using:
- GPIO RTS/CTS hardware flow control,
- No hardware flow control,
- HSCIF (on r8a7791/koelsch).
To fix this, wait for the draining of the transmit FIFO only if
transmission is already enabled.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To reproduce:
stty -echo < /dev/scifb0
stty crtscts < /dev/scifb0
echo hello > /dev/scifb0 # returns early (wrote to FIFO)
echo hello > /dev/scifb0 # hangs
drivers/tty/serial/sh-sci.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index c503db1900f003ed..db5de80c5399a7bd 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2137,9 +2137,11 @@ static void sci_reset(struct uart_port *port)
const struct plat_sci_reg *reg;
unsigned int status;
- do {
- status = serial_port_in(port, SCxSR);
- } while (!(status & SCxSR_TEND(port)));
+ if (serial_port_in(port, SCSCR) & SCSCR_TE) {
+ do {
+ status = serial_port_in(port, SCxSR);
+ } while (!(status & SCxSR_TEND(port)));
+ }
serial_port_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */
--
1.9.1
next prev parent reply other threads:[~2016-12-02 12:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 12:35 [PATCH 0/2] serial: sh-sci: Assorted flow control fixes Geert Uytterhoeven
2016-12-02 12:35 ` [PATCH 1/2] serial: sh-sci: Fix early deassertion of dedicated RTS Geert Uytterhoeven
2017-01-06 12:30 ` Laurent Pinchart
2017-01-09 9:53 ` Geert Uytterhoeven
2017-01-09 11:57 ` Laurent Pinchart
2016-12-02 12:35 ` Geert Uytterhoeven [this message]
2017-01-06 12:31 ` [PATCH 2/2] serial: sh-sci: Fix hang in sci_reset() Laurent Pinchart
2017-01-11 9:04 ` Geert Uytterhoeven
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=1480682111-9299-3-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=cbaumann@visteon.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
--cc=yoshihiro.shimoda.uh@renesas.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).