From: Greg Kroah-Hartman Date: Mon, 22 Jan 2018 13:34:57 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.113~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bff13d56640b9278e8cd4ad7093877fb17b2d700;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: mips-ar7-ensure-the-port-type-s-fcr-value-is-used.patch --- diff --git a/queue-4.9/mips-ar7-ensure-the-port-type-s-fcr-value-is-used.patch b/queue-4.9/mips-ar7-ensure-the-port-type-s-fcr-value-is-used.patch new file mode 100644 index 00000000000..3623b9593e1 --- /dev/null +++ b/queue-4.9/mips-ar7-ensure-the-port-type-s-fcr-value-is-used.patch @@ -0,0 +1,59 @@ +From 0a5191efe06b5103909206e4fbcff81d30283f8e Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Sun, 29 Oct 2017 16:27:21 +0100 +Subject: MIPS: AR7: ensure the port type's FCR value is used + +From: Jonas Gorski + +commit 0a5191efe06b5103909206e4fbcff81d30283f8e upstream. + +Since commit aef9a7bd9b67 ("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: aef9a7bd9b67 ("serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers") +Signed-off-by: Jonas Gorski +Cc: Greg Kroah-Hartman +Cc: Yoshihiro YUNOMAE +Cc: Florian Fainelli +Cc: Nicolas Schichan +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 +Cc: James Hogan +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/ar7/platform.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/ar7/platform.c ++++ b/arch/mips/ar7/platform.c +@@ -576,7 +576,7 @@ static int __init ar7_register_uarts(voi + uart_port.type = PORT_AR7; + uart_port.uartclk = clk_get_rate(bus_clk) / 2; + uart_port.iotype = UPIO_MEM32; +- uart_port.flags = UPF_FIXED_TYPE; ++ uart_port.flags = UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF; + uart_port.regshift = 2; + + uart_port.line = 0; diff --git a/queue-4.9/series b/queue-4.9/series index 4bd5be9195e..703944ee326 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -45,3 +45,4 @@ kprobes-x86-blacklist-indirect-thunk-functions-for-kprobes.patch kprobes-x86-disable-optimizing-on-the-function-jumps-to-indirect-thunk.patch x86-pti-document-fix-wrong-index.patch x86-retpoline-optimize-inline-assembler-for-vmexit_fill_rsb.patch +mips-ar7-ensure-the-port-type-s-fcr-value-is-used.patch