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

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

Pull dmaengine updates from Vinod Koul:

 - Big pile of __counted_by attribute annotations to several structures
   for bounds checking of flexible arrays at run-time

 - Another big pile platform remove callback returning void changes

 - Device tree device_get_match_data() usage and dropping
   of_match_device() calls

 - Minor driver updates to pxa, idxd fsl, hisi etc drivers

* tag 'dmaengine-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (106 commits)
  dmaengine: stm32-mdma: correct desc prep when channel running
  dmaengine: dw-axi-dmac: Add support DMAX_NUM_CHANNELS > 16
  dmaengine: xilinx: xilinx_dma: Fix kernel doc about xilinx_dma_remove()
  dmaengine: mmp_tdma: drop unused variable 'of_id'
  MAINTAINERS: Add entries for NXP(Freescale) eDMA drivers
  dmaengine: xilinx: xdma: Support cyclic transfers
  dmaengine: xilinx: xdma: Prepare the introduction of cyclic transfers
  dmaengine: Drop unnecessary of_match_device() calls
  dmaengine: Use device_get_match_data()
  dmaengine: pxa_dma: Annotate struct pxad_desc_sw with __counted_by
  dmaengine: pxa_dma: Remove an erroneous BUG_ON() in pxad_free_desc()
  dmaengine: xilinx: xdma: Use resource_size() in xdma_probe()
  dmaengine: fsl-dpaa2-qdma: Remove redundant initialization owner in dpaa2_qdma_driver
  dmaengine: Remove unused declaration dma_chan_cleanup()
  dmaengine: mmp: fix Wvoid-pointer-to-enum-cast warning
  dmaengine: qcom: fix Wvoid-pointer-to-enum-cast warning
  dmaengine: fsl-edma: Remove redundant dev_err() for platform_get_irq()
  dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
  dmaengine: idxd: add wq driver name support for accel-config user tool
  dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by
  ...
parents 2c40c1c6 03f25d53

Documentation/ABI/stable/sysfs-driver-dma-idxd

+6 −0
Original line number Diff line number Diff line
@@ -270,6 +270,12 @@ Description: Shows the operation capability bits displayed in bitmap format 
		correlates to the operations allowed. It's visible only

		on platforms that support the capability.



What:		/sys/bus/dsa/devices/wq<m>.<n>/driver_name

Date:		Sept 8, 2023

KernelVersion:	6.7.0

Contact:	dmaengine@vger.kernel.org

Description:	Name of driver to be bounded to the wq.



What:           /sys/bus/dsa/devices/engine<m>.<n>/group_id

Date:           Oct 25, 2019

KernelVersion:  5.6.0

Documentation/devicetree/bindings/dma/qcom,gpi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ properties: 
  dma-channel-mask:

    maxItems: 1



  dma-coherent: true



required:

  - compatible

  - reg

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -8338,6 +8338,14 @@ F: Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt 
F:	drivers/spi/spi-fsl-dspi.c

F:	include/linux/spi/spi-fsl-dspi.h









FREESCALE eDMA DRIVER









M:	Frank Li <Frank.Li@nxp.com>









L:	imx@lists.linux.dev









L:	dmaengine@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/dma/fsl,edma.yaml









F:	drivers/dma/fsl-edma*.*

















FREESCALE ENETC ETHERNET DRIVERS









M:	Claudiu Manoil <claudiu.manoil@nxp.com>









M:	Vladimir Oltean <vladimir.oltean@nxp.com>
































drivers/dma/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -362,7 +362,7 @@ config INTEL_IOATDMA

















config K3_DMA









	tristate "Hisilicon K3 DMA support"









	depends on ARCH_HI3xxx || ARCH_HISI || COMPILE_TEST









	depends on ARCH_HISI || COMPILE_TEST









	select DMA_ENGINE









	select DMA_VIRTUAL_CHANNELS









	help
































drivers/dma/altera-msgdma.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -923,7 +923,7 @@ static int msgdma_probe(struct platform_device *pdev)







 *









 * Return: Always '0'









 */









static int msgdma_remove(struct platform_device *pdev)









static void msgdma_remove(struct platform_device *pdev)









{









	struct msgdma_device *mdev = platform_get_drvdata(pdev);


















@@ -933,8 +933,6 @@ static int msgdma_remove(struct platform_device *pdev)







	msgdma_dev_remove(mdev);



















	dev_notice(&pdev->dev, "Altera mSGDMA driver removed\n");



















	return 0;









}



















#ifdef CONFIG_OF








@@ -952,7 +950,7 @@ static struct platform_driver msgdma_driver = {







		.of_match_table = of_match_ptr(msgdma_match),









	},









	.probe = msgdma_probe,









	.remove = msgdma_remove,









	.remove_new = msgdma_remove,









};



















module_platform_driver(msgdma_driver);