Commit 952c53cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-fix-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine 

Pull dmaengine fixes from Vinod Koul:
 "One core fix for DMA_INTERRUPT and rest driver fixes.

  Core:

   - Revert verification of DMA_INTERRUPT capability as that was
     incorrect

  Bunch of driver fixes for:

   - ti: refcount and put_device leak

   - qcom_bam: runtime pm overflow

   - idxd: force wq context cleanup and call idxd_enable_system_pasid()
     on success

   - dw-axi-dmac: RMW on channel suspend register

   - imx-sdma: restart cyclic channel when enabled

   - at_xdma: error handling for at_xdmac_alloc_desc

   - pl330: lockdep warning

   - lgm: error handling path in probe

   - allwinner: Fix min/max typo in binding"

* tag 'dmaengine-fix-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
  dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo
  dmaengine: lgm: Fix an error handling path in intel_ldma_probe()
  dmaengine: pl330: Fix lockdep warning about non-static key
  dmaengine: idxd: Only call idxd_enable_system_pasid() if succeeded in enabling SVA feature
  dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly
  dmaengine: imx-sdma: only restart cyclic channel when enabled
  dmaengine: dw-axi-dmac: Fix RMW on channel suspend register
  dmaengine: idxd: force wq context cleanup on device disable path
  dmaengine: qcom: bam_dma: fix runtime PM underflow
  dmaengine: imx-sdma: Allow imx8m for imx7 FW revs
  dmaengine: Revert "dmaengine: add verification of DMA_INTERRUPT capability for dmatest"
  dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
  dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate
parents 5867f3b8 607a48c7

Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ if: 
then:

  properties:

    clocks:

      maxItems: 2

      minItems: 2



  required:

    - clock-names

drivers/dma/at_xdmac.c

+5 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,11 @@ static int at_xdmac_alloc_chan_resources(struct dma_chan *chan) 
	for (i = 0; i < init_nr_desc_per_channel; i++) {

		desc = at_xdmac_alloc_desc(chan, GFP_KERNEL);

		if (!desc) {

			if (i == 0) {

				dev_warn(chan2dev(chan),

					 "can't allocate any descriptors\n");

				return -EIO;

			}

			dev_warn(chan2dev(chan),

				"only %d descriptors have been allocated\n", i);

			break;

drivers/dma/dmatest.c

+3 −10
Original line number Diff line number Diff line
@@ -675,16 +675,10 @@ static int dmatest_func(void *data) 
	/*

	 * src and dst buffers are freed by ourselves below

	 */

	if (params->polled) {

	if (params->polled)

		flags = DMA_CTRL_ACK;

	} else {

		if (dma_has_cap(DMA_INTERRUPT, dev->cap_mask)) {

	else

		flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;

		} else {

			pr_err("Channel does not support interrupt!\n");

			goto err_pq_array;

		}

	}



	ktime = ktime_get();

	while (!(kthread_should_stop() ||
@@ -912,7 +906,6 @@ static int dmatest_func(void *data) 
	runtime = ktime_to_us(ktime);



	ret = 0;

err_pq_array:

	kfree(dma_pq);

err_srcs_array:

	kfree(srcs);

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+5 −3
Original line number Diff line number Diff line
@@ -1164,7 +1164,8 @@ static int dma_chan_pause(struct dma_chan *dchan) 
			BIT(chan->id) << DMAC_CHAN_SUSP_WE_SHIFT;

		axi_dma_iowrite32(chan->chip, DMAC_CHEN, val);

	} else {

		val = BIT(chan->id) << DMAC_CHAN_SUSP2_SHIFT |

		val = axi_dma_ioread32(chan->chip, DMAC_CHSUSPREG);

		val |= BIT(chan->id) << DMAC_CHAN_SUSP2_SHIFT |

			BIT(chan->id) << DMAC_CHAN_SUSP2_WE_SHIFT;

		axi_dma_iowrite32(chan->chip, DMAC_CHSUSPREG, val);

	}
@@ -1190,12 +1191,13 @@ static inline void axi_chan_resume(struct axi_dma_chan *chan) 
{

	u32 val;



	val = axi_dma_ioread32(chan->chip, DMAC_CHEN);

	if (chan->chip->dw->hdata->reg_map_8_channels) {

		val = axi_dma_ioread32(chan->chip, DMAC_CHEN);

		val &= ~(BIT(chan->id) << DMAC_CHAN_SUSP_SHIFT);

		val |=  (BIT(chan->id) << DMAC_CHAN_SUSP_WE_SHIFT);

		axi_dma_iowrite32(chan->chip, DMAC_CHEN, val);

	} else {

		val = axi_dma_ioread32(chan->chip, DMAC_CHSUSPREG);

		val &= ~(BIT(chan->id) << DMAC_CHAN_SUSP2_SHIFT);

		val |=  (BIT(chan->id) << DMAC_CHAN_SUSP2_WE_SHIFT);

		axi_dma_iowrite32(chan->chip, DMAC_CHSUSPREG, val);

drivers/dma/idxd/device.c

+1 −4
Original line number Diff line number Diff line
@@ -716,10 +716,7 @@ static void idxd_device_wqs_clear_state(struct idxd_device *idxd) 
		struct idxd_wq *wq = idxd->wqs[i];



		mutex_lock(&wq->wq_lock);

		if (wq->state == IDXD_WQ_ENABLED) {

		idxd_wq_disable_cleanup(wq);

			wq->state = IDXD_WQ_DISABLED;

		}

		idxd_wq_device_reset_cleanup(wq);

		mutex_unlock(&wq->wq_lock);

	}