Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a481279 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine fixes from Vinod Koul:
 "This time we have addition of caps for jz4740 which fixes intentional
  warning at boot.  Then we have memory leak issues in drivers using
  virt-dma by Peter on few drive"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: moxart-dma: Fix memory leak when stopping a running transfer
  dmaengine: bcm2835-dma: Fix memory leak when stopping a running transfer
  dmaengine: omap-dma: Fix memory leak when terminating running transfer
  dmaengine: edma: fix memory leak when terminating running transfers
  dmaengine: jz4740: Define capabilities
parents 8172ba51 fbef403a

drivers/dma/bcm2835-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static int bcm2835_dma_terminate_all(struct dma_chan *chan) 
	 * c->desc is NULL and exit.)

	 */

	if (c->desc) {

		bcm2835_dma_desc_free(&c->desc->vd);

		c->desc = NULL;

		bcm2835_dma_abort(c->chan_base);

drivers/dma/dma-jz4740.c

+7 −0
Original line number Diff line number Diff line
@@ -511,6 +511,9 @@ static void jz4740_dma_desc_free(struct virt_dma_desc *vdesc) 
	kfree(container_of(vdesc, struct jz4740_dma_desc, vdesc));

}



#define JZ4740_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \

	BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))



static int jz4740_dma_probe(struct platform_device *pdev)

{

	struct jz4740_dmaengine_chan *chan;
@@ -548,6 +551,10 @@ static int jz4740_dma_probe(struct platform_device *pdev) 
	dd->device_prep_dma_cyclic = jz4740_dma_prep_dma_cyclic;

	dd->device_config = jz4740_dma_slave_config;

	dd->device_terminate_all = jz4740_dma_terminate_all;

	dd->src_addr_widths = JZ4740_DMA_BUSWIDTHS;

	dd->dst_addr_widths = JZ4740_DMA_BUSWIDTHS;

	dd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	dd->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	dd->dev = &pdev->dev;

	INIT_LIST_HEAD(&dd->channels);

drivers/dma/edma.c

+7 −0
Original line number Diff line number Diff line
@@ -260,6 +260,13 @@ static int edma_terminate_all(struct dma_chan *chan) 
	 */

	if (echan->edesc) {

		int cyclic = echan->edesc->cyclic;



		/*

		 * free the running request descriptor

		 * since it is not in any of the vdesc lists

		 */

		edma_desc_free(&echan->edesc->vdesc);



		echan->edesc = NULL;

		edma_stop(echan->ch_num);

		/* Move the cyclic channel back to default queue */

drivers/dma/moxart-dma.c

+3 −1
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ static int moxart_terminate_all(struct dma_chan *chan) 


	spin_lock_irqsave(&ch->vc.lock, flags);



	if (ch->desc)

	if (ch->desc) {

		moxart_dma_desc_free(&ch->desc->vd);

		ch->desc = NULL;

	}



	ctrl = readl(ch->base + REG_OFF_CTRL);

	ctrl &= ~(APB_DMA_ENABLE | APB_DMA_FIN_INT_EN | APB_DMA_ERR_INT_EN);

drivers/dma/omap-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ static int omap_dma_terminate_all(struct dma_chan *chan) 
	 * c->desc is NULL and exit.)

	 */

	if (c->desc) {

		omap_dma_desc_free(&c->desc->vd);

		c->desc = NULL;

		/* Avoid stopping the dma twice */

		if (!c->paused)