From d82cacc62537483c6d8298d38936db72a04fe4ae Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 16 Nov 2024 14:06:29 +0000 Subject: [PATCH] Revert "serial: imx: Update mctrl old_status on RTSD interrupt" This reverts commit e1e87568a2c6c88566888522c8f5a013c0716bf6 which is commit 40d7903386df4d18f04d90510ba90eedee260085 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I37284d886dabab9e9b153c7aba3eaa8e14b3523f Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/imx.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 94e0781e00e8..bba54ad0d434 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -801,21 +801,6 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id) imx_uart_writel(sport, USR1_RTSD, USR1); usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS; - /* - * Update sport->old_status here, so any follow-up calls to - * imx_uart_mctrl_check() will be able to recognize that RTS - * state changed since last imx_uart_mctrl_check() call. - * - * In case RTS has been detected as asserted here and later on - * deasserted by the time imx_uart_mctrl_check() was called, - * imx_uart_mctrl_check() can detect the RTS state change and - * trigger uart_handle_cts_change() to unblock the port for - * further TX transfers. - */ - if (usr1 & USR1_RTSS) - sport->old_status |= TIOCM_CTS; - else - sport->old_status &= ~TIOCM_CTS; uart_handle_cts_change(&sport->port, usr1); wake_up_interruptible(&sport->port.state->port.delta_msr_wait);