diff options
| author | Esben Haabendal <esben@geanix.com> | 2024-09-13 11:39:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-11 09:13:35 +0300 |
| commit | 3c199ed5bd64694c71169b84e357d132f7811c3a (patch) | |
| tree | 723180d72bb14e443701015f2d84bbb919b5120b | |
| parent | 5cbb9b1705ab8d98ed96affa4ec399023a22b755 (diff) | |
| download | linux-3c199ed5bd64694c71169b84e357d132f7811c3a.tar.xz | |
serial: imx: Grab port lock in imx_uart_enable_wakeup()
The port lock needs to be held when doing read-modify-write on UCR1 and
UCR3.
Signed-off-by: Esben Haabendal <esben@geanix.com>
Link: https://lore.kernel.org/r/20240913-serial-imx-lockfix-v1-1-4d102746c89d@geanix.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/imx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index f7367969a42a..1e6a785b02be 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2580,10 +2580,13 @@ static void imx_uart_save_context(struct imx_port *sport) uart_port_unlock_irqrestore(&sport->port, flags); } +/* called with irq off */ static void imx_uart_enable_wakeup(struct imx_port *sport, bool on) { u32 ucr3; + uart_port_lock(&sport->port); + ucr3 = imx_uart_readl(sport, UCR3); if (on) { imx_uart_writel(sport, USR1_AWAKE, USR1); @@ -2603,6 +2606,8 @@ static void imx_uart_enable_wakeup(struct imx_port *sport, bool on) } imx_uart_writel(sport, ucr1, UCR1); } + + uart_port_unlock(&sport->port); } static int imx_uart_suspend_noirq(struct device *dev) |