Commit 6eefc68d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

serial: sh-sci: Stop using deprecated dmaengine_terminate_all()

As of commit b36f09c3 ("dmaengine: Add transfer termination
synchronization support"), dmaengine_terminate_all() is deprecated.

Replace calls to dmaengine_terminate_all() in DMA release code by calls
to dmaengine_terminate_sync(), as the latter waits until all running
completion callbacks have finished.

Replace calls to dmaengine_terminate_all() in DMA failure paths by calls
to dmaengine_terminate_async(), as these are usually done in atomic
context.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6611317
...@@ -1220,7 +1220,7 @@ static void sci_rx_dma_release(struct sci_port *s) ...@@ -1220,7 +1220,7 @@ static void sci_rx_dma_release(struct sci_port *s)
s->chan_rx_saved = s->chan_rx = NULL; s->chan_rx_saved = s->chan_rx = NULL;
s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL; s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL;
dmaengine_terminate_all(chan); dmaengine_terminate_sync(chan);
dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0], dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0],
sg_dma_address(&s->sg_rx[0])); sg_dma_address(&s->sg_rx[0]));
dma_release_channel(chan); dma_release_channel(chan);
...@@ -1296,7 +1296,7 @@ static void sci_tx_dma_release(struct sci_port *s) ...@@ -1296,7 +1296,7 @@ static void sci_tx_dma_release(struct sci_port *s)
cancel_work_sync(&s->work_tx); cancel_work_sync(&s->work_tx);
s->chan_tx_saved = s->chan_tx = NULL; s->chan_tx_saved = s->chan_tx = NULL;
s->cookie_tx = -EINVAL; s->cookie_tx = -EINVAL;
dmaengine_terminate_all(chan); dmaengine_terminate_sync(chan);
dma_unmap_single(chan->device->dev, s->tx_dma_addr, UART_XMIT_SIZE, dma_unmap_single(chan->device->dev, s->tx_dma_addr, UART_XMIT_SIZE,
DMA_TO_DEVICE); DMA_TO_DEVICE);
dma_release_channel(chan); dma_release_channel(chan);
...@@ -1334,7 +1334,7 @@ static void sci_submit_rx(struct sci_port *s) ...@@ -1334,7 +1334,7 @@ static void sci_submit_rx(struct sci_port *s)
fail: fail:
if (i) if (i)
dmaengine_terminate_all(chan); dmaengine_terminate_async(chan);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
s->cookie_rx[i] = -EINVAL; s->cookie_rx[i] = -EINVAL;
s->active_rx = -EINVAL; s->active_rx = -EINVAL;
...@@ -1452,7 +1452,7 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t) ...@@ -1452,7 +1452,7 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t)
} }
/* Handle incomplete DMA receive */ /* Handle incomplete DMA receive */
dmaengine_terminate_all(s->chan_rx); dmaengine_terminate_async(s->chan_rx);
read = sg_dma_len(&s->sg_rx[active]) - state.residue; read = sg_dma_len(&s->sg_rx[active]) - state.residue;
if (read) { if (read) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment