Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1273455

[PATH RESEND v2 05/10] tty: xuartps: Improve startup function

Show all headers | View raw

The startup function is supposed to initialize the UART for receiving.
Hence, don't enable the TX part. Also, protect HW accesses with the port
lock.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 drivers/tty/serial/xilinx_uartps.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index b7fc30639292..167e0f4bcf7a 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -755,6 +755,7 @@ static void cdns_uart_set_termios(struct uart_port *port,
  */
 static int cdns_uart_startup(struct uart_port *port)
 {
+	unsigned long flags;
 	unsigned int retval = 0, status = 0;
 
 	retval = request_irq(port->irq, cdns_uart_isr, 0, CDNS_UART_NAME,
@@ -762,6 +763,8 @@ static int cdns_uart_startup(struct uart_port *port)
 	if (retval)
 		return retval;
 
+	spin_lock_irqsave(&port->lock, flags);
+
 	/* Disable the TX and RX */
 	writel(CDNS_UART_CR_TX_DIS | CDNS_UART_CR_RX_DIS,
 			port->membase + CDNS_UART_CR_OFFSET);
@@ -772,15 +775,14 @@ static int cdns_uart_startup(struct uart_port *port)
 	writel(CDNS_UART_CR_TXRST | CDNS_UART_CR_RXRST,
 			port->membase + CDNS_UART_CR_OFFSET);
 
-	status = readl(port->membase + CDNS_UART_CR_OFFSET);
-
-	/* Clear the RX disable and TX disable bits and then set the TX enable
-	 * bit and RX enable bit to enable the transmitter and receiver.
+	/*
+	 * Clear the RX disable bit and then set the RX enable bit to enable
+	 * the receiver.
 	 */
-	writel((status & ~(CDNS_UART_CR_TX_DIS | CDNS_UART_CR_RX_DIS))
-			| (CDNS_UART_CR_TX_EN | CDNS_UART_CR_RX_EN |
-			CDNS_UART_CR_STOPBRK),
-			port->membase + CDNS_UART_CR_OFFSET);
+	status = readl(port->membase + CDNS_UART_CR_OFFSET);
+	status &= CDNS_UART_CR_RX_DIS;
+	status |= CDNS_UART_CR_RX_EN;
+	writel(status, port->membase + CDNS_UART_CR_OFFSET);
 
 	/* Set the Mode Register with normal mode,8 data bits,1 stop bit,
 	 * no parity.
@@ -811,6 +813,8 @@ static int cdns_uart_startup(struct uart_port *port)
 		CDNS_UART_IXR_RXTRIG | CDNS_UART_IXR_TOUT,
 		port->membase + CDNS_UART_IER_OFFSET);
 
+	spin_unlock_irqrestore(&port->lock, flags);
+
 	return retval;
 }
 
-- 
2.6.3.3.g9bb996a

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATH RESEND v2 00/10] tty: xuartps: Fix lock ups Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in start_tx Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
    Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Peter Hurley <peter@hurleysoftware.com> - 2015-11-20 13:20 +0100
      Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter  in start_tx Sören Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-20 16:30 +0100
        Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Peter Hurley <peter@hurleysoftware.com> - 2015-11-20 17:40 +0100
          Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter  in start_tx Sören Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-20 18:00 +0100
            Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Peter Hurley <peter@hurleysoftware.com> - 2015-11-20 18:20 +0100
              Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter  in start_tx Sören Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-20 18:30 +0100
              Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Michal Simek <michal.simek@xilinx.com> - 2015-11-23 08:10 +0100
                Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Peter Hurley <peter@hurleysoftware.com> - 2015-11-23 21:10 +0100
                Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Michal Simek <michal.simek@xilinx.com> - 2015-11-24 08:50 +0100
      Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter  in start_tx Sören Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-20 18:10 +0100
        Re: [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in  start_tx Peter Hurley <peter@hurleysoftware.com> - 2015-11-20 18:20 +0100
  [PATH RESEND v2 05/10] tty: xuartps: Improve startup function Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 08/10] tty: xuartps: Move RX path into helper function Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 06/10] tty: xuartps: Keep lock for whole ISR Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 09/10] tty: xuartps: Only handle RX IRQs when RX is enabled Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 10/10] tty: xuartps: Cleanup: Reformat if-else Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 07/10] tty: xuartps: Acquire port lock for shutdown Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100
  [PATH RESEND v2 02/10] tty: xuartps: Use spinlock to serialize HW access Soren Brinkmann <soren.brinkmann@xilinx.com> - 2015-11-19 21:20 +0100

csiph-web