Skip to content

Commit ce615f5

Browse files
committed
Merge tag 'dmaengine-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine updates from Vinod Koul: "Core: - Support out of order dma completion - Support for repeating transaction New controllers: - Support for Actions S700 DMA engine - Renesas R8A774E1, r8a7742 controller binding - New driver for Xilinx DPDMA controller Other: - Support of out of order dma completion in idxd driver - W=1 warning cleanup of subsystem - Updates to ti-k3-dma, dw, idxd drivers" * tag 'dmaengine-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (68 commits) dmaengine: dw: Don't include unneeded header to platform data header dmaengine: Actions: Add support for S700 DMA engine dmaengine: Actions: get rid of bit fields from dma descriptor dt-bindings: dmaengine: convert Actions Semi Owl SoCs bindings to yaml dmaengine: idxd: add missing invalid flags field to completion dmaengine: dw: Initialize max_sg_burst capability dmaengine: dw: Introduce max burst length hw config dmaengine: dw: Initialize min and max burst DMA device capability dmaengine: dw: Set DMA device max segment size parameter dmaengine: dw: Take HC_LLP flag into account for noLLP auto-config dmaengine: Introduce DMA-device device_caps callback dmaengine: Introduce max SG burst capability dmaengine: Introduce min burst length capability dt-bindings: dma: dw: Add max burst transaction length property dt-bindings: dma: dw: Convert DW DMAC to DT binding dmaengine: ti: k3-udma: Query throughput level information from hardware dmaengine: ti: k3-udma: Use defines for capabilities register parsing dmaengine: xilinx: dpdma: Fix kerneldoc warning dmaengine: xilinx: dpdma: add missing kernel doc dmaengine: xilinx: dpdma: remove comparison of unsigned expression ...
2 parents 81e1133 + 00043a2 commit ce615f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1074
-813
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
What: sys/bus/dsa/devices/dsa<m>/version
1+
What: /sys/bus/dsa/devices/dsa<m>/version
22
Date: Apr 15, 2020
33
KernelVersion: 5.8.0
44
55
Description: The hardware version number.
66

7-
What: sys/bus/dsa/devices/dsa<m>/cdev_major
7+
What: /sys/bus/dsa/devices/dsa<m>/cdev_major
88
Date: Oct 25, 2019
9-
KernelVersion: 5.6.0
9+
KernelVersion: 5.6.0
1010
1111
Description: The major number that the character device driver assigned to
1212
this device.
1313

14-
What: sys/bus/dsa/devices/dsa<m>/errors
14+
What: /sys/bus/dsa/devices/dsa<m>/errors
1515
Date: Oct 25, 2019
1616
KernelVersion: 5.6.0
1717
1818
Description: The error information for this device.
1919

20-
What: sys/bus/dsa/devices/dsa<m>/max_batch_size
20+
What: /sys/bus/dsa/devices/dsa<m>/max_batch_size
2121
Date: Oct 25, 2019
2222
KernelVersion: 5.6.0
2323
2424
Description: The largest number of work descriptors in a batch.
2525

26-
What: sys/bus/dsa/devices/dsa<m>/max_work_queues_size
26+
What: /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
2727
Date: Oct 25, 2019
2828
KernelVersion: 5.6.0
2929
3030
Description: The maximum work queue size supported by this device.
3131

32-
What: sys/bus/dsa/devices/dsa<m>/max_engines
32+
What: /sys/bus/dsa/devices/dsa<m>/max_engines
3333
Date: Oct 25, 2019
3434
KernelVersion: 5.6.0
3535
3636
Description: The maximum number of engines supported by this device.
3737

38-
What: sys/bus/dsa/devices/dsa<m>/max_groups
38+
What: /sys/bus/dsa/devices/dsa<m>/max_groups
3939
Date: Oct 25, 2019
4040
KernelVersion: 5.6.0
4141
4242
Description: The maximum number of groups can be created under this device.
4343

44-
What: sys/bus/dsa/devices/dsa<m>/max_tokens
44+
What: /sys/bus/dsa/devices/dsa<m>/max_tokens
4545
Date: Oct 25, 2019
4646
KernelVersion: 5.6.0
4747
@@ -50,127 +50,127 @@ Description: The total number of bandwidth tokens supported by this device.
5050
implementation, and these resources are allocated by engines to
5151
support operations.
5252

53-
What: sys/bus/dsa/devices/dsa<m>/max_transfer_size
53+
What: /sys/bus/dsa/devices/dsa<m>/max_transfer_size
5454
Date: Oct 25, 2019
5555
KernelVersion: 5.6.0
5656
5757
Description: The number of bytes to be read from the source address to
5858
perform the operation. The maximum transfer size is dependent on
5959
the workqueue the descriptor was submitted to.
6060

