From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-serial@vger.kernel.org
Cc: Maxime Bizon <mbizon@freebox.fr>, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 12/12] serial: bcm63xx_uart: fix irq storm after rx fifo overrun.
Date: Tue, 28 Jun 2011 09:03:49 -0700 [thread overview]
Message-ID: <1309277029-1532-12-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <1309277029-1532-1-git-send-email-gregkh@suse.de>
From: Maxime Bizon <mbizon@freebox.fr>
RX fifo reset is required to clear irq.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/tty/serial/bcm63xx_uart.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index a1a0e55..c0b68b9 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -250,6 +250,20 @@ static void bcm_uart_do_rx(struct uart_port *port)
/* get overrun/fifo empty information from ier
* register */
iestat = bcm_uart_readl(port, UART_IR_REG);
+
+ if (unlikely(iestat & UART_IR_STAT(UART_IR_RXOVER))) {
+ unsigned int val;
+
+ /* fifo reset is required to clear
+ * interrupt */
+ val = bcm_uart_readl(port, UART_CTL_REG);
+ val |= UART_CTL_RSTRXFIFO_MASK;
+ bcm_uart_writel(port, val, UART_CTL_REG);
+
+ port->icount.overrun++;
+ tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+ }
+
if (!(iestat & UART_IR_STAT(UART_IR_RXNOTEMPTY)))
break;
@@ -284,10 +298,6 @@ static void bcm_uart_do_rx(struct uart_port *port)
if (uart_handle_sysrq_char(port, c))
continue;
- if (unlikely(iestat & UART_IR_STAT(UART_IR_RXOVER))) {
- port->icount.overrun++;
- tty_insert_flip_char(tty, 0, TTY_OVERRUN);
- }
if ((cstat & port->ignore_status_mask) == 0)
tty_insert_flip_char(tty, c, flag);
--
1.7.5.4
prev parent reply other threads:[~2011-06-28 16:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 15:38 [GIT PATCH] TTY/serial driver fixes for 3.0 Greg KH
2011-06-28 16:03 ` [PATCH 01/12] 8250_pci: add -ENODEV code for Intel EG20T PCH Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 02/12] serial: ioremap warning fix for jsm driver Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 03/12] ARM: SAMSUNG: serial: Fix on handling of one clock source for UART Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 04/12] 8250_pci: Fix missing const from merges Greg Kroah-Hartman
2011-06-29 1:36 ` Guenter Roeck
2011-06-29 4:20 ` Greg KH
2011-06-29 14:41 ` Guenter Roeck
2011-06-28 16:03 ` [PATCH 05/12] 8250: Fix capabilities when changing the port type Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 06/12] TTY: ldisc, do not close until there are readers Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 07/12] TTY: ntty, add one more sanity check Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 08/12] tty: n_gsm: Fixed logic to decode break signal from modem status Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 09/12] tty: n_gsm: improper skb_pull() use was leaking framed data Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 10/12] amba pl011: workaround for uart registers lockup Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 11/12] amba pl011: platform data for reg lockup and glitch v2 Greg Kroah-Hartman
2011-06-28 16:03 ` Greg Kroah-Hartman [this message]
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=1309277029-1532-12-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=linux-serial@vger.kernel.org \
--cc=mbizon@freebox.fr \
/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).