| Message ID | 52D96315.9090604@koalo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7f5ae3553685 |
| Delegated to: | Vinod Koul |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(+)