Skip to content

Commit d602cb8

Browse files
KanjiMonstergregkh
authored andcommitted
MIPS: AR7: ensure the port type's FCR value is used
commit 0a5191e upstream. Since commit aef9a7b ("serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers"), the port's default FCR value isn't used in serial8250_do_set_termios anymore, but copied over once in serial8250_config_port and then modified as needed. Unfortunately, serial8250_config_port will never be called if the port is shared between kernel and userspace, and the port's flag doesn't have UPF_BOOT_AUTOCONF, which would trigger a serial8250_config_port as well. This causes garbled output from userspace: [ 5.220000] random: procd urandom read with 49 bits of entropy available ers [kee Fix this by forcing it to be configured on boot, resulting in the expected output: [ 5.250000] random: procd urandom read with 50 bits of entropy available Press the [f] key and hit [enter] to enter failsafe mode Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level Fixes: aef9a7b ("serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Nicolas Schichan <nschichan@freebox.fr> Cc: linux-mips@linux-mips.org Cc: linux-serial@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/17544/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0c28707 commit d602cb8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/ar7/platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ static int __init ar7_register_uarts(void)
575575
uart_port.type = PORT_AR7;
576576
uart_port.uartclk = clk_get_rate(bus_clk) / 2;
577577
uart_port.iotype = UPIO_MEM32;
578-
uart_port.flags = UPF_FIXED_TYPE;
578+
uart_port.flags = UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF;
579579
uart_port.regshift = 2;
580580

581581
uart_port.line = 0;

0 commit comments

Comments
 (0)