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

Commit 13bf2cf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull DMAengine updates from Vinod Koul:
 "This round brings couple of framework changes, a new driver and usual
  driver updates:

   - new managed helper for dmaengine framework registration

   - split dmaengine pause capability to pause and resume and allow
     drivers to report that individually

   - update dma_request_chan_by_mask() to handle deferred probing

   - move imx-sdma to use virt-dma

   - new driver for Actions Semi Owl family S900 controller

   - minor updates to intel, renesas, mv_xor, pl330 etc"

* tag 'dmaengine-4.19-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Add Actions Semi Owl family S900 DMA driver
  dt-bindings: dmaengine: Add binding for Actions Semi Owl SoCs
  dmaengine: sh: rcar-dmac: Should not stop the DMAC by rcar_dmac_sync_tcr()
  dmaengine: mic_x100_dma: use the new helper to simplify the code
  dmaengine: add a new helper dmaenginem_async_device_register
  dmaengine: imx-sdma: add memcpy interface
  dmaengine: imx-sdma: add SDMA_BD_MAX_CNT to replace '0xffff'
  dmaengine: dma_request_chan_by_mask() to handle deferred probing
  dmaengine: pl330: fix irq race with terminate_all
  dmaengine: Revert "dmaengine: mv_xor_v2: enable COMPILE_TEST"
  dmaengine: mv_xor_v2: use {lower,upper}_32_bits to configure HW descriptor address
  dmaengine: mv_xor_v2: enable COMPILE_TEST
  dmaengine: mv_xor_v2: move unmap to before callback
  dmaengine: mv_xor_v2: convert callback to helper function
  dmaengine: mv_xor_v2: kill the tasklets upon exit
  dmaengine: mv_xor_v2: explicitly freeup irq
  dmaengine: sh: rcar-dmac: Add dma_pause operation
  dmaengine: sh: rcar-dmac: add a new function to clear CHCR.DE with barrier
  dmaengine: idma64: Support dmaengine_terminate_sync()
  dmaengine: hsu: Support dmaengine_terminate_sync()
  ...
parents bbd60bff 3257d861

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
* Actions Semi Owl SoCs DMA controller



This binding follows the generic DMA bindings defined in dma.txt.



Required properties:

- compatible: Should be "actions,s900-dma".

- reg: Should contain DMA registers location and length.

- interrupts: Should contain 4 interrupts shared by all channel.

- #dma-cells: Must be <1>. Used to represent the number of integer

              cells in the dmas property of client device.

- dma-channels: Physical channels supported.

- dma-requests: Number of DMA request signals supported by the controller.

                Refer to Documentation/devicetree/bindings/dma/dma.txt

- clocks: Phandle and Specifier of the clock feeding the DMA controller.



Example:



Controller:

                dma: dma-controller@e0260000 {

                        compatible = "actions,s900-dma";

                        reg = <0x0 0xe0260000 0x0 0x1000>;

                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,

                                     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,

                                     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,

                                     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;

                        #dma-cells = <1>;

                        dma-channels = <12>;

                        dma-requests = <46>;

                        clocks = <&clock CLK_DMAC>;

                };



Client:



DMA clients connected to the Actions Semi Owl SoCs DMA controller must

use the format described in the dma.txt file, using a two-cell specifier

for each channel.



The two cells in order are:

1. A phandle pointing to the DMA controller.

2. The channel id.



uart5: serial@e012a000 {

        ...

        dma-names = "tx", "rx";

        dmas = <&dma 26>, <&dma 27>;

        ...

};

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Required Properties: 
		- "renesas,dmac-r8a77965" (R-Car M3-N)

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

		- "renesas,dmac-r8a77980" (R-Car V3H)

		- "renesas,dmac-r8a77990" (R-Car E3)

		- "renesas,dmac-r8a77995" (R-Car D3)



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

Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ Optional child node properties: 
Optional child node properties for VDMA:

- xlnx,genlock-mode: Tells Genlock synchronization is

	enabled/disabled in hardware.

- xlnx,enable-vert-flip: Tells vertical flip is

	enabled/disabled in hardware(S2MM path).

Optional child node properties for AXI DMA:

-dma-channels: Number of dma channels in child node.

Documentation/driver-model/devres.txt

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ CLOCK 
  devm_of_clk_add_hw_provider()



DMA

  dmaenginem_async_device_register()

  dmam_alloc_coherent()

  dmam_alloc_attrs()

  dmam_declare_coherent_memory()

crypto/async_tx/async_pq.c

+6 −4
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static struct page *pq_scribble_page; 
#define P(b, d) (b[d-2])

#define Q(b, d) (b[d-1])



#define MAX_DISKS 255



/**

 * do_async_gen_syndrome - asynchronously calculate P and/or Q

 */
@@ -184,7 +186,7 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, 
	struct dma_device *device = chan ? chan->device : NULL;

	struct dmaengine_unmap_data *unmap = NULL;



	BUG_ON(disks > 255 || !(P(blocks, disks) || Q(blocks, disks)));

	BUG_ON(disks > MAX_DISKS || !(P(blocks, disks) || Q(blocks, disks)));



	if (device)

		unmap = dmaengine_get_unmap_data(device->dev, disks, GFP_NOWAIT);
@@ -196,7 +198,7 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, 
	    is_dma_pq_aligned(device, offset, 0, len)) {

		struct dma_async_tx_descriptor *tx;

		enum dma_ctrl_flags dma_flags = 0;

		unsigned char coefs[src_cnt];

		unsigned char coefs[MAX_DISKS];

		int i, j;



		/* run the p+q asynchronously */
@@ -299,11 +301,11 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, 
	struct dma_chan *chan = pq_val_chan(submit, blocks, disks, len);

	struct dma_device *device = chan ? chan->device : NULL;

	struct dma_async_tx_descriptor *tx;

	unsigned char coefs[disks-2];

	unsigned char coefs[MAX_DISKS];

	enum dma_ctrl_flags dma_flags = submit->cb_fn ? DMA_PREP_INTERRUPT : 0;

	struct dmaengine_unmap_data *unmap = NULL;



	BUG_ON(disks < 4);

	BUG_ON(disks < 4 || disks > MAX_DISKS);



	if (device)

		unmap = dmaengine_get_unmap_data(device->dev, disks, GFP_NOWAIT);