From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: Moritz Fischer <moritz.fischer@ettus.com>,
Peter Hurley <peter@hurleysoftware.com>,
Michal Simek <michal.simek@xilinx.com>,
linux-kernel@vger.kernel.org,
Soren Brinkmann <soren.brinkmann@xilinx.com>,
linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH LINUX v5 7/8] tty: xuartps: Acquire port lock for shutdown
Date: Sat, 26 Dec 2015 02:43:55 -0800 [thread overview]
Message-ID: <1451126636-13699-8-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1451126636-13699-1-git-send-email-soren.brinkmann@xilinx.com>
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>
---
drivers/tty/serial/xilinx_uartps.c | 6 ++++++
1 file changed, 6 insertions(+)
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);
}
--
2.6.3.3.g9bb996a
next prev parent reply other threads:[~2015-12-26 10:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-26 10:43 [PATCH LINUX v5 0/8] tty: xuartps: Fix lock ups Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 1/8] tty: xuartps: Beautify read-modify writes Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 2/8] tty: xuartps: Use spinlock to serialize HW access Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 3/8] tty: xuartps: Don't consider circular buffer when enabling transmitter Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 4/8] tty: xuartps: Clear interrupt status register in shutdown Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 5/8] tty: xuartps: Improve startup function Soren Brinkmann
2015-12-26 10:43 ` [PATCH LINUX v5 6/8] tty: xuartps: Keep lock for whole ISR Soren Brinkmann
2015-12-26 10:43 ` Soren Brinkmann [this message]
2015-12-26 10:43 ` [PATCH LINUX v5 8/8] tty: xuartps: Move RX path into helper function Soren Brinkmann
2016-01-10 6:18 ` [PATCH LINUX v5 0/8] tty: xuartps: Fix lock ups Peter Hurley
2016-01-19 0:27 ` Sören Brinkmann
2016-01-19 3:22 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451126636-13699-8-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=moritz.fischer@ettus.com \
--cc=peter@hurleysoftware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).