Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd122c0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sasha Levin
Browse files

serial: imx: Fix clearing of receiver overrun flag 



[ Upstream commit 91555ce9012557b2d621d7b0b6ec694218a2a9bc ]

The writeable bits in the USR2 register are all "write 1 to
clear" so only write the bits that actually should be cleared.

Fixes: f1f836e4 ("serial: imx: Add Rx Fifo overrun error message")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent d96fc14e

drivers/tty/serial/imx.c

+3 −5
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static irqreturn_t imx_int(int irq, void *dev_id) 
	if (sts2 & USR2_ORE) {

		dev_err(sport->port.dev, "Rx FIFO overrun\n");

		sport->port.icount.overrun++;

		writel(sts2 | USR2_ORE, sport->port.membase + USR2);

		writel(USR2_ORE, sport->port.membase + USR2);

	}



	return IRQ_HANDLED;
@@ -1134,10 +1134,12 @@ static int imx_startup(struct uart_port *port) 
	}



	spin_lock_irqsave(&sport->port.lock, flags);



	/*

	 * Finally, clear and enable interrupts

	 */

	writel(USR1_RTSD, sport->port.membase + USR1);

	writel(USR2_ORE, sport->port.membase + USR2);



	temp = readl(sport->port.membase + UCR1);

	temp |= UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN;
@@ -1149,10 +1151,6 @@ static int imx_startup(struct uart_port *port) 


	writel(temp, sport->port.membase + UCR1);



	/* Clear any pending ORE flag before enabling interrupt */

	temp = readl(sport->port.membase + USR2);

	writel(temp | USR2_ORE, sport->port.membase + USR2);



	temp = readl(sport->port.membase + UCR4);

	temp |= UCR4_OREN;

	writel(temp, sport->port.membase + UCR4);