Linux 6.6.15-rt22

[platform/kernel/linux-rpi.git] / drivers / tty / serial / stm32-usart.c

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index b6f4f43..f0901be 100644 (file)
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -533,7 +533,7 @@ static void stm32_usart_rx_dma_complete(void *arg)
        unsigned int size;
        unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
        size = stm32_usart_receive_chars(port, false);
        uart_unlock_and_check_sysrq_irqrestore(port, flags);
        if (size)
@@ -639,9 +639,9 @@ static void stm32_usart_tx_dma_complete(void *arg)
        stm32_usart_tx_dma_terminate(stm32port);
 
        /* Let's see if we have pending data to send */
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
        stm32_usart_transmit_chars(port);
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 }
 
 static void stm32_usart_tx_interrupt_enable(struct uart_port *port)
@@ -885,7 +885,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
        if (!stm32_port->throttled) {
                if (((sr & USART_SR_RXNE) && !stm32_usart_rx_dma_started(stm32_port)) ||
                    ((sr & USART_SR_ERR_MASK) && stm32_usart_rx_dma_started(stm32_port))) {
-                       spin_lock(&port->lock);
+                       uart_port_lock(port);
                        size = stm32_usart_receive_chars(port, false);
                        uart_unlock_and_check_sysrq(port);
                        if (size)
@@ -894,14 +894,14 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
        }
 
        if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch)) {
-               spin_lock(&port->lock);
+               uart_port_lock(port);
                stm32_usart_transmit_chars(port);
-               spin_unlock(&port->lock);
+               uart_port_unlock(port);
        }
 
        /* Receiver timeout irq for DMA RX */
        if (stm32_usart_rx_dma_started(stm32_port) && !stm32_port->throttled) {
-               spin_lock(&port->lock);
+               uart_port_lock(port);
                size = stm32_usart_receive_chars(port, false);
                uart_unlock_and_check_sysrq(port);
                if (size)
@@ -989,7 +989,7 @@ static void stm32_usart_throttle(struct uart_port *port)
        const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
        unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
 
        /*
         * Pause DMA transfer, so the RX data gets queued into the FIFO.
@@ -1002,7 +1002,7 @@ static void stm32_usart_throttle(struct uart_port *port)
                stm32_usart_clr_bits(port, ofs->cr3, stm32_port->cr3_irq);
 
        stm32_port->throttled = true;
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 }
 
 /* Unthrottle the remote, the input buffer can now accept data. */
@@ -1012,7 +1012,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
        const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
        unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
        stm32_usart_set_bits(port, ofs->cr1, stm32_port->cr1_irq);
        if (stm32_port->cr3_irq)
                stm32_usart_set_bits(port, ofs->cr3, stm32_port->cr3_irq);
@@ -1026,7 +1026,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
        if (stm32_port->rx_ch)
                stm32_usart_rx_dma_start_or_resume(port);
 
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 }
 
 /* Receive stop */
@@ -1154,7 +1154,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
 
        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 8);
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
 
        ret = readl_relaxed_poll_timeout_atomic(port->membase + ofs->isr,
                                                isr,
@@ -1345,7 +1345,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
        writel_relaxed(cr1, port->membase + ofs->cr1);
 
        stm32_usart_set_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit));
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 
        /* Handle modem control interrupts */
        if (UART_ENABLE_MS(port, termios->c_cflag))
@@ -1395,9 +1395,9 @@ static void stm32_usart_pm(struct uart_port *port, unsigned int state,
                pm_runtime_get_sync(port->dev);
                break;
        case UART_PM_STATE_OFF:
-               spin_lock_irqsave(&port->lock, flags);
+               uart_port_lock_irqsave(port, &flags);
                stm32_usart_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit));
-               spin_unlock_irqrestore(&port->lock, flags);
+               uart_port_unlock_irqrestore(port, flags);
                pm_runtime_put_sync(port->dev);
                break;
        }
@@ -1880,9 +1880,9 @@ static void stm32_usart_console_write(struct console *co, const char *s,
        int locked = 1;
 
        if (oops_in_progress)
-               locked = spin_trylock_irqsave(&port->lock, flags);
+               locked = uart_port_trylock_irqsave(port, &flags);
        else
-               spin_lock_irqsave(&port->lock, flags);
+               uart_port_lock_irqsave(port, &flags);
 
        /* Save and disable interrupts, enable the transmitter */
        old_cr1 = readl_relaxed(port->membase + ofs->cr1);
@@ -1896,7 +1896,7 @@ static void stm32_usart_console_write(struct console *co, const char *s,
        writel_relaxed(old_cr1, port->membase + ofs->cr1);
 
        if (locked)
-               spin_unlock_irqrestore(&port->lock, flags);
+               uart_port_unlock_irqrestore(port, flags);
 }
 
 static int stm32_usart_console_setup(struct console *co, char *options)
@@ -2031,7 +2031,7 @@ static int __maybe_unused stm32_usart_serial_en_wakeup(struct uart_port *port,
                 * low-power mode.
                 */
                if (stm32_port->rx_ch) {
-                       spin_lock_irqsave(&port->lock, flags);
+                       uart_port_lock_irqsave(port, &flags);
                        /* Poll data from DMA RX buffer if any */
                        if (!stm32_usart_rx_dma_pause(stm32_port))
                                size += stm32_usart_receive_chars(port, true);