hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2014-11-05 13:11:44 -05:00 committed by Greg Kroah-Hartman
parent 732a84a037
commit d41510ce2f
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/8250/8250_core.c
View File

@ -2613,7 +2613,9 @@ serial8250_set_ldisc(struct uart_port *port, struct ktermios *termios)
{ {
if (termios->c_line == N_PPS) { if (termios->c_line == N_PPS) {
port->flags |= UPF_HARDPPS_CD; port->flags |= UPF_HARDPPS_CD;
spin_lock_irq(&port->lock);
serial8250_enable_ms(port); serial8250_enable_ms(port);
spin_unlock_irq(&port->lock);
} else } else
port->flags &= ~UPF_HARDPPS_CD; port->flags &= ~UPF_HARDPPS_CD;
} }

2
drivers/tty/serial/amba-pl010.c
View File

@ -483,7 +483,9 @@ static void pl010_set_ldisc(struct uart_port *port, struct ktermios *termios)
{ {
if (termios->c_line == N_PPS) { if (termios->c_line == N_PPS) {
port->flags |= UPF_HARDPPS_CD; port->flags |= UPF_HARDPPS_CD;
spin_lock_irq(&port->lock);
pl010_enable_ms(port); pl010_enable_ms(port);
spin_unlock_irq(&port->lock);
} else } else
port->flags &= ~UPF_HARDPPS_CD; port->flags &= ~UPF_HARDPPS_CD;
} }

2
drivers/tty/serial/atmel_serial.c
View File

@ -2060,7 +2060,9 @@ static void atmel_set_ldisc(struct uart_port *port, struct ktermios *termios)
{ {
if (termios->c_line == N_PPS) { if (termios->c_line == N_PPS) {
port->flags |= UPF_HARDPPS_CD; port->flags |= UPF_HARDPPS_CD;
spin_lock_irq(&port->lock);
atmel_enable_ms(port); atmel_enable_ms(port);
spin_unlock_irq(&port->lock);
} else { } else {
port->flags &= ~UPF_HARDPPS_CD; port->flags &= ~UPF_HARDPPS_CD;
} }