Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / arc_uart.c

diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index 22f280aa4f2c521b5829a6ea5e72b8c05f2265d9..569872f4c9b848fea0f81eab72dd29865b0ded41 100644 (file)
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -209,9 +209,9 @@ static void arc_serial_start_tx(struct uart_port *port)
        arc_serial_tx_chars(uart);
 }
 
-static void arc_serial_rx_chars(struct arc_uart_port *uart)
+static void arc_serial_rx_chars(struct arc_uart_port *uart, unsigned int status)
 {
-       unsigned int status, ch, flg = 0;
+       unsigned int ch, flg = 0;
 
        /*
         * UART has 4 deep RX-FIFO. Driver's recongnition of this fact
@@ -222,11 +222,11 @@ static void arc_serial_rx_chars(struct arc_uart_port *uart)
         * before RX-EMPTY=0, implies some sort of buffering going on in the
         * controller, which is indeed the Rx-FIFO.
         */
-       while (!((status = UART_GET_STATUS(uart)) & RXEMPTY)) {
-
-               ch = UART_GET_DATA(uart);
-               uart->port.icount.rx++;
-
+       do {
+               /*
+                * This could be an Rx Intr for err (no data),
+                * so check err and clear that Intr first
+                */
                if (unlikely(status & (RXOERR | RXFERR))) {
                        if (status & RXOERR) {
                                uart->port.icount.overrun++;
@@ -242,14 +242,19 @@ static void arc_serial_rx_chars(struct arc_uart_port *uart)
                } else
                        flg = TTY_NORMAL;
 
-               if (unlikely(uart_handle_sysrq_char(&uart->port, ch)))
-                       goto done;
+               if (status & RXEMPTY)
+                       continue;
 
-               uart_insert_char(&uart->port, status, RXOERR, ch, flg);
+               ch = UART_GET_DATA(uart);
+               uart->port.icount.rx++;
+
+               if (!(uart_handle_sysrq_char(&uart->port, ch)))
+                       uart_insert_char(&uart->port, status, RXOERR, ch, flg);
 
-done:
+               spin_unlock(&uart->port.lock);
                tty_flip_buffer_push(&uart->port.state->port);
-       }
+               spin_lock(&uart->port.lock);
+       } while (!((status = UART_GET_STATUS(uart)) & RXEMPTY));
 }
 
 /*
@@ -292,11 +297,11 @@ static irqreturn_t arc_serial_isr(int irq, void *dev_id)
         * notifications from the UART Controller.
         * To demultiplex between the two, we check the relevant bits
         */
-       if ((status & RXIENB) && !(status & RXEMPTY)) {
+       if (status & RXIENB) {
 
                /* already in ISR, no need of xx_irqsave */
                spin_lock(&uart->port.lock);
-               arc_serial_rx_chars(uart);
+               arc_serial_rx_chars(uart, status);
                spin_unlock(&uart->port.lock);
        }
 
@@ -528,7 +533,7 @@ arc_uart_init_one(struct platform_device *pdev, int dev_id)
        unsigned long *plat_data;
        struct arc_uart_port *uart = &arc_uart_ports[dev_id];
 
-       plat_data = ((unsigned long *)(pdev->dev.platform_data));
+       plat_data = (unsigned long *)dev_get_platdata(&pdev->dev);
        if (!plat_data)
                return -ENODEV;