Commit de62b348 authored Mar 11, 2015 by Peter Hurley Committed by Sasha Levin Mar 28, 2015

serial: 8250_dw: Fix deadlock in LCR workaround



[ Upstream commit 7fd6f640f2dd17dac6ddd6702c378cb0bb9cfa11 ]

Trying to write console output from within the serial console driver
while the port->lock is held causes recursive deadlock:

  CPU 0
spin_lock_irqsave(&port->lock)
printk()
  console_unlock()
    call_console_drivers()
      serial8250_console_write()
        spin_lock_irqsave(&port->lock)
** DEADLOCK **

The 8250_dw i/o accessors try to write a console error message if the
LCR workaround was unsuccessful. When the port->lock is already held
(eg., when called from serial8250_set_termios()), this deadlocks.

Make the error message a FIXME until a general solution is devised.

Cc: Tim Kryger <tim.kryger@gmail.com>
Reported-by: Zhang Zhen <zhenzhang.zhang@huawei.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 78df56cc

drivers/tty/serial/8250/8250_dw.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)
		dw8250_force_idle(p);
		writeb(value, p->membase + (UART_LCR << p->regshift));
		}
		dev_err(p->dev, "Couldn't set LCR to %d\n", value);
		/*
		* FIXME: this deadlocks if port->lock is already held
		* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
		*/
		}
		}

		@@ -148,7 +151,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
		dw8250_force_idle(p);
		writel(value, p->membase + (UART_LCR << p->regshift));
		}
		dev_err(p->dev, "Couldn't set LCR to %d\n", value);
		/*
		* FIXME: this deadlocks if port->lock is already held
		* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
		*/
		}
		}