Re: [RESEND PATCH 1/6] dma: rcar-dma: add wait after stopping dma engine

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 9/20/2015 10:10 PM, hamzahfrq.sub@gmail.com wrote:

> From: Muhammad Hamza Farooq <mfarooq@visteon.com>
>
> DMA engine does not stop instantaneously when transaction is going on
> (see datasheet). Wait has been added
>
> Signed-off-by: Muhammad Hamza Farooq <mfarooq@visteon.com>
> ---
>   drivers/dma/sh/rcar-dmac.c | 30 +++++++++++++++++++++++++++---
>   1 file changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
> index 7820d07..b5b5e89 100644
> --- a/drivers/dma/sh/rcar-dmac.c
> +++ b/drivers/dma/sh/rcar-dmac.c
> @@ -716,14 +716,38 @@ static int rcar_dmac_fill_hwdesc(struct rcar_dmac_chan *chan,
>   /* -----------------------------------------------------------------------------
>    * Stop and reset
>    */
> +#define NR_READS_TO_WAIT (5) /* number of times to check if DE = 0 */

    Parens not needed. (I'm seeing this patchset for the first time.)

> +static inline int rcar_dmac_wait_stop(struct rcar_dmac_chan *chan)
> +{
> +	unsigned int i = 0;
> +
> +	do {
> +		u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);
> +
> +		if (!(chcr & RCAR_DMACHCR_DE))
> +			return 0;
> +		cpu_relax();
> +		dev_dbg(chan->chan.device->dev, "DMA xfer couldn't be stopped");
> +	} while (++i < NR_READS_TO_WAIT);

    Hm, this can be a *for* loop, no?

[...]
> +/* Called with chan lock held */
> +static int rcar_dmac_chan_halt(struct rcar_dmac_chan *chan)
>   {
> -	u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);
> +	u32 chcr;
> +	int ret;
>
> +	chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);
>   	chcr &= ~(RCAR_DMACHCR_DSE | RCAR_DMACHCR_DSIE | RCAR_DMACHCR_IE |
> -		  RCAR_DMACHCR_TE | RCAR_DMACHCR_DE);
> +			RCAR_DMACHCR_TE | RCAR_DMACHCR_DE);

    Please don't change the existing indentation, it doesn't seem like you're 
changing anything else here.

[...]

MBR, Sergei