]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[Blackfin] serial driver: Fix bug serial driver in DMA mode spams history to console...
authorSonic Zhang <sonic.zhang@analog.com>
Fri, 21 Dec 2007 09:12:55 +0000 (17:12 +0800)
committerBryan Wu <cooloney@kernel.org>
Fri, 21 Dec 2007 09:12:55 +0000 (17:12 +0800)
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=2920
Fix by increasing buffer tail immediately before starting tx dma.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
drivers/serial/bfin_5xx.c

index 838f491c8deb683964e1b912477e017dd5ea5969..007414639e32dbdc34a1331f0856091b8b5bc577 100644 (file)
@@ -411,6 +411,10 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
        set_dma_x_count(uart->tx_dma_channel, uart->tx_count);
        set_dma_x_modify(uart->tx_dma_channel, 1);
        enable_dma(uart->tx_dma_channel);
+
+       xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);
+       uart->port.icount.tx += uart->tx_count;
+
 #ifdef CONFIG_BF54x
        UART_SET_IER(uart, ETBEI);
 #else
@@ -502,9 +506,6 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
                ier &= ~ETBEI;
                UART_PUT_IER(uart, ier);
 #endif
-               xmit->tail = (xmit->tail+uart->tx_count) &(UART_XMIT_SIZE -1);
-               uart->port.icount.tx+=uart->tx_count;
-
                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                        uart_write_wakeup(&uart->port);