tty: serial: samsung_tty: avoid dev_dbg deadlock
Subsystems (2)
PATCH 1/1 tty: serial: samsung_tty: avoid dev_dbg deadlock
commit a05025d0ce72 ("tty: serial: samsung_tty: use standard debugging macros") changed the debug prints to dev_dbg, which can result in deadlocks:
s3c24xx_serial_set_termios can be called with the port lock, and then calls dev_dbg, which needs the console mutex. At the same time, s3c24xx_serial_console_write can be called with the console lock (e.g., inside console_unlock), and needs the port lock.
To avoid this, move one dev_dbg call and just delete the other.
Signed-off-by Alyssa Milburn <[email protected]>
--- drivers/tty/serial/samsung_tty.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/tty/serial/samsung_tty.c +2 -8
@@ -1582,12 +1582,12 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ulcon |=S3C2410_LCON_PNONE ; } -uart_port_lock_irqsave (port, &flags); -dev_dbg (port->dev,"setting ulcon to %08x, brddiv to %d, udivslot %08x\n" , ulcon, quot, udivslot); +uart_port_lock_irqsave (port, &flags); +wr_regl (port,S3C2410_ULCON , ulcon);wr_regl (port,S3C2410_UBRDIV , quot);
@@ -1607,12 +1607,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,if (ourport->info->has_divslot)wr_regl (port,S3C2443_DIVSLOT , udivslot); -dev_dbg (port->dev, -"uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n" , -rd_regl (port,S3C2410_ULCON ), -rd_regl (port,S3C2410_UCON ), -rd_regl (port,S3C2410_UFCON )); -/* * Update the per-port timeout. */
Signature · 1 line
2.52.0