Commit 88e6546b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine fixes from Vinod Koul:
 "A couple of small driver fixes:

   - xilinx_dma: devm_platform_ioremap_resource error handling,
     dma_set_mask_and_coherent failure handling, dt property read
     cleanup

   - refcount leak fix for of_xudma_dev_get()

   - zynqmp_dma: coverity fix for enum typecast"

* tag 'dmaengine-fix-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
  dmaengine: zynqmp_dma: Typecast with enum to fix the coverity warning
  dmaengine: ti: k3-udma-private: Fix refcount leak bug in of_xudma_dev_get()
  dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure
  dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property
  dmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handling
parents 06f7db94 e0f1b21c

drivers/dma/ti/k3-udma-private.c

+3 −3
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ struct udma_dev *of_xudma_dev_get(struct device_node *np, const char *property) 
	}



	pdev = of_find_device_by_node(udma_node);

	if (np != udma_node)

		of_node_put(udma_node);



	if (!pdev) {

		pr_debug("UDMA device not found\n");

		return ERR_PTR(-EPROBE_DEFER);

	}



	if (np != udma_node)

		of_node_put(udma_node);



	ud = platform_get_drvdata(pdev);

	if (!ud) {

		pr_debug("UDMA has not been probed\n");

drivers/dma/xilinx/xilinx_dma.c

+13 −8
Original line number Diff line number Diff line
@@ -3040,9 +3040,10 @@ static int xilinx_dma_probe(struct platform_device *pdev) 


	/* Request and map I/O memory */

	xdev->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(xdev->regs))

		return PTR_ERR(xdev->regs);



	if (IS_ERR(xdev->regs)) {

		err = PTR_ERR(xdev->regs);

		goto disable_clks;

	}

	/* Retrieve the DMA engine properties from the device tree */

	xdev->max_buffer_len = GENMASK(XILINX_DMA_MAX_TRANS_LEN_MAX - 1, 0);

	xdev->s2mm_chan_id = xdev->dma_config->max_channels / 2;
@@ -3070,7 +3071,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) 
		if (err < 0) {

			dev_err(xdev->dev,

				"missing xlnx,num-fstores property\n");

			return err;

			goto disable_clks;

		}



		err = of_property_read_u32(node, "xlnx,flush-fsync",
@@ -3090,7 +3091,11 @@ static int xilinx_dma_probe(struct platform_device *pdev) 
		xdev->ext_addr = false;



	/* Set the dma mask bits */

	dma_set_mask_and_coherent(xdev->dev, DMA_BIT_MASK(addr_width));

	err = dma_set_mask_and_coherent(xdev->dev, DMA_BIT_MASK(addr_width));

	if (err < 0) {

		dev_err(xdev->dev, "DMA mask error %d\n", err);

		goto disable_clks;

	}



	/* Initialize the DMA engine */

	xdev->common.dev = &pdev->dev;
@@ -3137,7 +3142,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) 
	for_each_child_of_node(node, child) {

		err = xilinx_dma_child_probe(xdev, child);

		if (err < 0)

			goto disable_clks;

			goto error;

	}



	if (xdev->dma_config->dmatype == XDMA_TYPE_VDMA) {
@@ -3172,12 +3177,12 @@ static int xilinx_dma_probe(struct platform_device *pdev) 


	return 0;



disable_clks:

	xdma_disable_allclks(xdev);

error:

	for (i = 0; i < xdev->dma_config->max_channels; i++)

		if (xdev->chan[i])

			xilinx_dma_chan_remove(xdev->chan[i]);

disable_clks:

	xdma_disable_allclks(xdev);



	return err;

}

drivers/dma/xilinx/zynqmp_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static struct dma_async_tx_descriptor *zynqmp_dma_prep_memcpy( 


	zynqmp_dma_desc_config_eod(chan, desc);

	async_tx_ack(&first->async_tx);

	first->async_tx.flags = flags;

	first->async_tx.flags = (enum dma_ctrl_flags)flags;

	return &first->async_tx;

}