pch_uart: Fix rx error interrupt setting issue

Rx Error interrupt(E.G. parity error) is not enabled.
So, when parity error occurs, error interrupt is not occurred.
As a result, the received data is not dropped.

This patch adds enable/disable rx error interrupt code.

Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomoya MORINAGA 2012-07-06 17:19:42 +09:00 committed by Greg Kroah-Hartman
parent 9bc03743ff
commit 9539dfb7ac
1 changed files with 12 additions and 6 deletions

View File

@ -757,7 +757,8 @@ static void pch_dma_rx_complete(void *arg)
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
tty_kref_put(tty); tty_kref_put(tty);
async_tx_ack(priv->desc_rx); async_tx_ack(priv->desc_rx);
pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT); pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
} }
static void pch_dma_tx_complete(void *arg) static void pch_dma_tx_complete(void *arg)
@ -812,7 +813,8 @@ static int handle_rx_to(struct eg20t_port *priv)
int rx_size; int rx_size;
int ret; int ret;
if (!priv->start_rx) { if (!priv->start_rx) {
pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT); pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
return 0; return 0;
} }
buf = &priv->rxbuf; buf = &priv->rxbuf;
@ -1081,11 +1083,13 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
case PCH_UART_IID_RDR: /* Received Data Ready */ case PCH_UART_IID_RDR: /* Received Data Ready */
if (priv->use_dma) { if (priv->use_dma) {
pch_uart_hal_disable_interrupt(priv, pch_uart_hal_disable_interrupt(priv,
PCH_UART_HAL_RX_INT); PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
ret = dma_handle_rx(priv); ret = dma_handle_rx(priv);
if (!ret) if (!ret)
pch_uart_hal_enable_interrupt(priv, pch_uart_hal_enable_interrupt(priv,
PCH_UART_HAL_RX_INT); PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
} else { } else {
ret = handle_rx(priv); ret = handle_rx(priv);
} }
@ -1211,7 +1215,8 @@ static void pch_uart_stop_rx(struct uart_port *port)
struct eg20t_port *priv; struct eg20t_port *priv;
priv = container_of(port, struct eg20t_port, port); priv = container_of(port, struct eg20t_port, port);
priv->start_rx = 0; priv->start_rx = 0;
pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT); pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
} }
/* Enable the modem status interrupts. */ /* Enable the modem status interrupts. */
@ -1304,7 +1309,8 @@ static int pch_uart_startup(struct uart_port *port)
pch_request_dma(port); pch_request_dma(port);
priv->start_rx = 1; priv->start_rx = 1;
pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT); pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
PCH_UART_HAL_RX_ERR_INT);
uart_update_timeout(port, CS8, default_baud); uart_update_timeout(port, CS8, default_baud);
return 0; return 0;