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

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

serial: Test/disable MSIs if switching from N_PPS 



Switching to the N_PPS line discipline may require enabling
modem status interrupts; conversely switching from N_PPS may
require disabling modem status interrupts.

Affected drivers:
8250
amba-pl010
atmel

Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d41510ce

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

+20 −1
Original line number Diff line number Diff line
@@ -1402,6 +1402,19 @@ static void serial8250_stop_rx(struct uart_port *port) 
	serial8250_rpm_put(up);

}



static void serial8250_disable_ms(struct uart_port *port)

{

	struct uart_8250_port *up =

		container_of(port, struct uart_8250_port, port);



	/* no MSR capabilities */

	if (up->bugs & UART_BUG_NOMSR)

		return;



	up->ier &= ~UART_IER_MSI;

	serial_port_out(port, UART_IER, up->ier);

}



static void serial8250_enable_ms(struct uart_port *port)

{

	struct uart_8250_port *up = up_to_u8250p(port);
@@ -2616,8 +2629,14 @@ serial8250_set_ldisc(struct uart_port *port, struct ktermios *termios) 
		spin_lock_irq(&port->lock);

		serial8250_enable_ms(port);

		spin_unlock_irq(&port->lock);

	} else

	} else {

		port->flags &= ~UPF_HARDPPS_CD;

		if (!UART_ENABLE_MS(port, termios->c_cflag)) {

			spin_lock_irq(&port->lock);

			serial8250_disable_ms(port);

			spin_unlock_irq(&port->lock);

		}

	}

}

drivers/tty/serial/amba-pl010.c

+17 −1
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ static void pl010_stop_rx(struct uart_port *port) 
	writel(cr, uap->port.membase + UART010_CR);

}



static void pl010_disable_ms(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	unsigned int cr;



	cr = readb(uap->port.membase + UART010_CR);

	cr &= ~UART010_CR_MSIE;

	writel(cr, uap->port.membase + UART010_CR);

}



static void pl010_enable_ms(struct uart_port *port)

{

	struct uart_amba_port *uap =
@@ -486,8 +496,14 @@ static void pl010_set_ldisc(struct uart_port *port, struct ktermios *termios) 
		spin_lock_irq(&port->lock);

		pl010_enable_ms(port);

		spin_unlock_irq(&port->lock);

	} else

	} else {

		port->flags &= ~UPF_HARDPPS_CD;

		if (!UART_ENABLE_MS(port, termios->c_cflag)) {

			spin_lock_irq(&port->lock);

			pl010_disable_ms(port);

			spin_unlock_irq(&port->lock);

		}

	}

}



static const char *pl010_type(struct uart_port *port)

drivers/tty/serial/atmel_serial.c

+5 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,11 @@ static void atmel_set_ldisc(struct uart_port *port, struct ktermios *termios) 
		spin_unlock_irq(&port->lock);

	} else {

		port->flags &= ~UPF_HARDPPS_CD;

		if (!UART_ENABLE_MS(port, termios->c_cflag)) {

			spin_lock_irq(&port->lock);

			atmel_disable_ms(port);

			spin_unlock_irq(&port->lock);

		}

	}

}