Skip to content

Commit

Permalink
tty: serial: imx: keep console clocks always on
Browse files Browse the repository at this point in the history
For below code, there has chance to cause deadlock in SMP system:
Thread 1:
clk_enable_lock();
pr_info("debug message");
clk_enable_unlock();

Thread 2:
imx_uart_console_write()
	clk_enable()
		clk_enable_lock();

Thread 1:
Acuired clk enable_lock -> printk -> console_trylock_spinning
Thread 2:
console_unlock() -> imx_uart_console_write -> clk_disable -> Acquite clk enable_lock

So the patch is to keep console port clocks always on like
other console drivers.

Fixes: 1cf93e0 ("serial: imx: remove the uart_console() check")
Acked-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Fugang Duan <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Cc: stable <[email protected]>
[fix up build warning - gregkh]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
fugangduan authored and gregkh committed Nov 12, 2020
1 parent d412275 commit e67c139
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions drivers/tty/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2008,16 +2008,6 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count)
unsigned int ucr1;
unsigned long flags = 0;
int locked = 1;
int retval;

retval = clk_enable(sport->clk_per);
if (retval)
return;
retval = clk_enable(sport->clk_ipg);
if (retval) {
clk_disable(sport->clk_per);
return;
}

if (sport->port.sysrq)
locked = 0;
Expand Down Expand Up @@ -2053,9 +2043,6 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count)

if (locked)
spin_unlock_irqrestore(&sport->port.lock, flags);

clk_disable(sport->clk_ipg);
clk_disable(sport->clk_per);
}

/*
Expand Down Expand Up @@ -2156,15 +2143,14 @@ imx_uart_console_setup(struct console *co, char *options)

retval = uart_set_options(&sport->port, co, baud, parity, bits, flow);

clk_disable(sport->clk_ipg);
if (retval) {
clk_unprepare(sport->clk_ipg);
clk_disable_unprepare(sport->clk_ipg);
goto error_console;
}

retval = clk_prepare(sport->clk_per);
retval = clk_prepare_enable(sport->clk_per);
if (retval)
clk_unprepare(sport->clk_ipg);
clk_disable_unprepare(sport->clk_ipg);

error_console:
return retval;
Expand Down

0 comments on commit e67c139

Please sign in to comment.