Skip to content

Commit e81dd54

Browse files
committed
Merge tag 'dmaengine-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine updates from Vinod Koul: "Core: - Add Frank Li as susbstem reviewer to help with reviews New Support: - Mediatek support for Dimensity 6300 and 9200 controller - Qualcomm Kaanapali and Glymur GPI DMA engine - Synopsis DW AXI Agilex5 - Renesas RZ/V2N SoC - Atmel microchip lan9691-dma - Tegra ADMA tegra264 Updates: - sg_nents_for_dma() helper use in subsystem - pm_runtime_mark_last_busy() redundant call update for subsystem - Residue support for xilinx AXIDMA driver - Intel Max SGL Size Support and capabilities for DSA3.0 - AXI dma larger than 32bits address support" * tag 'dmaengine-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (64 commits) dmaengine: add Frank Li as reviewer dt-bindings: dma: qcom,gpi: Update max interrupts lines to 16 dmaengine: fsl-edma: don't explicitly disable clocks in .remove() dmaengine: xilinx: xdma: use sg_nents_for_dma() helper dmaengine: sh: use sg_nents_for_dma() helper dmaengine: sa11x0: use sg_nents_for_dma() helper dmaengine: qcom: bam_dma: use sg_nents_for_dma() helper dmaengine: qcom: adm: use sg_nents_for_dma() helper dmaengine: pxa-dma: use sg_nents_for_dma() helper dmaengine: lgm: use sg_nents_for_dma() helper dmaengine: k3dma: use sg_nents_for_dma() helper dmaengine: dw-axi-dmac: use sg_nents_for_dma() helper dmaengine: bcm2835-dma: use sg_nents_for_dma() helper dmaengine: axi-dmac: use sg_nents_for_dma() helper dmaengine: altera-msgdma: use sg_nents_for_dma() helper scatterlist: introduce sg_nents_for_dma() helper dmaengine: idxd: Add Max SGL Size Support for DSA3.0 dmaengine: idxd: Expose DSA3.0 capabilities through sysfs dmaengine: sh: rz-dmac: Make channel irq local dmaengine: pl08x: Fix comment stating the difference between PL080 and PL081 ...
2 parents 9b725d5 + ab736ed commit e81dd54

49 files changed

Lines changed: 704 additions & 455 deletions

Some content is hidden

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

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,21 @@ Description: The last executed device administrative command's status/error.
136136
Also last configuration error overloaded.
137137
Writing to it will clear the status.
138138

139+
What: /sys/bus/dsa/devices/dsa<m>/dsacaps
140+
Date: April 5, 2026
141+
KernelVersion: 6.20.0
142+
Contact: dmaengine@vger.kernel.org
143+
Description: The DSA3 specification introduces three new capability
144+
registers: dsacap[0-2]. User components (e.g., configuration
145+
libraries and workload applications) require this information
146+
to properly utilize the DSA3 features.
147+
This includes SGL capability support, Enabling hardware-specific
148+
optimizations, Configuring memory, etc.
149+
The output format is '<dsacap2>,<dsacap1>,<dsacap0>' where each
150+
DSA cap value is a 64 bit hex value.
151+
This attribute should only be visible on DSA devices of version
152+
3 or later.
153+
139154
What: /sys/bus/dsa/devices/dsa<m>/iaa_cap
140155
Date: Sept 14, 2022
141156
KernelVersion: 6.0.0

Documentation/devicetree/bindings/dma/arm-pl08x.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/dma/arm-pl08x.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: ARM PrimeCells PL080 and PL081 and derivatives DMA controller
7+
title: ARM PrimeCell PL080 and PL081 and derivatives DMA controller
88

99
maintainers:
1010
- Vinod Koul <vkoul@kernel.org>

Documentation/devicetree/bindings/dma/atmel,sama5d4-dma.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ properties:
3333
- microchip,sam9x7-dma
3434
- const: atmel,sama5d4-dma
3535
- items:
36-
- const: microchip,sama7d65-dma
36+
- enum:
37+
- microchip,lan9691-dma
38+
- microchip,sama7d65-dma
3739
- const: microchip,sama7g5-dma
3840

3941
"#dma-cells":

Documentation/devicetree/bindings/dma/mediatek,uart-dma.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: MediaTek UART APDMA controller
88

99
maintainers:
10+
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
1011
- Long Cheng <long.cheng@mediatek.com>
1112

