linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] dma: sdma: setup dma mask
@ 2013-10-01 10:31 Philippe Rétornaz
  2013-10-01 10:31 ` [PATCH 1/1] dma: imx-sdma: " Philippe Rétornaz
  0 siblings, 1 reply; 6+ messages in thread
From: Philippe Rétornaz @ 2013-10-01 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

Hello

The imx-sdma dma engine is not setuping it's dma mask.
This leads to a non-working audio setup since imx-ssi is using the
generic soc-dmaengine-pcm which allocate the dma buffer differently
than the previous code.

This patch is based on Russell King's following patches:
 - DMA-API: provide a helper to set both DMA and coherent DMA masks
 - DMA-API: provide a helper to setup DMA masks

Philippe R?tornaz (1):
  dma: imx-sdma: setup dma mask

 drivers/dma/imx-sdma.c |    4 ++++
 1 file changed, 4 insertions(+)

-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/1] dma: imx-sdma: setup dma mask
  2013-10-01 10:31 [PATCH 0/1] dma: sdma: setup dma mask Philippe Rétornaz
@ 2013-10-01 10:31 ` Philippe Rétornaz
  2013-10-02  8:33   ` Sascha Hauer
  2013-10-13 16:18   ` Vinod Koul
  0 siblings, 2 replies; 6+ messages in thread
From: Philippe Rétornaz @ 2013-10-01 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

The dma mask is not configured in the current code.
This was triggered by soc-dmaengine-pcm which allocate the dma
buffers with the imx-sdma as device.
This commit fix audio on imx31.

Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>
---
 drivers/dma/imx-sdma.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fc43603..c1fd504 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1432,6 +1432,10 @@ static int __init sdma_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+	if (ret)
+		return ret;
+
 	sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
 	if (!sdma)
 		return -ENOMEM;
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 1/1] dma: imx-sdma: setup dma mask
  2013-10-01 10:31 ` [PATCH 1/1] dma: imx-sdma: " Philippe Rétornaz
@ 2013-10-02  8:33   ` Sascha Hauer
  2013-10-13 16:18   ` Vinod Koul
  1 sibling, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2013-10-02  8:33 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 12:31:04PM +0200, Philippe R?tornaz wrote:
> The dma mask is not configured in the current code.
> This was triggered by soc-dmaengine-pcm which allocate the dma
> buffers with the imx-sdma as device.
> This commit fix audio on imx31.
> 
> Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

> ---
>  drivers/dma/imx-sdma.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index fc43603..c1fd504 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1432,6 +1432,10 @@ static int __init sdma_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> +	ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> +	if (ret)
> +		return ret;
> +
>  	sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
>  	if (!sdma)
>  		return -ENOMEM;
> -- 
> 1.7.9.5
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/1] dma: imx-sdma: setup dma mask
  2013-10-01 10:31 ` [PATCH 1/1] dma: imx-sdma: " Philippe Rétornaz
  2013-10-02  8:33   ` Sascha Hauer
@ 2013-10-13 16:18   ` Vinod Koul
  2013-10-13 23:48     ` Russell King - ARM Linux
  1 sibling, 1 reply; 6+ messages in thread
From: Vinod Koul @ 2013-10-13 16:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 12:31:04PM +0200, Philippe R?tornaz wrote:
> The dma mask is not configured in the current code.
> This was triggered by soc-dmaengine-pcm which allocate the dma
> buffers with the imx-sdma as device.
> This commit fix audio on imx31.
> 
> Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>
This needs to go thru Russell's tree, that has the below API

Acked-by Vinod Koul <vinod.koul@intel.com>

~Vinod

> ---
>  drivers/dma/imx-sdma.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index fc43603..c1fd504 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1432,6 +1432,10 @@ static int __init sdma_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> +	ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> +	if (ret)
> +		return ret;
> +
>  	sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
>  	if (!sdma)
>  		return -ENOMEM;
> -- 
> 1.7.9.5
> 

-- 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/1] dma: imx-sdma: setup dma mask
  2013-10-13 16:18   ` Vinod Koul
@ 2013-10-13 23:48     ` Russell King - ARM Linux
  2013-10-14  8:47       ` Philippe Rétornaz
  0 siblings, 1 reply; 6+ messages in thread
From: Russell King - ARM Linux @ 2013-10-13 23:48 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, Oct 13, 2013 at 09:48:01PM +0530, Vinod Koul wrote:
> On Tue, Oct 01, 2013 at 12:31:04PM +0200, Philippe R?tornaz wrote:
> > The dma mask is not configured in the current code.
> > This was triggered by soc-dmaengine-pcm which allocate the dma
> > buffers with the imx-sdma as device.
> > This commit fix audio on imx31.
> > 
> > Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>
> This needs to go thru Russell's tree, that has the below API
> 
> Acked-by Vinod Koul <vinod.koul@intel.com>

Indeed.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/1] dma: imx-sdma: setup dma mask
  2013-10-13 23:48     ` Russell King - ARM Linux
@ 2013-10-14  8:47       ` Philippe Rétornaz
  0 siblings, 0 replies; 6+ messages in thread
From: Philippe Rétornaz @ 2013-10-14  8:47 UTC (permalink / raw)
  To: linux-arm-kernel

Le 14/10/2013 01:48, Russell King - ARM Linux a ?crit :
> On Sun, Oct 13, 2013 at 09:48:01PM +0530, Vinod Koul wrote:
>> On Tue, Oct 01, 2013 at 12:31:04PM +0200, Philippe R?tornaz wrote:
>>> The dma mask is not configured in the current code.
>>> This was triggered by soc-dmaengine-pcm which allocate the dma
>>> buffers with the imx-sdma as device.
>>> This commit fix audio on imx31.
>>>
>>> Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>
>> This needs to go thru Russell's tree, that has the below API
>>
>> Acked-by Vinod Koul <vinod.koul@intel.com>
>
> Indeed.

It's in the patch system with id 7857/1
I hope I got it right.... First time I'm using your patch system.

Thanks,

Philippe

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-10-14  8:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 10:31 [PATCH 0/1] dma: sdma: setup dma mask Philippe Rétornaz
2013-10-01 10:31 ` [PATCH 1/1] dma: imx-sdma: " Philippe Rétornaz
2013-10-02  8:33   ` Sascha Hauer
2013-10-13 16:18   ` Vinod Koul
2013-10-13 23:48     ` Russell King - ARM Linux
2013-10-14  8:47       ` Philippe Rétornaz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).