Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254143
b: refs/heads/master
c: 3bc46b3
h: refs/heads/master
i:
  254141: ac0ecc6
  254139: 27446f3
  254135: f92e3d8
  254127: c722964
  254111: 0a3940b
  254079: c1f2072
v: v3
  • Loading branch information
Maxime Bizon authored and Greg Kroah-Hartman committed Jun 16, 2011
1 parent 87c7a4d commit 99cdd09
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a7d4369b3fe1f8e5efe7f11a1c482055693852f
refs/heads/master: 3bc46b312b1486b1fe2db4246a34a30160d26d8d
18 changes: 14 additions & 4 deletions trunk/drivers/tty/serial/bcm63xx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 99cdd09

Please sign in to comment.