Commit f408126b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine fixes from Vinod Koul:
 "A bunch of dmaengine driver fixes for:

   - coverity discovered issues for xilinx driver

   - qcom, gpi driver fix for undefined bhaviour and one off cleanup

   - update Peter's email for TI DMA drivers

   - one-off for idxd driver

   - resource leak fix for mediatek and milbeaut drivers"

* tag 'dmaengine-fix-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
  dmaengine: stm32-mdma: fix STM32_MDMA_VERY_HIGH_PRIORITY value
  dmaengine: xilinx_dma: fix mixed_enum_type coverity warning
  dmaengine: xilinx_dma: fix incompatible param warning in _child_probe()
  dmaengine: xilinx_dma: check dma_async_device_register return value
  dmaengine: qcom: fix gpi undefined behavior
  dt-bindings: dma: ti: Update maintainer and author information
  MAINTAINERS: Add entry for Texas Instruments DMA drivers
  qcom: bam_dma: Delete useless kfree code
  dmaengine: dw-edma: Fix use after free in dw_edma_alloc_chunk()
  dmaengine: milbeaut-xdmac: Fix a resource leak in the error handling path of the probe function
  dmaengine: mediatek: mtk-hsdma: Fix a resource leak in the error handling path of the probe function
  dmaengine: qcom: gpi: Fixes a format mismatch
  dmaengine: idxd: off by one in cleanup code
  dmaengine: ti: k3-udma: Fix pktdma rchan TPL level setup
parents caab3147 e1263f92

Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml

+3 −1
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2020 Texas Instruments Incorporated

# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

%YAML 1.2

%YAML 1.2

---

---

$id: http://devicetree.org/schemas/dma/ti/k3-bcdma.yaml#

$id: http://devicetree.org/schemas/dma/ti/k3-bcdma.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Texas Instruments K3 DMSS BCDMA Device Tree Bindings

title: Texas Instruments K3 DMSS BCDMA Device Tree Bindings





maintainers:

maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>

  - Peter Ujfalusi <peter.ujfalusi@gmail.com>





description: |

description: |

  The Block Copy DMA (BCDMA) is intended to perform similar functions as the TR

  The Block Copy DMA (BCDMA) is intended to perform similar functions as the TR

Documentation/devicetree/bindings/dma/ti/k3-pktdma.yaml

+3 −1
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2020 Texas Instruments Incorporated

# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

%YAML 1.2

%YAML 1.2

---

---

$id: http://devicetree.org/schemas/dma/ti/k3-pktdma.yaml#

$id: http://devicetree.org/schemas/dma/ti/k3-pktdma.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Texas Instruments K3 DMSS PKTDMA Device Tree Bindings

title: Texas Instruments K3 DMSS PKTDMA Device Tree Bindings





maintainers:

maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>

  - Peter Ujfalusi <peter.ujfalusi@gmail.com>





description: |

description: |

  The Packet DMA (PKTDMA) is intended to perform similar functions as the packet

  The Packet DMA (PKTDMA) is intended to perform similar functions as the packet

Documentation/devicetree/bindings/dma/ti/k3-udma.yaml

+3 −1
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2019 Texas Instruments Incorporated

# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

%YAML 1.2

%YAML 1.2

---

---

$id: http://devicetree.org/schemas/dma/ti/k3-udma.yaml#

$id: http://devicetree.org/schemas/dma/ti/k3-udma.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Texas Instruments K3 NAVSS Unified DMA Device Tree Bindings

title: Texas Instruments K3 NAVSS Unified DMA Device Tree Bindings





maintainers:

maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>

  - Peter Ujfalusi <peter.ujfalusi@gmail.com>





description: |

description: |

  The UDMA-P is intended to perform similar (but significantly upgraded)

  The UDMA-P is intended to perform similar (but significantly upgraded)

MAINTAINERS

+13 −0
Original line number Original line Diff line number Diff line
@@ -17552,6 +17552,19 @@ S: Supported 
F:	Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt

F:	Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt

F:	drivers/iio/dac/ti-dac7612.c

F:	drivers/iio/dac/ti-dac7612.c













TEXAS INSTRUMENTS DMA DRIVERS










M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>










L:	dmaengine@vger.kernel.org










S:	Maintained










F:	Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt










F:	Documentation/devicetree/bindings/dma/ti-edma.txt










F:	Documentation/devicetree/bindings/dma/ti/










F:	drivers/dma/ti/










X:	drivers/dma/ti/cppi41.c










F:	include/linux/dma/k3-udma-glue.h










F:	include/linux/dma/ti-cppi5.h










F:	include/linux/dma/k3-psil.h

















TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER




TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER








M:	Nishanth Menon <nm@ti.com>




M:	Nishanth Menon <nm@ti.com>








M:	Tero Kristo <t-kristo@ti.com>




M:	Tero Kristo <t-kristo@ti.com>
































drivers/dma/dw-edma/dw-edma-core.c



+2
−2






























Original line number
Original line
Diff line number
Diff line







@@ -86,12 +86,12 @@ static struct dw_edma_chunk *dw_edma_alloc_chunk(struct dw_edma_desc *desc)




















	if (desc->chunk) {




	if (desc->chunk) {








		/* Create and add new element into the linked list */




		/* Create and add new element into the linked list */








		desc->chunks_alloc++;










		list_add_tail(&chunk->list, &desc->chunk->list);










		if (!dw_edma_alloc_burst(chunk)) {




		if (!dw_edma_alloc_burst(chunk)) {








			kfree(chunk);




			kfree(chunk);








			return NULL;




			return NULL;








		}




		}










		desc->chunks_alloc++;










		list_add_tail(&chunk->list, &desc->chunk->list);








	} else {




	} else {








		/* List head */




		/* List head */








		chunk->burst = NULL;




		chunk->burst = NULL;