From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: Michal Simek <michal.simek@xilinx.com>,
<linux-serial@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
"Soren Brinkmann" <soren.brinkmann@xilinx.com>
Subject: [PATH RESEND v2 09/10] tty: xuartps: Only handle RX IRQs when RX is enabled
Date: Thu, 19 Nov 2015 12:02:23 -0800 [thread overview]
Message-ID: <1447963344-16266-10-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1447963344-16266-1-git-send-email-soren.brinkmann@xilinx.com>
Ignore RX-related interrupts if RX is not enabled.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
drivers/tty/serial/xilinx_uartps.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index aa1176e6661a..413229661f5d 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -161,6 +161,7 @@ MODULE_PARM_DESC(rx_timeout, "Rx timeout, 1-255");
* @pclk: APB clock
* @baud: Current baud rate
* @clk_rate_change_nb: Notifier block for clock changes
+ * @flags: Driver flags
*/
struct cdns_uart {
struct uart_port *port;
@@ -168,7 +169,11 @@ struct cdns_uart {
struct clk *pclk;
unsigned int baud;
struct notifier_block clk_rate_change_nb;
+ u32 flags;
};
+
+#define CDNS_FLAG_RX_ENABLED BIT(0)
+
#define to_cdns_uart(_nb) container_of(_nb, struct cdns_uart, \
clk_rate_change_nb);
@@ -262,6 +267,7 @@ static void cdns_uart_handle_rx(struct uart_port *port, unsigned int isrstatus)
static irqreturn_t cdns_uart_isr(int irq, void *dev_id)
{
struct uart_port *port = (struct uart_port *)dev_id;
+ struct cdns_uart *cdns_uart = port->private_data;
unsigned long flags;
unsigned int isrstatus, numbytes;
@@ -272,7 +278,8 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id)
*/
isrstatus = readl(port->membase + CDNS_UART_ISR_OFFSET);
- cdns_uart_handle_rx(port, isrstatus);
+ if (cdns_uart->flags & CDNS_FLAG_RX_ENABLED)
+ cdns_uart_handle_rx(port, isrstatus);
/* Dispatch an appropriate handler */
if ((isrstatus & CDNS_UART_IXR_TXEMPTY) == CDNS_UART_IXR_TXEMPTY) {
@@ -576,11 +583,13 @@ static void cdns_uart_stop_tx(struct uart_port *port)
static void cdns_uart_stop_rx(struct uart_port *port)
{
unsigned int regval;
+ struct cdns_uart *cdns_uart = port->private_data;
regval = readl(port->membase + CDNS_UART_CR_OFFSET);
regval |= CDNS_UART_CR_RX_DIS;
/* Disable the receiver */
writel(regval, port->membase + CDNS_UART_CR_OFFSET);
+ cdns_uart->flags &= ~CDNS_FLAG_RX_ENABLED;
}
/**
@@ -761,6 +770,7 @@ static int cdns_uart_startup(struct uart_port *port)
{
unsigned long flags;
unsigned int retval = 0, status = 0;
+ struct cdns_uart *cdns_uart = port->private_data;
retval = request_irq(port->irq, cdns_uart_isr, 0, CDNS_UART_NAME,
(void *)port);
@@ -787,6 +797,7 @@ static int cdns_uart_startup(struct uart_port *port)
status &= CDNS_UART_CR_RX_DIS;
status |= CDNS_UART_CR_RX_EN;
writel(status, port->membase + CDNS_UART_CR_OFFSET);
+ cdns_uart->flags |= CDNS_FLAG_RX_ENABLED;
/* Set the Mode Register with normal mode,8 data bits,1 stop bit,
* no parity.
@@ -830,6 +841,7 @@ static void cdns_uart_shutdown(struct uart_port *port)
{
int status;
unsigned long flags;
+ struct cdns_uart *cdns_uart = port->private_data;
spin_lock_irqsave(&port->lock, flags);
@@ -841,6 +853,7 @@ 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);
+ cdns_uart->flags &= ~CDNS_FLAG_RX_ENABLED;
spin_unlock_irqrestore(&port->lock, flags);
--
2.6.3.3.g9bb996a
next prev parent reply other threads:[~2015-11-19 20:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 20:02 [PATH RESEND v2 00/10] tty: xuartps: Fix lock ups Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 02/10] tty: xuartps: Use spinlock to serialize HW access Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in start_tx Soren Brinkmann
2015-11-20 12:13 ` Peter Hurley
2015-11-20 15:28 ` Sören Brinkmann
2015-11-20 16:30 ` Peter Hurley
2015-11-20 16:58 ` Sören Brinkmann
2015-11-20 17:16 ` Peter Hurley
2015-11-20 17:29 ` Sören Brinkmann
2015-11-23 7:05 ` Michal Simek
2015-11-23 20:00 ` Peter Hurley
2015-11-24 7:26 ` Michal Simek
2015-11-20 17:05 ` Sören Brinkmann
2015-11-20 17:12 ` Peter Hurley
2015-11-19 20:02 ` [PATH RESEND v2 04/10] tty: xuartps: Clear interrupt status register in shutdown Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 05/10] tty: xuartps: Improve startup function Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 06/10] tty: xuartps: Keep lock for whole ISR Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 07/10] tty: xuartps: Acquire port lock for shutdown Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 08/10] tty: xuartps: Move RX path into helper function Soren Brinkmann
2015-11-19 20:02 ` Soren Brinkmann [this message]
2015-11-19 20:02 ` [PATH RESEND v2 10/10] tty: xuartps: Cleanup: Reformat if-else Soren Brinkmann
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=1447963344-16266-10-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 \
/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).