Commit 10747568 authored by Shubhrajyoti Datta's avatar Shubhrajyoti Datta Committed by Greg Kroah-Hartman
Browse files

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: default avatarShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f74dfa8

drivers/tty/serial/xilinx_uartps.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE