Commit 51e45fba authored by John Ogness's avatar John Ogness Committed by Greg Kroah-Hartman
Browse files

serial: core: lock port for start_rx() in uart_resume_port() 



The only user of the start_rx() callback (qcom_geni) directly calls
its own stop_rx() callback. Since stop_rx() requires that the
port->lock is taken and interrupts are disabled, the start_rx()
callback has the same requirement.

Fixes: cfab87c2 ("serial: core: Introduce callback for start_rx and do stop_rx in suspend only if this callback implementation is present.")
Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20230525093159.223817-5-john.ogness@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca73a892

drivers/tty/serial/serial_core.c

+4 −1
Original line number Diff line number Diff line
@@ -2430,8 +2430,11 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) 
		if (console_suspend_enabled)

			uart_change_pm(state, UART_PM_STATE_ON);

		uport->ops->set_termios(uport, &termios, NULL);

		if (!console_suspend_enabled && uport->ops->start_rx)

		if (!console_suspend_enabled && uport->ops->start_rx) {

			spin_lock_irq(&uport->lock);

			uport->ops->start_rx(uport);

			spin_unlock_irq(&uport->lock);

		}

		if (console_suspend_enabled)

			console_start(uport->cons);

	}