serial: fsl_lpuart: Use port lock wrappers

When a serial port is used for kernel console output, then all
modifications to the UART registers which are done from other contexts,
e.g. getty, termios, are interference points for the kernel console.

So far this has been ignored and the printk output is based on the
principle of hope. The rework of the console infrastructure which aims to
support threaded and atomic consoles, requires to mark sections which
modify the UART registers as unsafe. This allows the atomic write function
to make informed decisions and eventually to restore operational state. It
also allows to prevent the regular UART code from modifying UART registers
while printk output is in progress.

All modifications of UART registers are guarded by the UART port lock,
which provides an obvious synchronization point with the console
infrastructure.

To avoid adding this functionality to all UART drivers, wrap the
spin_[un]lock*() invocations for uart_port::lock into helper functions
which just contain the spin_[un]lock*() invocations for now. In a
subsequent step these helpers will gain the console synchronization
mechanisms.

Converted with coccinelle. No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Link: https://lore.kernel.org/r/20230914183831.587273-28-john.ogness@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index f72e1340b47d4eaf2ecea780d7d6ab4b58100a5e..6d0cfb2e86b45a91010c01639ef4c0c21680ae8c 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -532,9 +532,9 @@ static void lpuart_dma_tx_complete(void *arg)
        struct dma_chan *chan = sport->dma_tx_chan;
        unsigned long flags;
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
        if (!sport->dma_tx_in_progress) {
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
                return;
        }
 
@@ -543,7 +543,7 @@ static void lpuart_dma_tx_complete(void *arg)
 
        uart_xmit_advance(&sport->port, sport->dma_tx_bytes);
        sport->dma_tx_in_progress = false;
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(&sport->port);
@@ -553,12 +553,12 @@ static void lpuart_dma_tx_complete(void *arg)
                return;
        }
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        if (!lpuart_stopped_or_empty(&sport->port))
                lpuart_dma_tx(sport);
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static dma_addr_t lpuart_dma_datareg_addr(struct lpuart_port *sport)
@@ -651,7 +651,7 @@ static int lpuart_poll_init(struct uart_port *port)
 
        sport->port.fifosize = 0;
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
        /* Disable Rx & Tx */
        writeb(0, sport->port.membase + UARTCR2);
 
@@ -675,7 +675,7 @@ static int lpuart_poll_init(struct uart_port *port)
 
        /* Enable Rx and Tx */
        writeb(UARTCR2_RE | UARTCR2_TE, sport->port.membase + UARTCR2);
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 
        return 0;
 }
@@ -703,7 +703,7 @@ static int lpuart32_poll_init(struct uart_port *port)
 
        sport->port.fifosize = 0;
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        /* Disable Rx & Tx */
        lpuart32_write(&sport->port, 0, UARTCTRL);
@@ -724,7 +724,7 @@ static int lpuart32_poll_init(struct uart_port *port)
 
        /* Enable Rx and Tx */
        lpuart32_write(&sport->port, UARTCTRL_RE | UARTCTRL_TE, UARTCTRL);
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 
        return 0;
 }
@@ -879,9 +879,9 @@ static unsigned int lpuart32_tx_empty(struct uart_port *port)
 
 static void lpuart_txint(struct lpuart_port *sport)
 {
-       spin_lock(&sport->port.lock);
+       uart_port_lock(&sport->port);
        lpuart_transmit_buffer(sport);
-       spin_unlock(&sport->port.lock);
+       uart_port_unlock(&sport->port);
 }
 
 static void lpuart_rxint(struct lpuart_port *sport)
@@ -890,7 +890,7 @@ static void lpuart_rxint(struct lpuart_port *sport)
        struct tty_port *port = &sport->port.state->port;
        unsigned char rx, sr;
 
