summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/xilinx_uartps.c
diff options
context:
space:
mode:
authorSoren Brinkmann <soren.brinkmann@xilinx.com>2015-12-26 02:43:55 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-06 22:52:09 -0800
commita19eda0f49e5b19c403c5fe33e1e2f46e7b02082 (patch)
treed664caaeec7ddaf535588f5d2cbab745bb466d5d /drivers/tty/serial/xilinx_uartps.c
parent4c0b92ed9ebab389cdefd56efe81f8c3d8d458d5 (diff)
downloadblackbird-op-linux-a19eda0f49e5b19c403c5fe33e1e2f46e7b02082.tar.gz
blackbird-op-linux-a19eda0f49e5b19c403c5fe33e1e2f46e7b02082.zip
tty: xuartps: Acquire port lock for shutdown
Shutting down the UART port can happen while console operations are in progress. Holding the port lock serializes these operations and avoids the UART HW to be disabled in the middle of console prints. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Reviewed-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/xilinx_uartps.c')
-rw-r--r--drivers/tty/serial/xilinx_uartps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index ab3995d00973..f3ac69387b0a 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -826,6 +826,9 @@ static int cdns_uart_startup(struct uart_port *port)
static void cdns_uart_shutdown(struct uart_port *port)
{
int status;
+ unsigned long flags;
+
+ spin_lock_irqsave(&port->lock, flags);
/* Disable interrupts */
status = readl(port->membase + CDNS_UART_IMR_OFFSET);
@@ -835,6 +838,9 @@ static void cdns_uart_shutdown(struct uart_port *port)
/* Disable the TX and RX */
writel(CDNS_UART_CR_TX_DIS | CDNS_UART_CR_RX_DIS,
port->membase + CDNS_UART_CR_OFFSET);
+
+ spin_unlock_irqrestore(&port->lock, flags);
+
free_irq(port->irq, port);
}
OpenPOWER on IntegriCloud