Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine updates from Vinod Koul:
 "This one features the usual updates to the drivers and one good part
  of removing DA_SG from core as it has no users.

  Summary:

   - Remove DMA_SG support as we have no users for this feature
   - New driver for Altera / Intel mSGDMA IP core
   - Support for memset in dmatest and qcom_hidma driver
   - Update for non cyclic mode in k3dma, bunch of update in bam_dma,
     bcm sba-raid
   - Constify device ids across drivers"

* tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (52 commits)
  dmaengine: sun6i: support V3s SoC variant
  dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk
  dmaengine: rcar-dmac: document R8A77970 bindings
  dmaengine: xilinx_dma: Fix error code format specifier
  dmaengine: altera: Use macros instead of structs to describe the registers
  dmaengine: ti-dma-crossbar: Fix dra7 reserve function
  dmaengine: pl330: constify amba_id
  dmaengine: pl08x: constify amba_id
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_COMPLETED
  dmaengine: bcm-sba-raid: Explicitly ACK mailbox message after sending
  dmaengine: bcm-sba-raid: Add debugfs support
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_RECEIVED
  dmaengine: bcm-sba-raid: Re-factor sba_process_deferred_requests()
  dmaengine: bcm-sba-raid: Pre-ack async tx descriptor
  dmaengine: bcm-sba-raid: Peek mbox when we have no free requests
  dmaengine: bcm-sba-raid: Alloc resources before registering DMA device
  dmaengine: bcm-sba-raid: Improve sba_issue_pending() run duration
  dmaengine: bcm-sba-raid: Increase number of free sba_request
  dmaengine: bcm-sba-raid: Allow arbitrary number free sba_request
  dmaengine: bcm-sba-raid: Remove reqs_free_count from sba_device
  ...
parents 75c72715 41bd0314

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap

Date:           December 3, 2009

KernelVersion:  2.6.32

Contact:        dmaengine@vger.kernel.org

Description:	Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,

		DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.



What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active

Date:           December 3, 2009

KernelVersion:  2.6.32

Contact:        dmaengine@vger.kernel.org

Description:	The number of descriptors active in the ring.



What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size

Date:           December 3, 2009

KernelVersion:  2.6.32

Contact:        dmaengine@vger.kernel.org

Description:	Descriptor ring size, total number of descriptors available.



What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version

Date:           December 3, 2009

KernelVersion:  2.6.32

Contact:        dmaengine@vger.kernel.org

Description:	Version of ioatdma device.



What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce

Date:           August 8, 2017

KernelVersion:  4.14

Contact:        dmaengine@vger.kernel.org

Description:	Tune-able interrupt delay value per channel basis.

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required Properties: 
		- "renesas,dmac-r8a7794" (R-Car E2)

		- "renesas,dmac-r8a7795" (R-Car H3)

		- "renesas,dmac-r8a7796" (R-Car M3-W)

		- "renesas,dmac-r8a77970" (R-Car V3M)



- reg: base address and length of the registers block for the DMAC

Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required Properties: 
	  - "renesas,r8a7793-usb-dmac" (R-Car M2-N)

	  - "renesas,r8a7794-usb-dmac" (R-Car E2)

	  - "renesas,r8a7795-usb-dmac" (R-Car H3)

	  - "renesas,r8a7796-usb-dmac" (R-Car M3-W)

- reg: base address and length of the registers block for the DMAC

- interrupts: interrupt specifiers for the DMAC, one for each entry in

  interrupt-names.

Documentation/devicetree/bindings/dma/sun6i-dma.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
		  "allwinner,sun8i-a23-dma"

		  "allwinner,sun8i-a83t-dma"

		  "allwinner,sun8i-h3-dma"

		  "allwinner,sun8i-v3s-dma"

- reg:		Should contain the registers base address and length

- interrupts:	Should contain a reference to the interrupt used by this device

- clocks:	Should contain a reference to the parent AHB clock

Documentation/dmaengine/provider.txt

+7 −7
Original line number Diff line number Diff line
@@ -181,13 +181,6 @@ Currently, the types available are: 
    - Used by the client drivers to register a callback that will be

      called on a regular basis through the DMA controller interrupt



  * DMA_SG

    - The device supports memory to memory scatter-gather

      transfers.

    - Even though a plain memcpy can look like a particular case of a

      scatter-gather transfer, with a single chunk to transfer, it's a

      distinct transaction type in the mem2mem transfers case



  * DMA_PRIVATE

    - The devices only supports slave transfers, and as such isn't

      available for async transfers.
@@ -395,6 +388,13 @@ where to put them) 
	  when DMA_CTRL_REUSE is already set

	- Terminating the channel



  * DMA_PREP_CMD

    - If set, the client driver tells DMA controller that passed data in DMA

      API is command data.

    - Interpretation of command data is DMA controller specific. It can be

      used for issuing commands to other peripherals/register reads/register

      writes for which the descriptor should be in different format from

      normal data descriptors.



General Design Notes

--------------------