[PATCH 3/3] rcar-hpbdma: fixup channel busy check for double plane

[PATCH 3/3] rcar-hpbdma: fixup channel busy check for double plane

[Kuninori Morimoto]

The device busy check method is different between
single and double planes.
It will always return "busy" without this patch
if channel used as double plane.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/dma/sh/rcar-hpbdma.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
index 0518135..6fc37b4 100644
--- a/drivers/dma/sh/rcar-hpbdma.c
+++ b/drivers/dma/sh/rcar-hpbdma.c
@@ -388,7 +388,10 @@ static bool hpb_dmae_channel_busy(struct shdma_chan *schan)
 	struct hpb_dmae_chan *chan = to_chan(schan);
 	u32 dstsr = ch_reg_read(chan, HPB_DMAE_DSTSR);
 
-	return (dstsr & HPB_DMAE_DSTSR_DMSTS) = HPB_DMAE_DSTSR_DMSTS;
+	if (chan->xfer_mode = XFER_DOUBLE)
+		return dstsr & HPB_DMAE_DSTSR_DQSTS;
+	else
+		return dstsr & HPB_DMAE_DSTSR_DMSTS;
 }
 
 static int
-- 
1.7.9.5

Re: [PATCH 3/3] rcar-hpbdma: fixup channel busy check for double plane

[Sergei Shtylyov]

Hello.

On 17-10-2013 14:51, Kuninori Morimoto wrote:

> The device busy check method is different between
> single and double planes.
> It will always return "busy" without this patch
> if channel used as double plane.

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>   drivers/dma/sh/rcar-hpbdma.c |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)

> diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
> index 0518135..6fc37b4 100644
> --- a/drivers/dma/sh/rcar-hpbdma.c
> +++ b/drivers/dma/sh/rcar-hpbdma.c
> @@ -388,7 +388,10 @@ static bool hpb_dmae_channel_busy(struct shdma_chan *schan)
>   	struct hpb_dmae_chan *chan = to_chan(schan);
>   	u32 dstsr = ch_reg_read(chan, HPB_DMAE_DSTSR);
>
> -	return (dstsr & HPB_DMAE_DSTSR_DMSTS) = HPB_DMAE_DSTSR_DMSTS;
> +	if (chan->xfer_mode = XFER_DOUBLE)
> +		return dstsr & HPB_DMAE_DSTSR_DQSTS;

    This bit is not #define'd in the driver. Did you compile this?

WBR, Sergei

[PATCH 0/3] rcar-hpbdma: fixup patches for double plane

[Kuninori Morimoto]

Hi Simon, Max

These patches fixup R-Car HBPDMA driver
for double plane.

Max

Could you please review these patches ?
Especially last patch.
It checks DQSTS when double plane, but I'm not good at HPBDMA.

I tested these patches on my R-Car sound driver in local environment.
It doesn't work without these patches.

Kuninori Morimoto (3):
      rcar-hpbdma: add max transfer size
      rcar-hpbdma: initialise plane information when halted
      rcar-hpbdma: fixup channel busy check for double plane

 drivers/dma/sh/rcar-hpbdma.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Best regards
---
Kuninori Morimoto

[PATCH 0/3] rcar-hpbdma: fixup patches for double plane

[Kuninori Morimoto]

Hi Vinod
Cc: Simon, Max

These patches fixup R-Car HBPDMA driver
for double plane.

I tested these patches on my R-Car sound driver in local environment.
It doesn't work without these patches.

Kuninori Morimoto (3):
      rcar-hpbdma: add max transfer size
      rcar-hpbdma: initialise plane information when halted
      rcar-hpbdma: fixup channel busy check for double plane

 drivers/dma/sh/rcar-hpbdma.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Best regards
---
Kuninori Morimoto

[PATCH 3/3] rcar-hpbdma: fixup channel busy check for double plane

[Kuninori Morimoto]

The device busy check method is different between
single and double planes.
It will always return "busy" without this patch
if channel used as double plane.

Reviewed-by: Max Filippov <max.filippov@cogentembedded.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/dma/sh/rcar-hpbdma.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
index 19af32d..3083d90 100644
--- a/drivers/dma/sh/rcar-hpbdma.c
+++ b/drivers/dma/sh/rcar-hpbdma.c
@@ -60,6 +60,7 @@
 #define HPB_DMAE_DSTPR_DMSTP	BIT(0)
 
 /* DMA status register (DSTSR) bits */
+#define HPB_DMAE_DSTSR_DQSTS	BIT(2)
 #define HPB_DMAE_DSTSR_DMSTS	BIT(0)
 
 /* DMA common registers */
@@ -388,7 +389,10 @@ static bool hpb_dmae_channel_busy(struct shdma_chan *schan)
 	struct hpb_dmae_chan *chan = to_chan(schan);
 	u32 dstsr = ch_reg_read(chan, HPB_DMAE_DSTSR);
 
-	return (dstsr & HPB_DMAE_DSTSR_DMSTS) = HPB_DMAE_DSTSR_DMSTS;
+	if (chan->xfer_mode = XFER_DOUBLE)
+		return dstsr & HPB_DMAE_DSTSR_DQSTS;
+	else
+		return dstsr & HPB_DMAE_DSTSR_DMSTS;
 }
 
 static int
-- 
1.7.9.5