1213
description: |
@@ -23,11 +24,29 @@ properties:
2324
- enum:
2425
- mediatek,mt2712-uart-dma
2526
- mediatek,mt6795-uart-dma
27+
- mediatek,mt8173-uart-dma
28+
- mediatek,mt8183-uart-dma
2629
- mediatek,mt8365-uart-dma
2730
- mediatek,mt8516-uart-dma
2831
- const: mediatek,mt6577-uart-dma
32+
- items:
33+
- enum:
34+
- mediatek,mt7988-uart-dma
35+
- mediatek,mt8186-uart-dma
36+
- mediatek,mt8188-uart-dma
37+
- mediatek,mt8192-uart-dma
38+
- mediatek,mt8195-uart-dma
39+
- const: mediatek,mt6835-uart-dma
40+
- items:
41+
- enum:
42+
- mediatek,mt6991-uart-dma
43+
- mediatek,mt8196-uart-dma
44+
- const: mediatek,mt6985-uart-dma
2945
- enum:
3046
- mediatek,mt6577-uart-dma
47+
- mediatek,mt6795-uart-dma
48+
- mediatek,mt6835-uart-dma
49+
- mediatek,mt6985-uart-dma
3150

3251
reg:
3352
minItems: 1
@@ -58,6 +77,7 @@ properties:
5877

5978
mediatek,dma-33bits:
6079
type: boolean
80+
deprecated: true
6181
description: Enable 33-bits UART APDMA support
6282

6383
required:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ properties:
2424
- qcom,sm6350-gpi-dma
2525
- items:
2626
- enum:
27+
- qcom,glymur-gpi-dma
28+
- qcom,kaanapali-gpi-dma
2729
- qcom,milos-gpi-dma
2830
- qcom,qcm2290-gpi-dma
2931
- qcom,qcs8300-gpi-dma
@@ -58,7 +60,7 @@ properties:
5860
description:
5961
Interrupt lines for each GPI instance
6062
minItems: 1
61-
maxItems: 13
63+
maxItems: 16
6264

6365
"#dma-cells":
6466
const: 3

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- items:
2525
- enum:
2626
- renesas,r9a09g047-dmac # RZ/G3E
27+
- renesas,r9a09g056-dmac # RZ/V2N
2728
- const: renesas,r9a09g057-dmac
2829

2930
- const: renesas,r9a09g057-dmac # RZ/V2H(P)

Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ allOf:
1717

1818
properties:
1919
compatible:
20-
enum:
21-
- snps,axi-dma-1.01a
22-
- intel,kmb-axi-dma
23-
- starfive,jh7110-axi-dma
24-
- starfive,jh8100-axi-dma
20+
oneOf:
21+
- enum:
22+
- snps,axi-dma-1.01a
23+
- intel,kmb-axi-dma
24+
- starfive,jh7110-axi-dma
25+
- starfive,jh8100-axi-dma
26+
- items:
27+
- const: altr,agilex5-axi-dma
28+
- const: snps,axi-dma-1.01a
2529

2630
reg:
2731
minItems: 1

Documentation/driver-api/dmaengine/provider.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ supported.
411411
- This structure can be initialized using the function
412412
``dma_async_tx_descriptor_init``.
413413

414-
- You'll also need to set two fields in this structure:
414+
- You'll also need to set following fields in this structure:
415415

416416
- flags:
417417
TODO: Can it be modified by the driver itself, or
@@ -421,6 +421,9 @@ supported.
421421
that is supposed to push the current transaction descriptor to a
422422
pending queue, waiting for issue_pending to be called.
423423

424+
- phys: Physical address of the descriptor which is used later by
425+
the dma engine to read the descriptor and initiate transfer.
426+
424427
- In this structure the function pointer callback_result can be
425428
initialized in order for the submitter to be notified that a
426429
transaction has completed. In the earlier code the function pointer

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7542,6 +7542,7 @@ K: \bdma_(?:buf|fence|resv)\b
75427542

75437543
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
75447544
M: Vinod Koul <vkoul@kernel.org>
7545+
R: Frank Li <Frank.Li@kernel.org>
75457546
L: dmaengine@vger.kernel.org
75467547
S: Maintained
75477548
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/

drivers/dma/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ config STE_DMA40
590590

591591
config ST_FDMA
592592
tristate "ST FDMA dmaengine support"
593-
depends on ARCH_STI
593+
depends on ARCH_STI || COMPILE_TEST
594594
depends on REMOTEPROC
595595
select ST_SLIM_REMOTEPROC
596596
select DMA_ENGINE

0 commit comments

Comments
 (0)