github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-21 13:27:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dmaengine fixes for v6.0

Browse Source 
Driver fixes for:
  - 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmMrD/kACgkQfBQHDyUj
 g0enPg/+Lj5aJwH10bG+ygs7NVH2X/Eo3jWi9q2DtS9V/MTiirztZAriVJtmep4R
 0+yx7KkMw2v8HNogpbYqhlcoRO1U9mnyh45XfTCZek0kYw/8jK86Os2bygjPyTes
 0IU8xwf5VSNzuHavEg7AwyVdxpM7go+h3QRFVxBVs9m0Vkg4vlynlrYHrx+ukSje
 7PWYcNUiVU6j9x9yTBgAAq9oeFrDXjkP08hjzqjwcPkMVuUkplALmLTivxK+T1cw
 R6eQUveyzXwGzyqb0dSiWOnGIU9QT74Xm47FheRaW5pmvSF51IbckwQlConDf7Ll
 m75b26QhlOGQL3uNFepNGXRShZyUgtNpkb9n987YNe4+/lxDq7bpqPG5UkpOIRuB
 zVxXL6QMn/ZgQhFKhpKHTGD+eN7/9mXz37wMGLY78/S4rEpDet0tiwx8FLEOF5Tl
 GzsFDlze4MkXLORjLuU+MdeyLL3f+W9Tbs5gLUbodBJESbIS5fof3FV3uDlcMdA+
 LNTNdTGx5oFdeebMbvZQIzwXt0KPnBH5O0uKiGHmc9kegxTAJPfUrf2W+IJj5Xzr
 gVUoF4aTb9h5xjAcYAgQywiflI+BL5w/jTa/kouEV1GlsNV0vadJeJq6AIg14y4O
 +IOZvKSCdyVaLq1mZqWWtkymrmVnHJVUHbczmg1ePZV4QCosiQQ=
 =sATX
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-09-21 09:25:32 -07:00
commit 88e6546b36
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/ti/k3-udma-private.c
View File

@ -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");

21
drivers/dma/xilinx/xilinx_dma.c
View File

@ -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;
}

2
drivers/dma/xilinx/zynqmp_dma.c
View File

@ -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;
}