diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2007-12-21 04:12:55 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2007-12-21 04:12:55 -0500 |
commit | 99ee7b5f3a68324807650f650f2613bbe281627f (patch) | |
tree | e9f8799f94026ae1be19ff0d5d144acb9fff3409 /drivers/serial/bfin_5xx.c | |
parent | 75b780bd99b851682289e7a88763ede5a936edb0 (diff) |
[Blackfin] serial driver: Fix bug serial driver in DMA mode spams history to console on shell restart
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>
Diffstat (limited to 'drivers/serial/bfin_5xx.c')
-rw-r--r-- | drivers/serial/bfin_5xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index 838f491c8deb..007414639e32 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
@@ -411,6 +411,10 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) | |||
411 | set_dma_x_count(uart->tx_dma_channel, uart->tx_count); | 411 | set_dma_x_count(uart->tx_dma_channel, uart->tx_count); |
412 | set_dma_x_modify(uart->tx_dma_channel, 1); | 412 | set_dma_x_modify(uart->tx_dma_channel, 1); |
413 | enable_dma(uart->tx_dma_channel); | 413 | enable_dma(uart->tx_dma_channel); |
414 | |||
415 | xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1); | ||
416 | uart->port.icount.tx += uart->tx_count; | ||
417 | |||
414 | #ifdef CONFIG_BF54x | 418 | #ifdef CONFIG_BF54x |
415 | UART_SET_IER(uart, ETBEI); | 419 | UART_SET_IER(uart, ETBEI); |
416 | #else | 420 | #else |
@@ -502,9 +506,6 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id) | |||
502 | ier &= ~ETBEI; | 506 | ier &= ~ETBEI; |
503 | UART_PUT_IER(uart, ier); | 507 | UART_PUT_IER(uart, ier); |
504 | #endif | 508 | #endif |
505 | xmit->tail = (xmit->tail+uart->tx_count) &(UART_XMIT_SIZE -1); | ||
506 | uart->port.icount.tx+=uart->tx_count; | ||
507 | |||
508 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 509 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
509 | uart_write_wakeup(&uart->port); | 510 | uart_write_wakeup(&uart->port); |
510 | 511 | ||