diff options
| author | Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> | 2019-05-24 14:41:28 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-10 19:08:31 +0200 |
| commit | 107475685abfdee504bb0ef4824f15797f6d2d4d (patch) | |
| tree | eb6f9e3ec923e4eb89deb8c7e9cee9dc40604536 | |
| parent | 1f74dfa803e3e82978d45b36a70926256344399e (diff) | |
| download | linux-107475685abfdee504bb0ef4824f15797f6d2d4d.tar.gz | |
serial: uartps: Move the spinlock after the read of the tx empty
Currently we are doing a read of the status register. Move the spinlock after that as the reads need not be spinlock protected. This patch prevents relaxing the cpu with spinlock held. Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/xilinx_uartps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 605354fd60b1..33ac898fb36e 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -686,8 +686,6 @@ static void cdns_uart_set_termios(struct uart_port *port, unsigned long flags; unsigned int ctrl_reg, mode_reg; - spin_lock_irqsave(&port->lock, flags); - /* Wait for the transmit FIFO to empty before making changes */ if (!(readl(port->membase + CDNS_UART_CR) & CDNS_UART_CR_TX_DIS)) { @@ -696,6 +694,7 @@ static void cdns_uart_set_termios(struct uart_port *port, cpu_relax(); } } + spin_lock_irqsave(&port->lock, flags); /* Disable the TX and RX to set baud rate */ ctrl_reg = readl(port->membase + CDNS_UART_CR); |