serial: 8250_fintek: Fix garbled text for console
commit6c33ff7288
upstream. Commitfab8a02b73
("serial: 8250_fintek: Enable high speed mode on Fintek F81866") introduced support to use high baudrate with Fintek SuperIO UARTs. It'll change clocksources when the UART probed. But when user add kernel parameter "console=ttyS0,115200 console=tty0" to make the UART as console output, the console will output garbled text after the following kernel message. [ 3.681188] Serial: 8250/16550 driver, 32 ports, IRQ sharing enabled The issue is occurs in following step: probe_setup_port() -> fintek_8250_goto_highspeed() It change clocksource from 115200 to 921600 with wrong time, it should change clocksource in set_termios() not in probed. The following 3 patches are implemented change clocksource in fintek_8250_set_termios(). Commit58178914ae
("serial: 8250_fintek: UART dynamic clocksource on Fintek F81216H") Commit195638b6d4
("serial: 8250_fintek: UART dynamic clocksource on Fintek F81866") Commit423d9118c6
("serial: 8250_fintek: Add F81966 Support") Due to the high baud rate had implemented above 3 patches and the patch Commitfab8a02b73
("serial: 8250_fintek: Enable high speed mode on Fintek F81866") is bugged, So this patch will remove it. Fixes:fab8a02b73
("serial: 8250_fintek: Enable high speed mode on Fintek F81866") Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com> Link: https://lore.kernel.org/r/20211215075835.2072-1-hpeter+linux_kernel@gmail.com Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
3a1a4eb574
Коммит
89362ec97a
|
@ -290,25 +290,6 @@ static void fintek_8250_set_max_fifo(struct fintek_8250 *pdata)
|
|||
}
|
||||
}
|
||||
|
||||
static void fintek_8250_goto_highspeed(struct uart_8250_port *uart,
|
||||
struct fintek_8250 *pdata)
|
||||
{
|
||||
sio_write_reg(pdata, LDN, pdata->index);
|
||||
|
||||
switch (pdata->pid) {
|
||||
case CHIP_ID_F81966:
|
||||
case CHIP_ID_F81866: /* set uart clock for high speed serial mode */
|
||||
sio_write_mask_reg(pdata, F81866_UART_CLK,
|
||||
F81866_UART_CLK_MASK,
|
||||
F81866_UART_CLK_14_769MHZ);
|
||||
|
||||
uart->port.uartclk = 921600 * 16;
|
||||
break;
|
||||
default: /* leave clock speed untouched */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void fintek_8250_set_termios(struct uart_port *port,
|
||||
struct ktermios *termios,
|
||||
struct ktermios *old)
|
||||
|
@ -430,7 +411,6 @@ static int probe_setup_port(struct fintek_8250 *pdata,
|
|||
|
||||
fintek_8250_set_irq_mode(pdata, level_mode);
|
||||
fintek_8250_set_max_fifo(pdata);
|
||||
fintek_8250_goto_highspeed(uart, pdata);
|
||||
|
||||
fintek_8250_exit_key(addr[i]);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче