Browse Source

serial: sh-sci: Do not terminate DMA engine when race condition occurs

When DMA packet completion and timer expiry take place at the same time,
do not terminate the DMA engine, leading by submission of new
descriptors, as the DMA communication hasn't necessarily stopped here.

Signed-off-by: Muhammad Hamza Farooq <mfarooq@visteon.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Hamza Farooq 10 years ago
parent
commit
3b963042b6
1 changed files with 6 additions and 1 deletions
  1. 6 1
      drivers/tty/serial/sh-sci.c

+ 6 - 1
drivers/tty/serial/sh-sci.c

@@ -1296,9 +1296,14 @@ static void rx_timer_fn(unsigned long arg)
 	}
 	}
 
 
 	status = dmaengine_tx_status(s->chan_rx, s->active_rx, &state);
 	status = dmaengine_tx_status(s->chan_rx, s->active_rx, &state);
-	if (status == DMA_COMPLETE)
+	if (status == DMA_COMPLETE) {
 		dev_dbg(port->dev, "Cookie %d #%d has already completed\n",
 		dev_dbg(port->dev, "Cookie %d #%d has already completed\n",
 			s->active_rx, active);
 			s->active_rx, active);
+		spin_unlock_irqrestore(&port->lock, flags);
+
+		/* Let packet complete handler take care of the packet */
+		return;
+	}
 
 
 	/* Handle incomplete DMA receive */
 	/* Handle incomplete DMA receive */
 	dmaengine_terminate_all(s->chan_rx);
 	dmaengine_terminate_all(s->chan_rx);