-       spin_lock(&sport->port.lock);
+       uart_port_lock(&sport->port);
 
        while (!(readb(sport->port.membase + UARTSFIFO) & UARTSFIFO_RXEMPT)) {
                flg = TTY_NORMAL;
@@ -956,9 +956,9 @@ out:
 
 static void lpuart32_txint(struct lpuart_port *sport)
 {
-       spin_lock(&sport->port.lock);
+       uart_port_lock(&sport->port);
        lpuart32_transmit_buffer(sport);
-       spin_unlock(&sport->port.lock);
+       uart_port_unlock(&sport->port);
 }
 
 static void lpuart32_rxint(struct lpuart_port *sport)
@@ -968,7 +968,7 @@ static void lpuart32_rxint(struct lpuart_port *sport)
        unsigned long rx, sr;
        bool is_break;
 
-       spin_lock(&sport->port.lock);
+       uart_port_lock(&sport->port);
 
        while (!(lpuart32_read(&sport->port, UARTFIFO) & UARTFIFO_RXEMPT)) {
                flg = TTY_NORMAL;
@@ -1170,12 +1170,12 @@ static void lpuart_copy_rx_to_tty(struct lpuart_port *sport)
 
        async_tx_ack(sport->dma_rx_desc);
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        dmastat = dmaengine_tx_status(chan, sport->dma_rx_cookie, &state);
        if (dmastat == DMA_ERROR) {
                dev_err(sport->port.dev, "Rx DMA transfer failed!\n");
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
                return;
        }
 
@@ -1244,7 +1244,7 @@ exit:
        dma_sync_sg_for_device(chan->device->dev, &sport->rx_sgl, 1,
                               DMA_FROM_DEVICE);
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 
        tty_flip_buffer_push(port);
        if (!sport->dma_idle_int)
@@ -1335,9 +1335,9 @@ static void lpuart_timer_func(struct timer_list *t)
                mod_timer(&sport->lpuart_timer,
                          jiffies + sport->dma_rx_timeout);
 
-       if (spin_trylock_irqsave(&sport->port.lock, flags)) {
+       if (uart_port_trylock_irqsave(&sport->port, &flags)) {
                sport->last_residue = state.residue;
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
        }
 }
 
@@ -1802,14 +1802,14 @@ static void lpuart_hw_setup(struct lpuart_port *sport)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        lpuart_setup_watermark_enable(sport);
 
        lpuart_rx_dma_startup(sport);
        lpuart_tx_dma_startup(sport);
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static int lpuart_startup(struct uart_port *port)
@@ -1859,7 +1859,7 @@ static void lpuart32_hw_setup(struct lpuart_port *sport)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        lpuart32_hw_disable(sport);
 
@@ -1869,7 +1869,7 @@ static void lpuart32_hw_setup(struct lpuart_port *sport)
        lpuart32_setup_watermark_enable(sport);
        lpuart32_configure(sport);
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static int lpuart32_startup(struct uart_port *port)
@@ -1932,7 +1932,7 @@ static void lpuart_shutdown(struct uart_port *port)
        unsigned char temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
 
        /* disable Rx/Tx and interrupts */
        temp = readb(port->membase + UARTCR2);
@@ -1940,7 +1940,7 @@ static void lpuart_shutdown(struct uart_port *port)
                        UARTCR2_TIE | UARTCR2_TCIE | UARTCR2_RIE);
        writeb(temp, port->membase + UARTCR2);
 
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 
        lpuart_dma_shutdown(sport);
 }
@@ -1952,7 +1952,7 @@ static void lpuart32_shutdown(struct uart_port *port)
        unsigned long temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
 
        /* clear status */
        temp = lpuart32_read(&sport->port, UARTSTAT);
@@ -1969,7 +1969,7 @@ static void lpuart32_shutdown(struct uart_port *port)
                        UARTCTRL_TIE | UARTCTRL_TCIE | UARTCTRL_RIE | UARTCTRL_SBK);
        lpuart32_write(port, temp, UARTCTRL);
 
-       spin_unlock_irqrestore(&port->lock, flags);
+       uart_port_unlock_irqrestore(port, flags);
 
        lpuart_dma_shutdown(sport);
 }
@@ -2069,7 +2069,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
        if (old && sport->lpuart_dma_rx_use)
                lpuart_dma_rx_free(&sport->port);
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        sport->port.read_status_mask = 0;
        if (termios->c_iflag & INPCK)
@@ -2124,7 +2124,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
                        sport->lpuart_dma_rx_use = false;
        }
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static void __lpuart32_serial_setbrg(struct uart_port *port,
@@ -2304,7 +2304,7 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,
        if (old && sport->lpuart_dma_rx_use)
                lpuart_dma_rx_free(&sport->port);
 
-       spin_lock_irqsave(&sport->port.lock, flags);
+       uart_port_lock_irqsave(&sport->port, &flags);
 
        sport->port.read_status_mask = 0;
        if (termios->c_iflag & INPCK)
@@ -2359,7 +2359,7 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,
                        sport->lpuart_dma_rx_use = false;
        }
 
