提交 36003386 编写于 作者: A Alexandre Courbot 提交者: Paul Mundt

serial: sh-sci: fix deadlock when resuming from S3 sleep

S3 sleep invokes the shutdown callback of the sh-sci driver, which
suspends the clocks until they are reactivated by a call to startup.
However, before the latter is invoked, sci_set_termios may be called on
the port by uart_resume_port. In such cases it will endlessly wait for
the TEND bit to raise, which will never happen since the clocks are
disabled.

This patch ensures that clocks are enabled when ports registers are
manipulated within sci_set_termios.
Signed-off-by: NAlexandre Courbot <gnurou@gmail.com>
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
上级 18e95502
......@@ -1504,6 +1504,9 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
if (likely(baud && port->uartclk))
t = sci_scbrr_calc(s->cfg->scbrr_algo_id, baud, port->uartclk);
if (s->enable)
s->enable(port);
do {
status = sci_in(port, SCxSR);
} while (!(status & SCxSR_TEND(port)));
......@@ -1571,6 +1574,9 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
if ((termios->c_cflag & CREAD) != 0)
sci_start_rx(port);
if (s->disable)
s->disable(port);
}
static const char *sci_type(struct uart_port *port)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册