|
@@ -20,12 +20,15 @@ static void __dma_tx_complete(void *param)
|
|
struct uart_8250_port *p = param;
|
|
struct uart_8250_port *p = param;
|
|
struct uart_8250_dma *dma = p->dma;
|
|
struct uart_8250_dma *dma = p->dma;
|
|
struct circ_buf *xmit = &p->port.state->xmit;
|
|
struct circ_buf *xmit = &p->port.state->xmit;
|
|
-
|
|
|
|
- dma->tx_running = 0;
|
|
|
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
dma_sync_single_for_cpu(dma->txchan->device->dev, dma->tx_addr,
|
|
dma_sync_single_for_cpu(dma->txchan->device->dev, dma->tx_addr,
|
|
UART_XMIT_SIZE, DMA_TO_DEVICE);
|
|
UART_XMIT_SIZE, DMA_TO_DEVICE);
|
|
|
|
|
|
|
|
+ spin_lock_irqsave(&p->port.lock, flags);
|
|
|
|
+
|
|
|
|
+ dma->tx_running = 0;
|
|
|
|
+
|
|
xmit->tail += dma->tx_size;
|
|
xmit->tail += dma->tx_size;
|
|
xmit->tail &= UART_XMIT_SIZE - 1;
|
|
xmit->tail &= UART_XMIT_SIZE - 1;
|
|
p->port.icount.tx += dma->tx_size;
|
|
p->port.icount.tx += dma->tx_size;
|
|
@@ -35,6 +38,8 @@ static void __dma_tx_complete(void *param)
|
|
|
|
|
|
if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port))
|
|
if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port))
|
|
serial8250_tx_dma(p);
|
|
serial8250_tx_dma(p);
|
|
|
|
+
|
|
|
|
+ spin_unlock_irqrestore(&p->port.lock, flags);
|
|
}
|
|
}
|
|
|
|
|
|
static void __dma_rx_complete(void *param)
|
|
static void __dma_rx_complete(void *param)
|