-       spin_unlock_irqrestore(&sport->port.lock, flags);
+       uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static const char *lpuart_type(struct uart_port *port)
@@ -2477,9 +2477,9 @@ lpuart_console_write(struct console *co, const char *s, unsigned int count)
        int locked = 1;
 
        if (oops_in_progress)
-               locked = spin_trylock_irqsave(&sport->port.lock, flags);
+               locked = uart_port_trylock_irqsave(&sport->port, &flags);
        else
-               spin_lock_irqsave(&sport->port.lock, flags);
+               uart_port_lock_irqsave(&sport->port, &flags);
 
        /* first save CR2 and then disable interrupts */
        cr2 = old_cr2 = readb(sport->port.membase + UARTCR2);
@@ -2495,7 +2495,7 @@ lpuart_console_write(struct console *co, const char *s, unsigned int count)
        writeb(old_cr2, sport->port.membase + UARTCR2);
 
        if (locked)
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 static void
@@ -2507,9 +2507,9 @@ lpuart32_console_write(struct console *co, const char *s, unsigned int count)
        int locked = 1;
 
        if (oops_in_progress)
-               locked = spin_trylock_irqsave(&sport->port.lock, flags);
+               locked = uart_port_trylock_irqsave(&sport->port, &flags);
        else
-               spin_lock_irqsave(&sport->port.lock, flags);
+               uart_port_lock_irqsave(&sport->port, &flags);
 
        /* first save CR2 and then disable interrupts */
        cr = old_cr = lpuart32_read(&sport->port, UARTCTRL);
@@ -2525,7 +2525,7 @@ lpuart32_console_write(struct console *co, const char *s, unsigned int count)
        lpuart32_write(&sport->port, old_cr, UARTCTRL);
 
        if (locked)
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
 }
 
 /*
@@ -3089,7 +3089,7 @@ static int lpuart_suspend(struct device *dev)
        uart_suspend_port(&lpuart_reg, &sport->port);
 
        if (lpuart_uport_is_active(sport)) {
-               spin_lock_irqsave(&sport->port.lock, flags);
+               uart_port_lock_irqsave(&sport->port, &flags);
                if (lpuart_is_32(sport)) {
                        /* disable Rx/Tx and interrupts */
                        temp = lpuart32_read(&sport->port, UARTCTRL);
@@ -3101,7 +3101,7 @@ static int lpuart_suspend(struct device *dev)
                        temp &= ~(UARTCR2_TE | UARTCR2_TIE | UARTCR2_TCIE);
                        writeb(temp, sport->port.membase + UARTCR2);
                }
-               spin_unlock_irqrestore(&sport->port.lock, flags);
+               uart_port_unlock_irqrestore(&sport->port, flags);
 
                if (sport->lpuart_dma_rx_use) {
                        /*
@@ -3114,7 +3114,7 @@ static int lpuart_suspend(struct device *dev)
                        lpuart_dma_rx_free(&sport->port);
 
                        /* Disable Rx DMA to use UART port as wakeup source */
-                       spin_lock_irqsave(&sport->port.lock, flags);
+                       uart_port_lock_irqsave(&sport->port, &flags);
                        if (lpuart_is_32(sport)) {
                                temp = lpuart32_read(&sport->port, UARTBAUD);
                                lpuart32_write(&sport->port, temp & ~UARTBAUD_RDMAE,
@@ -3123,11 +3123,11 @@ static int lpuart_suspend(struct device *dev)
                                writeb(readb(sport->port.membase + UARTCR5) &
                                       ~UARTCR5_RDMAS, sport->port.membase + UARTCR5);
                        }
-                       spin_unlock_irqrestore(&sport->port.lock, flags);
+                       uart_port_unlock_irqrestore(&sport->port, flags);
                }
 
                if (sport->lpuart_dma_tx_use) {
-                       spin_lock_irqsave(&sport->port.lock, flags);
+                       uart_port_lock_irqsave(&sport->port, &flags);
                        if (lpuart_is_32(sport)) {
                                temp = lpuart32_read(&sport->port, UARTBAUD);
                                temp &= ~UARTBAUD_TDMAE;
@@ -3137,7 +3137,7 @@ static int lpuart_suspend(struct device *dev)
                                temp &= ~UARTCR5_TDMAS;
                                writeb(temp, sport->port.membase + UARTCR5);
                        }
-                       spin_unlock_irqrestore(&sport->port.lock, flags);
+                       uart_port_unlock_irqrestore(&sport->port, flags);
                        sport->dma_tx_in_progress = false;
                        dmaengine_terminate_sync(sport->dma_tx_chan);
                }