[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <ed3111533ef5bd342ee5ec504812240b870f0853.1588602446.git.michal.simek@xilinx.com>
Date: Mon, 4 May 2020 16:27:28 +0200
From: Michal Simek <michal.simek@...inx.com>
To: linux-kernel@...r.kernel.org, monstr@...str.eu,
michal.simek@...inx.com, git@...inx.com, stable@...r.kernel.org
Cc: Shubhrajyoti Datta <shubhrajyoti.datta@...inx.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jiri Slaby <jslaby@...e.com>,
linux-arm-kernel@...ts.infradead.org, linux-serial@...r.kernel.org
Subject: [PATCH v2] tty: xilinx_uartps: Fix missing id assignment to the console
From: Shubhrajyoti Datta <shubhrajyoti.datta@...inx.com>
When serial console has been assigned to ttyPS1 (which is serial1 alias)
console index is not updated property and pointing to index -1 (statically
initialized) which ends up in situation where nothing has been printed on
the port.
The commit 18cc7ac8a28e ("Revert "serial: uartps: Register own uart console
and driver structures"") didn't contain this line which was removed by
accident.
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@...inx.com>
Cc: stable <stable@...r.kernel.org>
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
Changes in v2:
- Do better commit description
- Origin subject was "tty: xilinx_uartps: Add the id to the console"
Greg: Would be good if you can take this patch to 5.7 and also to stable
trees.
---
drivers/tty/serial/xilinx_uartps.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 672cfa075e28..b9d672af8b65 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1465,6 +1465,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS;
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
cdns_uart_uart_driver.cons = &cdns_uart_console;
+ cdns_uart_console.index = id;
#endif
rc = uart_register_driver(&cdns_uart_uart_driver);
--
2.26.2
Powered by blists - more mailing lists