Merge branch 'topic/virt-dma' into for-linus (b8e1a963) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/dma/amba-pl08x.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -2182,7 +2182,7 @@ static int pl08x_terminate_all(struct dma_chan *chan)
		}
		/* Dequeue jobs and free LLIs */
		if (plchan->at) {
		pl08x_desc_free(&plchan->at->vd);
		vchan_terminate_vdesc(&plchan->at->vd);
		plchan->at = NULL;
		}
		/* Dequeue jobs not yet fired as well */
		@@ -2193,6 +2193,13 @@ static int pl08x_terminate_all(struct dma_chan *chan)
		return 0;
		}

		static void pl08x_synchronize(struct dma_chan *chan)
		{
		struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);

		vchan_synchronize(&plchan->vc);
		}

		static int pl08x_pause(struct dma_chan *chan)
		{
		struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
		@@ -2773,6 +2780,7 @@ static int pl08x_probe(struct amba_device adev, const struct amba_id id)
		pl08x->memcpy.device_pause = pl08x_pause;
		pl08x->memcpy.device_resume = pl08x_resume;
		pl08x->memcpy.device_terminate_all = pl08x_terminate_all;
		pl08x->memcpy.device_synchronize = pl08x_synchronize;
		pl08x->memcpy.src_addr_widths = PL80X_DMA_BUSWIDTHS;
		pl08x->memcpy.dst_addr_widths = PL80X_DMA_BUSWIDTHS;
		pl08x->memcpy.directions = BIT(DMA_MEM_TO_MEM);
		@@ -2802,6 +2810,7 @@ static int pl08x_probe(struct amba_device adev, const struct amba_id id)
		pl08x->slave.device_pause = pl08x_pause;
		pl08x->slave.device_resume = pl08x_resume;
		pl08x->slave.device_terminate_all = pl08x_terminate_all;
		pl08x->slave.device_synchronize = pl08x_synchronize;
		pl08x->slave.src_addr_widths = PL80X_DMA_BUSWIDTHS;
		pl08x->slave.dst_addr_widths = PL80X_DMA_BUSWIDTHS;
		pl08x->slave.directions =

+9 −1

Original line number	Diff line number	Diff line
		@@ -812,7 +812,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);
		vchan_terminate_vdesc(&c->desc->vd);
		c->desc = NULL;
		bcm2835_dma_abort(c->chan_base);

		@@ -836,6 +836,13 @@ static int bcm2835_dma_terminate_all(struct dma_chan *chan)
		return 0;
		}

		static void bcm2835_dma_synchronize(struct dma_chan *chan)
		{
		struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);

		vchan_synchronize(&c->vc);
		}

		static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id,
		int irq, unsigned int irq_flags)
		{
		@@ -942,6 +949,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
		od->ddev.device_prep_dma_memcpy = bcm2835_dma_prep_dma_memcpy;
		od->ddev.device_config = bcm2835_dma_slave_config;
		od->ddev.device_terminate_all = bcm2835_dma_terminate_all;
		od->ddev.device_synchronize = bcm2835_dma_synchronize;
		od->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
		od->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
		od->ddev.directions = BIT(DMA_DEV_TO_MEM) \| BIT(DMA_MEM_TO_DEV) \|

+9 −1

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ static int jz4780_dma_terminate_all(struct dma_chan *chan)
		/* Clear the DMA status and stop the transfer. */
		jz4780_dma_writel(jzdma, JZ_DMA_REG_DCS(jzchan->id), 0);
		if (jzchan->desc) {
		jz4780_dma_desc_free(&jzchan->desc->vdesc);
		vchan_terminate_vdesc(&jzchan->desc->vdesc);
		jzchan->desc = NULL;
		}

		@@ -523,6 +523,13 @@ static int jz4780_dma_terminate_all(struct dma_chan *chan)
		return 0;
		}

		static void jz4780_dma_synchronize(struct dma_chan *chan)
		{
		struct jz4780_dma_chan *jzchan = to_jz4780_dma_chan(chan);

		vchan_synchronize(&jzchan->vchan);
		}

		static int jz4780_dma_config(struct dma_chan *chan,
		struct dma_slave_config *config)
		{
		@@ -813,6 +820,7 @@ static int jz4780_dma_probe(struct platform_device *pdev)
		dd->device_prep_dma_memcpy = jz4780_dma_prep_dma_memcpy;
		dd->device_config = jz4780_dma_config;
		dd->device_terminate_all = jz4780_dma_terminate_all;
		dd->device_synchronize = jz4780_dma_synchronize;
		dd->device_tx_status = jz4780_dma_tx_status;
		dd->device_issue_pending = jz4780_dma_issue_pending;
		dd->src_addr_widths = JZ_DMA_BUSWIDTHS;

+2 −5

Original line number	Diff line number	Diff line
		@@ -860,11 +860,8 @@ static int edma_terminate_all(struct dma_chan *chan)
		/* Move the cyclic channel back to default queue */
		if (!echan->tc && echan->edesc->cyclic)
		edma_assign_channel_eventq(echan, EVENTQ_DEFAULT);
		/*
		* free the running request descriptor
		* since it is not in any of the vdesc lists
		*/
		edma_desc_free(&echan->edesc->vdesc);

		vchan_terminate_vdesc(&echan->edesc->vdesc);
		echan->edesc = NULL;
		}

+12 −5

Original line number	Diff line number	Diff line
		@@ -694,7 +694,6 @@ static unsigned int mdc_get_new_events(struct mdc_chan *mchan)
		static int mdc_terminate_all(struct dma_chan *chan)
		{
		struct mdc_chan *mchan = to_mdc_chan(chan);
		struct mdc_tx_desc *mdesc;
		unsigned long flags;
		LIST_HEAD(head);

		@@ -703,21 +702,28 @@ static int mdc_terminate_all(struct dma_chan *chan)
		mdc_chan_writel(mchan, MDC_CONTROL_AND_STATUS_CANCEL,
		MDC_CONTROL_AND_STATUS);

		mdesc = mchan->desc;
		if (mchan->desc) {
		vchan_terminate_vdesc(&mchan->desc->vd);
		mchan->desc = NULL;
		}
		vchan_get_all_descriptors(&mchan->vc, &head);

		mdc_get_new_events(mchan);

		spin_unlock_irqrestore(&mchan->vc.lock, flags);

		if (mdesc)
		mdc_desc_free(&mdesc->vd);
		vchan_dma_desc_free_list(&mchan->vc, &head);

		return 0;
		}

		static void mdc_synchronize(struct dma_chan *chan)
		{
		struct mdc_chan *mchan = to_mdc_chan(chan);

		vchan_synchronize(&mchan->vc);
		}

		static int mdc_slave_config(struct dma_chan *chan,
		struct dma_slave_config *config)
		{
		@@ -952,6 +958,7 @@ static int mdc_dma_probe(struct platform_device *pdev)
		mdma->dma_dev.device_tx_status = mdc_tx_status;
		mdma->dma_dev.device_issue_pending = mdc_issue_pending;
		mdma->dma_dev.device_terminate_all = mdc_terminate_all;
		mdma->dma_dev.device_synchronize = mdc_synchronize;
		mdma->dma_dev.device_config = mdc_slave_config;

		mdma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) \| BIT(DMA_MEM_TO_DEV);