| Message ID | 20221222114414.1886632-1-linux@rasmusvillemoes.dk |
|---|---|
| State | New |
| Headers | show |
| Series | [5.15.y,v2] serial: fixup backport of "serial: Deassert Transmit Enable on probe in driver-specific way" | expand |
On Thu, Dec 22, 2022 at 12:44:14PM +0100, Rasmus Villemoes wrote: > When 7c7f9bc986e6 ("serial: Deassert Transmit Enable on probe in > driver-specific way") got backported to 5.15.y, there known as > b079d3775237, some hunks were accidentally left out. > > In fsl_lpuart.c, this amounts to uart_remove_one_port() being called > in an error path despite uart_add_one_port() not having been called. > > In serial_core.c, it is possible that the omission in > uart_suspend_port() is harmless, but the backport did have the > corresponding hunk in uart_resume_port(), it runs counter to the > original commit's intention of > > Skip any invocation of ->set_mctrl() if RS485 is enabled. > > and it's certainly better to be aligned with upstream. > > Fixes: b079d3775237 ("serial: Deassert Transmit Enable on probe in driver-specific way") > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > > v2: Also amend uart_suspend_port(), update commit log accordingly. Now queued up, thanks. greg k-h
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 595430aedc0d..fc311df9f1c9 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -2784,9 +2784,9 @@ static int lpuart_probe(struct platform_device *pdev) return 0; failed_irq_request: -failed_get_rs485: uart_remove_one_port(&lpuart_reg, &sport->port); failed_attach_port: +failed_get_rs485: failed_reset: lpuart_disable_clks(sport); return ret; diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 5f8f0a90ce55..45b721abaa2f 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2225,7 +2225,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) spin_lock_irq(&uport->lock); ops->stop_tx(uport); - ops->set_mctrl(uport, 0); + if (!(uport->rs485.flags & SER_RS485_ENABLED)) + ops->set_mctrl(uport, 0); ops->stop_rx(uport); spin_unlock_irq(&uport->lock);
When 7c7f9bc986e6 ("serial: Deassert Transmit Enable on probe in driver-specific way") got backported to 5.15.y, there known as b079d3775237, some hunks were accidentally left out. In fsl_lpuart.c, this amounts to uart_remove_one_port() being called in an error path despite uart_add_one_port() not having been called. In serial_core.c, it is possible that the omission in uart_suspend_port() is harmless, but the backport did have the corresponding hunk in uart_resume_port(), it runs counter to the original commit's intention of Skip any invocation of ->set_mctrl() if RS485 is enabled. and it's certainly better to be aligned with upstream. Fixes: b079d3775237 ("serial: Deassert Transmit Enable on probe in driver-specific way") Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- v2: Also amend uart_suspend_port(), update commit log accordingly. drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/tty/serial/serial_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) base-commit: 5827ddaf4534c52d31dd464679a186b41810ef76