Unverified Commit ecc0fc40 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10072 serial: imx: Introduce timeout when waiting on transmitter empty 

Merge Pull Request from: @ci-robot 
 
PR sync from: felix <fuzhen5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/73NDQVMC45GDC6FFVILZS5VDU3R27IBJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD0R6 
 
Link:https://gitee.com/openeuler/kernel/pulls/10072

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents fd198cd1 391068c9

drivers/tty/serial/imx.c

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/dma-mapping.h>



#include <asm/irq.h>
@@ -2008,7 +2009,7 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count) 
{

	struct imx_port *sport = imx_uart_ports[co->index];

	struct imx_port_ucrs old_ucr;

	unsigned int ucr1;

	unsigned int ucr1, usr2;

	unsigned long flags = 0;

	int locked = 1;
@@ -2040,8 +2041,8 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count) 
	 *	Finally, wait for transmitter to become empty

	 *	and restore UCR1/2/3

	 */

	while (!(imx_uart_readl(sport, USR2) & USR2_TXDC));



	read_poll_timeout_atomic(imx_uart_readl, usr2, usr2 & USR2_TXDC,

				 0, USEC_PER_SEC, false, sport, USR2);

	imx_uart_ucrs_restore(sport, &old_ucr);



	if (locked)