2022-11-17 10:40:36

by Sherry Sun

Subject: [PATCH] tty: serial: fsl_lpuart: switch to new dmaengine_terminate_* API

Convert dmaengine_terminate_all() calls to synchronous and asynchronous
versions where appropriate.

Signed-off-by: Sherry Sun <[email protected]>
---
drivers/tty/serial/fsl_lpuart.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index bd685491eead..07935b4ad59f 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -580,7 +580,7 @@ static void lpuart_flush_buffer(struct uart_port *port)
sport->dma_tx_nents, DMA_TO_DEVICE);
sport->dma_tx_in_progress = false;
}
- dmaengine_terminate_all(chan);
+ dmaengine_terminate_async(chan);
}

if (lpuart_is_32(sport)) {
@@ -1310,7 +1310,7 @@ static void lpuart_dma_rx_free(struct uart_port *port)
struct lpuart_port, port);
struct dma_chan *chan = sport->dma_rx_chan;

- dmaengine_terminate_all(chan);
+ dmaengine_terminate_sync(chan);
dma_unmap_sg(chan->device->dev, &sport->rx_sgl, 1, DMA_FROM_DEVICE);
kfree(sport->rx_ring.buf);
sport->rx_ring.tail = 0;
@@ -1729,7 +1729,7 @@ static void lpuart_dma_shutdown(struct lpuart_port *sport)
if (wait_event_interruptible_timeout(sport->dma_wait,
!sport->dma_tx_in_progress, msecs_to_jiffies(300)) <= 0) {
sport->dma_tx_in_progress = false;
- dmaengine_terminate_all(sport->dma_tx_chan);
+ dmaengine_terminate_sync(sport->dma_tx_chan);
}
sport->lpuart_dma_tx_use = false;
}
@@ -2815,7 +2815,7 @@ static int __maybe_unused lpuart_suspend(struct device *dev)

if (sport->lpuart_dma_tx_use) {
sport->dma_tx_in_progress = false;
- dmaengine_terminate_all(sport->dma_tx_chan);
+ dmaengine_terminate_sync(sport->dma_tx_chan);
}

if (sport->port.suspended && !irq_wake)
--
2.17.1

2022-11-22 17:27:33

by Greg Kroah-Hartman

Subject: Re: [PATCH] tty: serial: fsl_lpuart: switch to new dmaengine_terminate_* API

On Thu, Nov 17, 2022 at 06:27:05PM +0800, Sherry Sun wrote:
> Convert dmaengine_terminate_all() calls to synchronous and asynchronous
> versions where appropriate.
>
> Signed-off-by: Sherry Sun <[email protected]>
> ---
> drivers/tty/serial/fsl_lpuart.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>

Fails to apply to my tree :(

Please rebase and resend.

thanks,

greg k-h

2022-11-23 02:16:13

by Sherry Sun

Subject: RE: [PATCH] tty: serial: fsl_lpuart: switch to new dmaengine_terminate_* API

> -----Original Message-----
> From: Greg KH <[email protected]>
> Sent: 2022??11??23?? 0:57
> To: Sherry Sun <[email protected]>
> Cc: [email protected]; [email protected]; linux-
> [email protected]; dl-linux-imx <[email protected]>
> Subject: Re: [PATCH] tty: serial: fsl_lpuart: switch to new
> dmaengine_terminate_* API
>
> On Thu, Nov 17, 2022 at 06:27:05PM +0800, Sherry Sun wrote:
> > Convert dmaengine_terminate_all() calls to synchronous and
> > asynchronous versions where appropriate.
> >
> > Signed-off-by: Sherry Sun <[email protected]>
> > ---
> > drivers/tty/serial/fsl_lpuart.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
>
> Fails to apply to my tree :(
>
> Please rebase and resend.

Hi Greg, sorry for the inconvenience, will fix it and resend. Thanks!

Best Regards
Sherry