openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: uartps: Change logic how console_port is setup 

Change logic how console_port is setup by using CON_ENABLED flag
instead of index. There will be unique cdns_uart_console() structures
that's why code can't use id for console_port assignment.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michal Simek 2018-09-03 15:10:56 +02:00 committed by Greg Kroah-Hartman
parent 10a5315b47
commit 427c8ae9be
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/xilinx_uartps.c
View File

@ -1533,7 +1533,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
* If register_console() don't assign value, then console_port pointer * If register_console() don't assign value, then console_port pointer
* is cleanup. * is cleanup.
*/ */
if (cdns_uart_uart_driver.cons->index == -1) if (!console_port)
console_port = port; console_port = port;
#endif #endif
@ -1546,7 +1546,8 @@ static int cdns_uart_probe(struct platform_device *pdev)
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
/* This is not port which is used for console that's why clean it up */ /* This is not port which is used for console that's why clean it up */
if (cdns_uart_uart_driver.cons->index == -1) if (console_port == port &&
!(cdns_uart_uart_driver.cons->flags & CON_ENABLED))
console_port = NULL; console_port = NULL;
#endif #endif
@ -1595,6 +1596,12 @@ static int cdns_uart_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
if (console_port == port)
console_port = NULL;
#endif
if (!--instances) if (!--instances)
uart_unregister_driver(cdns_uart_data->cdns_uart_driver); uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
return rc; return rc;