]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: stm32: call stm32_transmit_chars locked
authorErwan Le Ray <erwan.leray@foss.st.com>
Thu, 4 Mar 2021 16:23:04 +0000 (17:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:36 +0000 (10:49 +0200)
[ Upstream commit f16b90c2d9db3e6ac719d1946b9d335ca4ab33f3 ]

stm32_transmit_chars should be called under lock also in tx DMA callback.

Fixes: 3489187204eb ("serial: stm32: adding dma support")
Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/20210304162308.8984-10-erwan.leray@foss.st.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/serial/stm32-usart.c

index c2d87a8a8fe5efe4830c98e5f85714237a6491e6..a6295897c537997136d5a764ec373a375dd34b5b 100644 (file)
@@ -290,13 +290,16 @@ static void stm32_usart_tx_dma_complete(void *arg)
        struct uart_port *port = arg;
        struct stm32_port *stm32port = to_stm32_port(port);
        const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;
+       unsigned long flags;
 
        dmaengine_terminate_async(stm32port->tx_ch);
        stm32_usart_clr_bits(port, ofs->cr3, USART_CR3_DMAT);
        stm32port->tx_dma_busy = false;
 
        /* Let's see if we have pending data to send */
+       spin_lock_irqsave(&port->lock, flags);
        stm32_usart_transmit_chars(port);
+       spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void stm32_usart_tx_interrupt_enable(struct uart_port *port)