61-
What: sys/bus/dsa/devices/dsa<m>/max_work_queues
61+
What: /sys/bus/dsa/devices/dsa<m>/max_work_queues
6262
Date: Oct 25, 2019
6363
KernelVersion: 5.6.0
6464
6565
Description: The maximum work queue number that this device supports.
6666

67-
What: sys/bus/dsa/devices/dsa<m>/numa_node
67+
What: /sys/bus/dsa/devices/dsa<m>/numa_node
6868
Date: Oct 25, 2019
6969
KernelVersion: 5.6.0
7070
7171
Description: The numa node number for this device.
7272

73-
What: sys/bus/dsa/devices/dsa<m>/op_cap
73+
What: /sys/bus/dsa/devices/dsa<m>/op_cap
7474
Date: Oct 25, 2019
7575
KernelVersion: 5.6.0
7676
7777
Description: The operation capability bit mask specify the operation types
7878
supported by the this device.
7979

80-
What: sys/bus/dsa/devices/dsa<m>/state
80+
What: /sys/bus/dsa/devices/dsa<m>/state
8181
Date: Oct 25, 2019
8282
KernelVersion: 5.6.0
8383
8484
Description: The state information of this device. It can be either enabled
8585
or disabled.
8686

87-
What: sys/bus/dsa/devices/dsa<m>/group<m>.<n>
87+
What: /sys/bus/dsa/devices/dsa<m>/group<m>.<n>
8888
Date: Oct 25, 2019
8989
KernelVersion: 5.6.0
9090
9191
Description: The assigned group under this device.
9292

93-
What: sys/bus/dsa/devices/dsa<m>/engine<m>.<n>
93+
What: /sys/bus/dsa/devices/dsa<m>/engine<m>.<n>
9494
Date: Oct 25, 2019
9595
KernelVersion: 5.6.0
9696
9797
Description: The assigned engine under this device.
9898

99-
What: sys/bus/dsa/devices/dsa<m>/wq<m>.<n>
99+
What: /sys/bus/dsa/devices/dsa<m>/wq<m>.<n>
100100
Date: Oct 25, 2019
101101
KernelVersion: 5.6.0
102102
103103
Description: The assigned work queue under this device.
104104

105-
What: sys/bus/dsa/devices/dsa<m>/configurable
105+
What: /sys/bus/dsa/devices/dsa<m>/configurable
106106
Date: Oct 25, 2019
107107
KernelVersion: 5.6.0
108108
109109
Description: To indicate if this device is configurable or not.
110110

111-
What: sys/bus/dsa/devices/dsa<m>/token_limit
111+
What: /sys/bus/dsa/devices/dsa<m>/token_limit
112112
Date: Oct 25, 2019
113113
KernelVersion: 5.6.0
114114
115115
Description: The maximum number of bandwidth tokens that may be in use at
116116
one time by operations that access low bandwidth memory in the
117117
device.
118118

119-
What: sys/bus/dsa/devices/wq<m>.<n>/group_id
119+
What: /sys/bus/dsa/devices/wq<m>.<n>/group_id
120120
Date: Oct 25, 2019
121121
KernelVersion: 5.6.0
122122
123123
Description: The group id that this work queue belongs to.
124124

125-
What: sys/bus/dsa/devices/wq<m>.<n>/size
125+
What: /sys/bus/dsa/devices/wq<m>.<n>/size
126126
Date: Oct 25, 2019
127127
KernelVersion: 5.6.0
128128
129129
Description: The work queue size for this work queue.
130130

131-
What: sys/bus/dsa/devices/wq<m>.<n>/type
131+
What: /sys/bus/dsa/devices/wq<m>.<n>/type
132132
Date: Oct 25, 2019
133133
KernelVersion: 5.6.0
134134
135135
Description: The type of this work queue, it can be "kernel" type for work
136136
queue usages in the kernel space or "user" type for work queue
137137
usages by applications in user space.
138138

139-
What: sys/bus/dsa/devices/wq<m>.<n>/cdev_minor
139+
What: /sys/bus/dsa/devices/wq<m>.<n>/cdev_minor
140140
Date: Oct 25, 2019
141141
KernelVersion: 5.6.0
142142
143143
Description: The minor number assigned to this work queue by the character
144144
device driver.
145145

146-
What: sys/bus/dsa/devices/wq<m>.<n>/mode
146+
What: /sys/bus/dsa/devices/wq<m>.<n>/mode
147147
Date: Oct 25, 2019
148148
KernelVersion: 5.6.0
149149
150150
Description: The work queue mode type for this work queue.
151151

