Commit 9322af3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine updates from Vinod Koul:
 "New support:

    - Qualcomm SDM670, SM6115 and SM6375 GPI controller support

    - Ingenic JZ4755 dmaengine support

    - Removal of iop-adma driver

  Updates:

   - Tegra support for dma-channel-mask

   - at_hdmac cleanup and virt-chan support for this driver"

* tag 'dmaengine-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (46 commits)
  dmaengine: Revert "dmaengine: remove s3c24xx driver"
  dmaengine: tegra: Add support for dma-channel-mask
  dt-bindings: dmaengine: Add dma-channel-mask to Tegra GPCDMA
  dmaengine: idxd: Remove linux/msi.h include
  dt-bindings: dmaengine: qcom: gpi: add compatible for SM6375
  dmaengine: idxd: Fix crc_val field for completion record
  dmaengine: at_hdmac: Convert driver to use virt-dma
  dmaengine: at_hdmac: Remove unused member of at_dma_chan
  dmaengine: at_hdmac: Rename "chan_common" to "dma_chan"
  dmaengine: at_hdmac: Rename "dma_common" to "dma_device"
  dmaengine: at_hdmac: Use bitfield access macros
  dmaengine: at_hdmac: Keep register definitions and structures private to at_hdmac.c
  dmaengine: at_hdmac: Set include entries in alphabetic order
  dmaengine: at_hdmac: Use pm_ptr()
  dmaengine: at_hdmac: Use devm_clk_get()
  dmaengine: at_hdmac: Use devm_platform_ioremap_resource
  dmaengine: at_hdmac: Use devm_kzalloc() and struct_size()
  dmaengine: at_hdmac: Introduce atc_get_llis_residue()
  dmaengine: at_hdmac: s/atc_get_bytes_left/atc_get_residue
  dmaengine: at_hdmac: Pass residue by address to avoid unnecessary implicit casts
  ...
parents 1b6a349a 25483ded

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

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Date: Oct 25, 2019 
KernelVersion:  5.6.0

Contact:        dmaengine@vger.kernel.org

Description:    The largest number of work descriptors in a batch.

                It's not visible when the device does not support batch.



What:           /sys/bus/dsa/devices/dsa<m>/max_work_queues_size

Date:           Oct 25, 2019
@@ -49,6 +50,8 @@ Description: The total number of read buffers supported by this device. 
		The read buffers represent resources within the DSA

		implementation, and these resources are allocated by engines to

		support operations. See DSA spec v1.2 9.2.4 Total Read Buffers.

		It's not visible when the device does not support Read Buffer

		allocation control.



What:           /sys/bus/dsa/devices/dsa<m>/max_transfer_size

Date:           Oct 25, 2019
@@ -122,6 +125,8 @@ Contact: dmaengine@vger.kernel.org 
Description:    The maximum number of read buffers that may be in use at

		one time by operations that access low bandwidth memory in the

		device. See DSA spec v1.2 9.2.8 GENCFG on Global Read Buffer Limit.

		It's not visible when the device does not support Read Buffer

		allocation control.



What:		/sys/bus/dsa/devices/dsa<m>/cmd_status

Date:		Aug 28, 2020
@@ -205,6 +210,7 @@ KernelVersion: 5.10.0 
Contact:	dmaengine@vger.kernel.org

Description:	The max batch size for this workqueue. Cannot exceed device

		max batch size. Configurable parameter.

		It's not visible when the device does not support batch.



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

Date:		Nov 13, 2020
@@ -250,6 +256,8 @@ KernelVersion: 5.17.0 
Contact:	dmaengine@vger.kernel.org

Description:	Enable the use of global read buffer limit for the group. See DSA

		spec v1.2 9.2.18 GRPCFG Use Global Read Buffer Limit.

		It's not visible when the device does not support Read Buffer

		allocation control.



What:		/sys/bus/dsa/devices/group<m>.<n>/read_buffers_allowed

Date:		Dec 10, 2021
@@ -258,6 +266,8 @@ Contact: dmaengine@vger.kernel.org 
Description:	Indicates max number of read buffers that may be in use at one time

		by all engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read

		Buffers Allowed.

		It's not visible when the device does not support Read Buffer

		allocation control.



What:		/sys/bus/dsa/devices/group<m>.<n>/read_buffers_reserved

Date:		Dec 10, 2021
@@ -266,6 +276,8 @@ Contact: dmaengine@vger.kernel.org 
Description:	Indicates the number of Read Buffers reserved for the use of

		engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers

		Reserved.

		It's not visible when the device does not support Read Buffer

		allocation control.



What:		/sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit

Date:		Sept 14, 2022

Documentation/devicetree/bindings/dma/ingenic,dma.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - enum:

          - ingenic,jz4740-dma

          - ingenic,jz4725b-dma

          - ingenic,jz4755-dma

          - ingenic,jz4760-dma

          - ingenic,jz4760-bdma

          - ingenic,jz4760-mdma

Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml

+6 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ properties: 
      Should contain all of the per-channel DMA interrupts in

      ascending order with respect to the DMA channel index.

    minItems: 1

    maxItems: 31

    maxItems: 32



  resets:

    maxItems: 1
@@ -52,6 +52,9 @@ properties: 


  dma-coherent: true



  dma-channel-mask:

    maxItems: 1



required:

  - compatible

  - reg
@@ -60,6 +63,7 @@ required: 
  - reset-names

  - "#dma-cells"

  - iommus

  - dma-channel-mask



additionalProperties: false
@@ -108,5 +112,6 @@ examples: 
        #dma-cells = <1>;

        iommus = <&smmu TEGRA186_SID_GPCDMA_0>;

        dma-coherent;

        dma-channel-mask = <0xfffffffe>;

    };

...

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

+18 −8
Original line number Diff line number Diff line
@@ -18,14 +18,24 @@ allOf: 


properties:

  compatible:

    enum:

      - qcom,sc7280-gpi-dma

    oneOf:

      - enum:

          - qcom,sdm845-gpi-dma

          - qcom,sm6350-gpi-dma

      - qcom,sm8150-gpi-dma

      - qcom,sm8250-gpi-dma

      - items:

          - enum:

              - qcom,sc7280-gpi-dma

              - qcom,sm6115-gpi-dma

              - qcom,sm6375-gpi-dma

              - qcom,sm8350-gpi-dma

              - qcom,sm8450-gpi-dma

          - const: qcom,sm6350-gpi-dma

      - items:

          - enum:

              - qcom,sdm670-gpi-dma

              - qcom,sm8150-gpi-dma

              - qcom,sm8250-gpi-dma

          - const: qcom,sdm845-gpi-dma



  reg:

    maxItems: 1

Documentation/driver-api/driver-model/devres.rst

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ SERDEV 


SLAVE DMA ENGINE

  devm_acpi_dma_controller_register()

  devm_acpi_dma_controller_free()



SPI

  devm_spi_alloc_master()