Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d41510ce authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: Take uart port lock for direct *_enable_ms() 



Three UART drivers (8250, atmel & amba-pl010) directly call their
enable_ms() method; the uart port lock must be acquired before
any h/w programming.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 732a84a0

drivers/tty/serial/8250/8250_core.c

+2 −0
Original line number Diff line number Diff line
@@ -2613,7 +2613,9 @@ serial8250_set_ldisc(struct uart_port *port, struct ktermios *termios) 
{

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		spin_lock_irq(&port->lock);

		serial8250_enable_ms(port);

		spin_unlock_irq(&port->lock);

	} else

		port->flags &= ~UPF_HARDPPS_CD;

}

drivers/tty/serial/amba-pl010.c

+2 −0
Original line number Diff line number Diff line
@@ -483,7 +483,9 @@ static void pl010_set_ldisc(struct uart_port *port, struct ktermios *termios) 
{

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		spin_lock_irq(&port->lock);

		pl010_enable_ms(port);

		spin_unlock_irq(&port->lock);

	} else

		port->flags &= ~UPF_HARDPPS_CD;

}

drivers/tty/serial/atmel_serial.c

+2 −0
Original line number Diff line number Diff line
@@ -2060,7 +2060,9 @@ static void atmel_set_ldisc(struct uart_port *port, struct ktermios *termios) 
{

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		spin_lock_irq(&port->lock);

		atmel_enable_ms(port);

		spin_unlock_irq(&port->lock);

	} else {

		port->flags &= ~UPF_HARDPPS_CD;

	}