serial: mvebu-uart: Fix reporting of effective CSIZE to userspace

commit e0bf2d4982fe7d9ddaf550dd023803ea286f47fc upstream.

Apparently, this driver (or the hardware) does not support character
length settings. It's apparently running in 8-bit mode, but it makes
userspace believe it's in 5-bit mode. That makes tcsetattr with CS8
incorrectly fail, breaking e.g. getty from busybox, thus the login shell
on ttyMVx.

Fix by hard-wiring CS8 into c_cflag.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Fixes: 30530791a7a0 ("serial: mvebu-uart: initial support for Armada-3700 serial port")
Cc: stable <stable@vger.kernel.org> # 4.6+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index 45b57c294d13b19b8d47f2e8b2292f68c8167485..401c983ec5f3651bc442b315566fc4dfc63ed627 100644 (file)
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c
@@ -327,8 +327,10 @@ static void mvebu_uart_set_termios(struct uart_port *port,
        if ((termios->c_cflag & CREAD) == 0)
                port->ignore_status_mask |= STAT_RX_RDY | STAT_BRK_ERR;
 
-       if (old)
+       if (old) {
                tty_termios_copy_hw(termios, old);
+               termios->c_cflag |= CS8;
+       }
 
        baud = uart_get_baud_rate(port, termios, old, 0, 460800);
        uart_update_timeout(port, termios->c_cflag, baud);