linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dmaengine: Add DMA_PRIVATE to BCM2835 driver
@ 2014-01-17 17:06 Florian Meier
  2014-01-20  4:31 ` Vinod Koul
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Meier @ 2014-01-17 17:06 UTC (permalink / raw)
  To: Dan Williams, Vinod Koul
  Cc: linux-rpi-kernel, dmaengine, linux-kernel, Lars-Peter Clausen,
	Mark Brown

Without DMA_PRIVATE the driver is not able to allocate more than one channel.
Since it uses dma_get_any_slave_channel that calls private_candidate,
the second allocation fails at
/* some channels are already publicly allocated */
Maybe it should be fixed in the core, but at least this fixes the bug.

Signed-off-by: Florian Meier <florian.meier@koalo.de>
---
 drivers/dma/bcm2835-dma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 6ae0708..a036021 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -611,6 +611,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
 	od->base = base;
 
 	dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);
+	dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask);
 	dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask);
 	od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources;
 	od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;
-- 
1.8.3.2

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

* Re: [PATCH] dmaengine: Add DMA_PRIVATE to BCM2835 driver
  2014-01-17 17:06 [PATCH] dmaengine: Add DMA_PRIVATE to BCM2835 driver Florian Meier
@ 2014-01-20  4:31 ` Vinod Koul
  0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2014-01-20  4:31 UTC (permalink / raw)
  To: Florian Meier
  Cc: Dan Williams, linux-rpi-kernel, dmaengine, linux-kernel,
	Lars-Peter Clausen, Mark Brown

On Fri, Jan 17, 2014 at 06:06:29PM +0100, Florian Meier wrote:
> Without DMA_PRIVATE the driver is not able to allocate more than one channel.
> Since it uses dma_get_any_slave_channel that calls private_candidate,
> the second allocation fails at
> /* some channels are already publicly allocated */
> Maybe it should be fixed in the core, but at least this fixes the bug.
> 
> Signed-off-by: Florian Meier <florian.meier@koalo.de>
> ---
>  drivers/dma/bcm2835-dma.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
> index 6ae0708..a036021 100644
> --- a/drivers/dma/bcm2835-dma.c
> +++ b/drivers/dma/bcm2835-dma.c
> @@ -611,6 +611,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
>  	od->base = base;
>  
>  	dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);
> +	dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask);
>  	dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask);
>  	od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources;
>  	od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;

Applied, thanks

--
~Vinod

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

end of thread, other threads:[~2014-01-20  5:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-17 17:06 [PATCH] dmaengine: Add DMA_PRIVATE to BCM2835 driver Florian Meier
2014-01-20  4:31 ` Vinod Koul

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).