152-
What: sys/bus/dsa/devices/wq<m>.<n>/priority
152+
What: /sys/bus/dsa/devices/wq<m>.<n>/priority
153153
Date: Oct 25, 2019
154154
KernelVersion: 5.6.0
155155
156156
Description: The priority value of this work queue, it is a vlue relative to
157157
other work queue in the same group to control quality of service
158158
for dispatching work from multiple workqueues in the same group.
159159

160-
What: sys/bus/dsa/devices/wq<m>.<n>/state
160+
What: /sys/bus/dsa/devices/wq<m>.<n>/state
161161
Date: Oct 25, 2019
162162
KernelVersion: 5.6.0
163163
164164
Description: The current state of the work queue.
165165

166-
What: sys/bus/dsa/devices/wq<m>.<n>/threshold
166+
What: /sys/bus/dsa/devices/wq<m>.<n>/threshold
167167
Date: Oct 25, 2019
168168
KernelVersion: 5.6.0
169169
170170
Description: The number of entries in this work queue that may be filled
171171
via a limited portal.
172172

173-
What: sys/bus/dsa/devices/engine<m>.<n>/group_id
173+
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
174174
Date: Oct 25, 2019
175175
KernelVersion: 5.6.0
176176

Documentation/devicetree/bindings/dma/arm-pl330.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Optional properties:
1616
- dma-channels: contains the total number of DMA channels supported by the DMAC
1717
- dma-requests: contains the total number of DMA requests supported by the DMAC
1818
- arm,pl330-broken-no-flushp: quirk for avoiding to execute DMAFLUSHP
19+
- arm,pl330-periph-burst: quirk for performing burst transfer only
1920
- resets: contains an entry for each entry in reset-names.
2021
See ../reset/reset.txt for details.
2122
- reset-names: must contain at least "dma", and optional is "dma-ocp".

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

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/owl-dma.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Actions Semi Owl SoCs DMA controller
8+
9+
description: |
10+
The OWL DMA is a general-purpose direct memory access controller capable of
11+
supporting 10 and 12 independent DMA channels for S700 and S900 SoCs
12+
respectively.
13+
14+
maintainers:
15+
- Manivannan Sadhasivam <[email protected]>
16+
17+
allOf:
18+
- $ref: "dma-controller.yaml#"
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- actions,s900-dma
24+
- actions,s700-dma
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
description:
31+
controller supports 4 interrupts, which are freely assignable to the
32+
DMA channels.
33+
maxItems: 4
34+
35+
"#dma-cells":
36+
const: 1
37+
38+
dma-channels:
39+
maximum: 12
40+
41+
dma-requests:
42+
maximum: 46
43+
44+
clocks:
45+
maxItems: 1
46+
description:
47+
Phandle and Specifier of the clock feeding the DMA controller.
48+
49+
power-domains:
50+
maxItems: 1
51+
52+
required:
53+
- compatible
54+
- reg
55+
- interrupts
56+
- "#dma-cells"
57+
- dma-channels
58+
- dma-requests
59+
- clocks
60+
61+
unevaluatedProperties: false
62+
63+
examples:
64+
- |
65+
#include <dt-bindings/interrupt-controller/arm-gic.h>
66+
dma: dma-controller@e0260000 {
67+
compatible = "actions,s900-dma";
68+
reg = <0xe0260000 0x1000>;
69+
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
70+
<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
71+
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
72+
<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
73+
#dma-cells = <1>;
74+
dma-channels = <12>;
75+
dma-requests = <46>;
76+
clocks = <&clock 22>;
77+
};
78+
79+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- renesas,dmac-r8a774a1 # RZ/G2M
2424
- renesas,dmac-r8a774b1 # RZ/G2N
2525
- renesas,dmac-r8a774c0 # RZ/G2E
26+
- renesas,dmac-r8a774e1 # RZ/G2H
2627
- renesas,dmac-r8a7790 # R-Car H2
2728
- renesas,dmac-r8a7791 # R-Car M2-W
2829
- renesas,dmac-r8a7792 # R-Car V2H

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19+
- renesas,r8a7742-usb-dmac # RZ/G1H
1920
- renesas,r8a7743-usb-dmac # RZ/G1M
2021
- renesas,r8a7744-usb-dmac # RZ/G1N
2122
- renesas,r8a7745-usb-dmac # RZ/G1E
2223
- renesas,r8a77470-usb-dmac # RZ/G1C
2324
- renesas,r8a774a1-usb-dmac # RZ/G2M
2425
- renesas,r8a774b1-usb-dmac # RZ/G2N
2526
- renesas,r8a774c0-usb-dmac # RZ/G2E
27+
- renesas,r8a774e1-usb-dmac # RZ/G2H
2628
- renesas,r8a7790-usb-dmac # R-Car H2
2729
- renesas,r8a7791-usb-dmac # R-Car M2-W
2830
- renesas,r8a7793-usb-dmac # R-Car M2-N

0 commit comments

Comments
 (0)