dmaengine: dw-axi-dmac: support Intel KeemBay AxiDMA
Subsystems (3)
v6 cover dmaengine: dw-axi-dmac: support Intel KeemBay AxiDMA
The below patch series are to support AxiDMA running on Intel KeemBay SoC. The base driver is dw-axi-dmac. This driver only support DMA memory copy transfers. Code refactoring is needed so that additional features can be supported.
The features added in this patch series are:
- Replacing Linked List with virtual descriptor management.
- Remove unrelated hw desc stuff from dma memory pool.
- Manage dma memory pool alloc/destroy based on channel activity.
- Support dmaengine device_sync() callback.
- Support dmaengine device_config().
- Support dmaengine device_prep_slave_sg().
- Support dmaengine device_prep_dma_cyclic().
- Support of_dma_controller_register().
- Support burst residue granularity.
- Support Intel KeemBay AxiDMA registers.
- Support Intel KeemBay AxiDMA device handshake.
- Support Intel KeemBay AxiDMA BYTE and HALFWORD device operation.
- Add constraint to Max segment size.
- Virtually split the linked-list.
This patch series are tested on Intel KeemBay platform.
v6:
- Removed 'allOf' cases in DT binding.
- Added '>' at the end of the email address.
- Removed additional '|' at the start of description.
- Fixed space indent.
- Added proper constraint in DT binding.
- Removed second example in DT binding.
v5:
- Added comment to the Apb registers used by Intel KeemBay Soc.
- Renamed "hs_num" to "handshake_num".
- Conditional check for the compatible property and return error instead of printing warning.
- Added patch 16th to virtually split the linked-list as per request from ALSA team.
v4:
- Fixed bot found errors running make_dt_binding_check.
- Added minItems: 1 to the YAML schemas DT binding.
- Updated "reg" field to the YAML schemas DT binding.
v3:
- Added additionalProperties: false to the YAML schemas DT binding.
- Reordered patch sequence for patch 10th, 11th and 12th so that DT binding come first, follow by adding Intel KeemBay SoC registers and update .compatible field.
- Checked txstate NULL condition.
- Created helper function dw_axi_dma_set_hw_desc() to handle common code.
v2:
- Rebased to v5.10-rc1 kernel.
- Added support for dmaengine device_config().
- Added support for dmaengine device_prep_slave_sg().
- Added support for dmaengine device_prep_dma_cyclic().
- Added support for of_dma_controller_register().
- Added support for burst residue granularity.
- Added support for Intel KeemBay AxiDMA registers.
- Added support for Intel KeemBay AxiDMA device handshake.
- Added support for Intel KeemBay AxiDMA BYTE and HALFWORD device operation.
- Added constraint to Max segment size.
v1:
- Initial version. Patch on top of dw-axi-dma driver. This version improve the descriptor management by replacing Linked List Item (LLI) with virtual descriptor management, only allocate hardware LLI memories from DMA memory pool, manage DMA memory pool alloc/destroy based on channel activity and to support device_sync callback.
Sia Jee Heng (16):
dt-bindings: dma: Add YAML schemas for dw-axi-dmac
dmaengine: dw-axi-dmac: simplify descriptor management
dmaengine: dw-axi-dmac: move dma_pool_create() to
alloc_chan_resources()
dmaengine: dw-axi-dmac: Add device_synchronize() callback
dmaengine: dw-axi-dmac: Add device_config operation
dmaengine: dw-axi-dmac: Support device_prep_slave_sg
dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()
dmaengine: dw-axi-dmac: Support of_dma_controller_register()
dmaengine: dw-axi-dmac: Support burst residue granularity
dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
dmaengine: dw-axi-dmac: Add Intel KeemBay DMA register fields
dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA support
dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA handshake
dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA BYTE and HALFWORD
registers
dmaengine: dw-axi-dmac: Set constraint to the Max segment size
dmaengine: dw-axi-dmac: Virtually split the linked-list
.../bindings/dma/snps,dw-axi-dmac.txt | 39 - .../bindings/dma/snps,dw-axi-dmac.yaml | 130 ++++ .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 710 +++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 34 +- 4 files changed, 779 insertions(+), 134 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
base-commit: 4cb682964706deffb4861f0a91329ab3a705039f
Signature · 1 line
2.18.0
PATCH v6 1/16 dt-bindings: dma: Add YAML schemas for dw-axi-dmac
YAML schemas Device Tree (DT) binding is the new format for DT to replace the old format. Introduce YAML schemas DT binding for dw-axi-dmac and remove the old version.
--- .../bindings/dma/snps,dw-axi-dmac.txt | 39 ------ .../bindings/dma/snps,dw-axi-dmac.yaml | 125 ++++++++++++++++++ 2 files changed, 125 insertions(+), 39 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt deleted +0 -39
@@ -1,39 +0,0 @@ -Synopsys DesignWare AXI DMA Controller - -Required properties: -- compatible: "snps,axi-dma-1.01a" -- reg: Address range of the DMAC registers. This should include - all of the per-channel registers. -- interrupt: Should contain the DMAC interrupt number. -- dma-channels: Number of channels supported by hardware. -- snps,dma-masters: Number of AXI masters supported by the hardware. -- snps,data-width: Maximum AXI data width supported by hardware. - (0 - 8bits, 1 - 16bits, 2 - 32bits, ..., 6 - 512bits) -- snps,priority: Priority of channel. Array size is equal to the number of - dma-channels. Priority value must be programmed within [0:dma-channels-1] - range. (0 - minimum priority) -- snps,block-size: Maximum block size supported by the controller channel. - Array size is equal to the number of dma-channels. - -Optional properties: -- snps,axi-max-burst-len: Restrict master AXI burst length by value specified - in this property. If this property is missing the maximum AXI burst length - supported by DMAC is used. [1:256] - -Example: - -dmac: dma-controller@80000 { - compatible = "snps,axi-dma-1.01a"; - reg = <0x80000 0x400>; - clocks = <&core_clk>, <&cfgr_clk>; - clock-names = "core-clk", "cfgr-clk"; - interrupt-parent = <&intc>; - interrupts = <27>; - - dma-channels = <4>; - snps,dma-masters = <2>; - snps,data-width = <3>; - snps,block-size = <4096 4096 4096 4096>; - snps,priority = <0 1 2 3>; - snps,axi-max-burst-len = <16>; -};
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [PATCH v6 01/16] dt-bindings: dma: Add YAML schemas for dw-axi-dmac
Quoted 22 lines · Sia Jee Heng
YAML schemas Device Tree (DT) binding is the new format for DT to replace the old format. Introduce YAML schemas DT binding for dw-axi-dmac and remove the old version.
Signed-off-by Sia Jee Heng <[email protected]>--- .../bindings/dma/snps,dw-axi-dmac.txt | 39 ------ .../bindings/dma/snps,dw-axi-dmac.yaml | 125 ++++++++++++++++++ 2 files changed, 125 insertions(+), 39 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yamlDocumentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +3
-0@@ -0,0 +1,125 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml line 13
Quoted 10 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +10
-0+$id: http://devicetree.org/schemas/dma/snps,dw-axi-dmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys DesignWare AXI DMA Controller + +maintainers: + - Eugeniy Paltsev <[email protected]> + +description: + Synopsys DesignWare AXI DMA Controller DT Binding
allOf:
- $ref: dma-controller.yaml#
Quoted 23 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +23
-0+ +properties: + compatible: + enum: + - snps,axi-dma-1.01a + + reg: + items: + - description: Address range of the DMAC registers + + reg-names: + items: + - const: axidma_ctrl_regs + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names:
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +10
-0+ items: + - const: core-clk + - const: cfgr-clk + + '#dma-cells': + const: 1 + + dma-channels: + description: | + Number of channels supported by hardware.
Already described in dma-controller.yaml
Quoted 41 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +41
-0+ minimum: 1 + maximum: 8 + + snps,dma-masters: + description: | + Number of AXI masters supported by the hardware. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [1, 2] + default: 2 + + snps,data-width: + description: | + AXI data width supported by hardware. + (0 - 8bits, 1 - 16bits, 2 - 32bits, ..., 6 - 512bits) + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4, 5, 6] + default: 4 + + snps,priority: + description: | + Channel priority specifier associated with the DMA channels. + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + default: [0, 1, 2, 3] + + snps,block-size: + description: | + Channel block size specifier associated with the DMA channels. + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + default: [4096, 4096, 4096, 4096] + + snps,axi-max-burst-len: + description: | + Restrict master AXI burst length by value specified in this property. + If this property is missing the maximum AXI burst length supported by + DMAC is used. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml line 97
Quoted 10 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +10
-0+ maximum: 256 + default: 16 + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#dma-cells'
Already required.
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml line 102
Quoted 5 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +5
-0+ - dma-channels + - snps,dma-masters + - snps,data-width + - snps,priority + - snps,block-size
How can these be both required and have a default?
Quoted 26 lines
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml new file +23
-0+ +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + /* example with snps,dw-axi-dmac */ + dmac: dma-controller@80000 { + compatible = "snps,axi-dma-1.01a"; + reg = <0x80000 0x400>; + clocks = <&core_clk>, <&cfgr_clk>; + clock-names = "core-clk", "cfgr-clk"; + interrupt-parent = <&intc>; + interrupts = <27>; + #dma-cells = <1>; + dma-channels = <4>; + snps,dma-masters = <2>; + snps,data-width = <3>; + snps,block-size = <4096 4096 4096 4096>; + snps,priority = <0 1 2 3>; + snps,axi-max-burst-len = <16>; + };Signature · 1 line
2.18.0
RE: [PATCH v6 01/16] dt-bindings: dma: Add YAML schemas for dw-axi-dmac
Quoted 40 lines
-----Original Message-----
From: Rob Herring <[email protected]>
Sent: 15 December 2020 6:52 AM
To: Sia, Jee Heng <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v6 01/16] dt-bindings: dma: Add YAML schemas for dw-axi-dmacQuoted 8 lines · Sia Jee Heng
YAML schemas Device Tree (DT) binding is the new format for DT to replace the old format. Introduce YAML schemas DT binding for dw-axi-dmac and remove the old version.
Signed-off-by Sia Jee Heng <[email protected]>--- .../bindings/dma/snps,dw-axi-dmac.txt | 39 ------ .../bindings/dma/snps,dw-axi-dmac.yaml | 125++++++++++++++++++
Quoted 2 lines
2 files changed, 125 insertions(+), 39 deletions(-) delete mode100644
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
Documentation/devicetree/bindings/dma/snps,dw-axi-
Quoted 11 lines
create mode 100644
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yamldiff --git
a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yamlb/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yamlnew file mode 100644
index 000000000000..61ad37a3f559Documentation/devicetree/bindings/dma/snps,dw-axi- new file +0
-0
dmac.yamlDocumentation/devicetree/bindings/dma/snps,dw-axi- line 1
Quoted 2 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +1
-0@@ -0,0 +1,125 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML1.2
Quoted 14 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- line 12
Quoted 11 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +11
-0+--- +$id: http://devicetree.org/schemas/dma/snps,dw-axi-dmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys DesignWare AXI DMA Controller + +maintainers: + - Eugeniy Paltsev <[email protected]> + +description: + Synopsys DesignWare AXI DMA Controller DT BindingallOf:
- $ref: dma-controller.yaml#
[>>] Thanks. Will include it in next version.
Quoted 28 lines
Quoted 28 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +27
-0+ +properties: + compatible: + enum: + - snps,axi-dma-1.01a + + reg: + items: + - description: Address range of the DMAC registers + + reg-names: + items: + - const: axidma_ctrl_regs + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: core-clk + - const: cfgr-clk +
Quoted 8 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- line 45
Quoted 6 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +6
-0+ '#dma-cells': + const: 1 + + dma-channels: + description: | + Number of channels supported by hardware.Already described in
dma-controller.yaml
[>>] Thanks. Will remove the description in next version but keep the constraint.
Quoted 41 lines
Quoted 28 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +27
-0+ minimum: 1 + maximum: 8 + + snps,dma-masters: + description: | + Number of AXI masters supported by the hardware. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [1, 2] + default: 2 + + snps,data-width: + description: | + AXI data width supported by hardware. + (0 - 8bits, 1 - 16bits, 2 - 32bits, ..., 6 - 512bits) + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4, 5, 6] + default: 4 + + snps,priority: + description: | + Channel priority specifier associated with the DMA channels. + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + default: [0, 1, 2, 3] + + snps,block-size:Documentation/devicetree/bindings/dma/snps,dw-axi- line 82
Quoted 10 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +10
-0+ description: | + Channel block size specifier associated with the DMA channels. + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + default: [4096, 4096, 4096, 4096] + + snps,axi-max-burst-len: + description: | + Restrict master AXI burst length by value specified in thisproperty.
Documentation/devicetree/bindings/dma/snps,dw-axi- line 83
Quoted 1 line
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +1
-0+ If this property is missing the maximum AXI burst lengthsupported by
Quoted 15 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- line 96
Quoted 13 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +13
-0+ DMAC is used. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 256 + default: 16 + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#dma-cells'Already required.
[>>] Hope the comment "already required" is for the below properties.
Quoted 8 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- line 101
Quoted 6 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +5
-0+ - dma-channels + - snps,dma-masters + - snps,data-width + - snps,priority + - snps,block-sizeHow can these be both required and have a default?
[>>] Thanks. Those are required properties, perhaps I should remove the default field to avoid misunderstanding.
Quoted 27 lines
Quoted 27 lines
Documentation/devicetree/bindings/dma/snps,dw-axi- new file +23
-1+ +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + /* example with snps,dw-axi-dmac */ + dmac: dma-controller@80000 { + compatible = "snps,axi-dma-1.01a"; + reg = <0x80000 0x400>; + clocks = <&core_clk>, <&cfgr_clk>; + clock-names = "core-clk", "cfgr-clk"; + interrupt-parent = <&intc>; + interrupts = <27>; + #dma-cells = <1>; + dma-channels = <4>; + snps,dma-masters = <2>; + snps,data-width = <3>; + snps,block-size = <4096 4096 4096 4096>; + snps,priority = <0 1 2 3>; + snps,axi-max-burst-len = <16>; + }; --2.18.0
PATCH v6 2/16 dmaengine: dw-axi-dmac: simplify descriptor management
In reply to Sia Jee HengSimplify and refactor the descriptor management by removing the redundant Linked List Item (LLI) queue control logic from the AxiDMA driver. The descriptor is split into virtual descriptor and hardware LLI so that only hardware LLI memories are allocated from the DMA memory pool.
Up to 64 descriptors can be allocated within a PAGE_SIZE compare to 16 descriptors in previous version. This solves the problem where an ALSA driver expects more than 16 DMA descriptors to run.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 164 ++++++++++-------- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 9 +- 2 files changed, 102 insertions(+), 71 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +95 -69
@@ -21,6 +21,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/property.h> +#include <linux/slab.h> #include <linux/types.h> #include "dw-axi-dmac.h"
@@ -195,43 +196,58 @@ static inline const char *axi_chan_name(struct axi_dma_chan *chan)return dma_chan_name (&chan->vc.chan); } -static struct axi_dma_desc *axi_desc_get (struct axi_dma_chan *chan) +static struct axi_dma_desc *axi_desc_alloc (u32 num) { -struct dw_axi_dma *dw = chan->chip->dw;struct axi_dma_desc *desc; + + desc =kzalloc (sizeof (*desc),GFP_NOWAIT ); +if (!desc) +return NULL ; + + desc->hw_desc =kcalloc (num,sizeof (*desc->hw_desc),GFP_NOWAIT ); +if (!desc->hw_desc) { +kfree (desc); +return NULL ; + } + +return desc; +} + +static struct axi_dma_lli *axi_desc_get (struct axi_dma_chan *chan, +dma_addr_t *addr) +{ +struct dw_axi_dma *dw = chan->chip->dw; +struct axi_dma_lli *lli;dma_addr_t phys; - desc =dma_pool_zalloc (dw->desc_pool,GFP_NOWAIT , &phys); -if (unlikely (!desc)) { + lli =dma_pool_zalloc (dw->desc_pool,GFP_NOWAIT , &phys); +if (unlikely (!lli)) {dev_err (chan2dev (chan),"%s: not enough descriptors available\n" ,axi_chan_name (chan));return NULL ; }atomic_inc (&chan->descs_allocated); -INIT_LIST_HEAD (&desc->xfer_list); - desc->vd.tx.phys = phys; - desc->chan = chan; + *addr = phys; -return desc; +return lli; }static void axi_desc_put (struct axi_dma_desc *desc) {struct axi_dma_chan *chan = desc->chan;struct dw_axi_dma *dw = chan->chip->dw; -struct axi_dma_desc *child, *_next; -unsigned int descs_put =0 ; +int count =atomic_read (&chan->descs_allocated); +struct axi_dma_hw_desc *hw_desc; +int descs_put; -list_for_each_entry_safe (child, _next, &desc->xfer_list, xfer_list) { -list_del (&child->xfer_list); -dma_pool_free (dw->desc_pool, child, child->vd.tx.phys); - descs_put++; +for (descs_put =0 ; descs_put < count; descs_put++) { + hw_desc = &desc->hw_desc[descs_put]; +dma_pool_free (dw->desc_pool, hw_desc->lli, hw_desc->llp); } -dma_pool_free (dw->desc_pool, desc, desc->vd.tx.phys); - descs_put++; - +kfree (desc->hw_desc); +kfree (desc);atomic_sub (descs_put, &chan->descs_allocated); dev_vdbg(chan2dev(chan), "%s: %d descs put, %d still allocated\n", axi_chan_name(chan), descs_put,
@@ -258,9 +274,9 @@ dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie,return ret; } -static void write_desc_llp (struct axi_dma_desc *desc,dma_addr_t adr) +static void write_desc_llp (struct axi_dma_hw_desc *desc,dma_addr_t adr) { - desc->lli.llp =cpu_to_le64 (adr); + desc->lli->llp =cpu_to_le64 (adr); }static void write_chan_llp (struct axi_dma_chan *chan,dma_addr_t adr)
@@ -295,7 +311,7 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan, DWAXIDMAC_HS_SEL_HW << CH_CFG_H_HS_SEL_SRC_POS);axi_chan_iowrite32 (chan,CH_CFG_H , reg); -write_chan_llp (chan, first->vd.tx.phys | lms); +write_chan_llp (chan, first->hw_desc[0 ].llp | lms); irq_mask =DWAXIDMAC_IRQ_DMA_TRF |DWAXIDMAC_IRQ_ALL_ERR ;axi_chan_irq_sig_set (chan, irq_mask);
@@ -378,67 +394,78 @@ static void dma_chan_free_chan_resources(struct dma_chan *dchan)* transfer and completes the DMA transfer operation at the end of current * block transfer. */ -static void set_desc_last (struct axi_dma_desc *desc) +static void set_desc_last (struct axi_dma_hw_desc *desc) {u32 val; - val =le32_to_cpu (desc->lli.ctl_hi); + val =le32_to_cpu (desc->lli->ctl_hi); val |=CH_CTL_H_LLI_LAST ; - desc->lli.ctl_hi =cpu_to_le32 (val); + desc->lli->ctl_hi =cpu_to_le32 (val); } -static void write_desc_sar (struct axi_dma_desc *desc,dma_addr_t adr) +static void write_desc_sar (struct axi_dma_hw_desc *desc,dma_addr_t adr) { - desc->lli.sar =cpu_to_le64 (adr); + desc->lli->sar =cpu_to_le64 (adr); } -static void write_desc_dar (struct axi_dma_desc *desc,dma_addr_t adr) +static void write_desc_dar (struct axi_dma_hw_desc *desc,dma_addr_t adr) { - desc->lli.dar =cpu_to_le64 (adr); + desc->lli->dar =cpu_to_le64 (adr); } -static void set_desc_src_master (struct axi_dma_desc *desc) +static void set_desc_src_master (struct axi_dma_hw_desc *desc) {u32 val;/* Select AXI0 for source master */ - val =le32_to_cpu (desc->lli.ctl_lo); + val =le32_to_cpu (desc->lli->ctl_lo); val &= ~CH_CTL_L_SRC_MAST ; - desc->lli.ctl_lo =cpu_to_le32 (val); + desc->lli->ctl_lo =cpu_to_le32 (val); } -static void set_desc_dest_master (struct axi_dma_desc *desc) +static void set_desc_dest_master (struct axi_dma_hw_desc *hw_desc, +struct axi_dma_desc *desc) {u32 val;/* Select AXI1 for source master if available */ - val =le32_to_cpu (desc->lli.ctl_lo); + val =le32_to_cpu (hw_desc->lli->ctl_lo);if (desc->chan->chip->dw->hdata->nr_masters >1 ) val |=CH_CTL_L_DST_MAST ;else val &= ~CH_CTL_L_DST_MAST ; - desc->lli.ctl_lo =cpu_to_le32 (val); + hw_desc->lli->ctl_lo =cpu_to_le32 (val); }static struct dma_async_tx_descriptor *dma_chan_prep_dma_memcpy (struct dma_chan *dchan,dma_addr_t dst_adr,dma_addr_t src_adr,size_t len,unsigned long flags) { -struct axi_dma_desc *first =NULL , *desc =NULL , *prev =NULL ;struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan);size_t block_ts, max_block_ts, xfer_len; -u32 xfer_width, reg; +struct axi_dma_hw_desc *hw_desc =NULL ; +struct axi_dma_desc *desc =NULL ; +u32 xfer_width, reg, num; +u64 llp =0 ;u8 lms =0 ;/* Select AXI0 master for LLI fetching */ dev_dbg (chan2dev (chan),"%s: memcpy: src: %pad dst: %pad length: %zd flags: %#lx" ,axi_chan_name (chan), &src_adr, &dst_adr, len, flags); max_block_ts = chan->chip->dw->hdata->block_size[chan->id]; + xfer_width =axi_chan_get_xfer_width (chan, src_adr, dst_adr, len); + num =DIV_ROUND_UP (len, max_block_ts << xfer_width); + desc =axi_desc_alloc (num); +if (unlikely (!desc)) + goto err_desc_get; + desc->chan = chan; + num =0 ;while (len) { xfer_len = len; + hw_desc = &desc->hw_desc[num];/* * Take care for the alignment. * Actually source and destination widths can be different, but
@@ -457,13 +484,13 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr, xfer_len = max_block_ts << xfer_width; } - desc =axi_desc_get (chan); -if (unlikely (!desc)) + hw_desc->lli =axi_desc_get (chan, &hw_desc->llp); +if (unlikely (!hw_desc->lli)) goto err_desc_get; -write_desc_sar (desc, src_adr); -write_desc_dar (desc, dst_adr); - desc->lli.block_ts_lo =cpu_to_le32 (block_ts -1 ); +write_desc_sar (hw_desc, src_adr); +write_desc_dar (hw_desc, dst_adr); + hw_desc->lli->block_ts_lo =cpu_to_le32 (block_ts -1 ); reg =CH_CTL_H_LLI_VALID ;if (chan->chip->dw->hdata->restrict_axi_burst_len) {
@@ -474,7 +501,7 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr,CH_CTL_H_AWLEN_EN | burst_len << CH_CTL_H_AWLEN_POS); } - desc->lli.ctl_hi =cpu_to_le32 (reg); + hw_desc->lli->ctl_hi =cpu_to_le32 (reg); reg = (DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_DST_MSIZE_POS | DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_SRC_MSIZE_POS |
@@ -482,62 +509,61 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr, xfer_width <<CH_CTL_L_SRC_WIDTH_POS |DWAXIDMAC_CH_CTL_L_INC <<CH_CTL_L_DST_INC_POS | DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_SRC_INC_POS); - desc->lli.ctl_lo =cpu_to_le32 (reg); + hw_desc->lli->ctl_lo =cpu_to_le32 (reg); -set_desc_src_master (desc); -set_desc_dest_master (desc); +set_desc_src_master (hw_desc); +set_desc_dest_master (hw_desc, desc); -/* Manage transfer list (xfer_list) */ -if (!first) { - first = desc; - }else { -list_add_tail (&desc->xfer_list, &first->xfer_list); -write_desc_llp (prev, desc->vd.tx.phys | lms); - } - prev = desc;/* update the length and addresses for the next loop cycle */ len -= xfer_len; dst_adr += xfer_len; src_adr += xfer_len; + num++; }/* Total len of src/dest sg == 0, so no descriptor were allocated */ -if (unlikely (!first)) +if (unlikely (!desc))return NULL ;/* Set end-of-link to the last link descriptor of list */ -set_desc_last (desc); +set_desc_last (&desc->hw_desc[num -1 ]); +/* Managed transfer list */ +do { + hw_desc = &desc->hw_desc[--num]; +write_desc_llp (hw_desc, llp | lms); + llp = hw_desc->llp; + }while (num); -return vchan_tx_prep (&chan->vc, &first->vd, flags); +return vchan_tx_prep (&chan->vc, &desc->vd, flags); err_desc_get: -if (first) -axi_desc_put (first); +if (desc) +axi_desc_put (desc);return NULL ; }static void axi_chan_dump_lli (struct axi_dma_chan *chan, -struct axi_dma_desc *desc) +struct axi_dma_hw_desc *desc) {dev_err (dchan2dev (&chan->vc.chan),"SAR: 0x%llx DAR: 0x%llx LLP: 0x%llx BTS 0x%x CTL: 0x%x:%08x" , -le64_to_cpu (desc->lli.sar), -le64_to_cpu (desc->lli.dar), -le64_to_cpu (desc->lli.llp), -le32_to_cpu (desc->lli.block_ts_lo), -le32_to_cpu (desc->lli.ctl_hi), -le32_to_cpu (desc->lli.ctl_lo)); +le64_to_cpu (desc->lli->sar), +le64_to_cpu (desc->lli->dar), +le64_to_cpu (desc->lli->llp), +le32_to_cpu (desc->lli->block_ts_lo), +le32_to_cpu (desc->lli->ctl_hi), +le32_to_cpu (desc->lli->ctl_lo)); }static void axi_chan_list_dump_lli (struct axi_dma_chan *chan,struct axi_dma_desc *desc_head) { -struct axi_dma_desc *desc; +int count =atomic_read (&chan->descs_allocated); +int i; -axi_chan_dump_lli (chan, desc_head); -list_for_each_entry (desc, &desc_head->xfer_list, xfer_list) -axi_chan_dump_lli (chan, desc); +for (i =0 ; i < count; i++) +axi_chan_dump_lli (chan, &desc_head->hw_desc[i]); } static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
@@ -872,7 +898,7 @@ static int dw_probe(struct platform_device *pdev)/* Lli address must be aligned to a 64-byte boundary */ dw->desc_pool =dmam_pool_create (KBUILD_MODNAME , chip->dev, -sizeof (struct axi_dma_desc ),64 ,0 ); +sizeof (struct axi_dma_lli ),64 ,0 );if (!dw->desc_pool) {dev_err (chip->dev,"No memory for descriptors dma pool\n" );return -ENOMEM ;
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +7 -2
@@ -41,6 +41,7 @@ struct axi_dma_chan {struct virt_dma_chan vc; +struct axi_dma_desc *desc;/* these other elements are all protected by vc.lock */ bool is_paused; };
@@ -80,12 +81,16 @@ struct __packed axi_dma_lli {__le32 reserved_hi; }; +struct axi_dma_hw_desc { +struct axi_dma_lli *lli; +dma_addr_t llp; +}; +struct axi_dma_desc { -struct axi_dma_lli lli; +struct axi_dma_hw_desc *hw_desc;struct virt_dma_desc vd;struct axi_dma_chan *chan; -struct list_head xfer_list; };static inline struct device *dchan2dev (struct dma_chan *dchan)
Signature · 1 line
2.18.0
PATCH v6 3/16 dmaengine: dw-axi-dmac: move dma_pool_create() to alloc_chan_resources()
In reply to Sia Jee HengThe DMA memory block is created at driver load time and exist for device lifetime. Move the dma_pool_create() to the ->chan_resource() callback function allowing the DMA memory blocks to be created as needed and destroyed when the channel is freed.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 24 ++++++++++--------- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +13 -11
@@ -216,11 +216,10 @@ static struct axi_dma_desc *axi_desc_alloc(u32 num)static struct axi_dma_lli *axi_desc_get (struct axi_dma_chan *chan,dma_addr_t *addr) { -struct dw_axi_dma *dw = chan->chip->dw;struct axi_dma_lli *lli;dma_addr_t phys; - lli =dma_pool_zalloc (dw->desc_pool,GFP_NOWAIT , &phys); + lli =dma_pool_zalloc (chan->desc_pool,GFP_NOWAIT , &phys);if (unlikely (!lli)) {dev_err (chan2dev (chan),"%s: not enough descriptors available\n" ,axi_chan_name (chan));
@@ -236,14 +235,13 @@ static struct axi_dma_lli *axi_desc_get(struct axi_dma_chan *chan,static void axi_desc_put (struct axi_dma_desc *desc) {struct axi_dma_chan *chan = desc->chan; -struct dw_axi_dma *dw = chan->chip->dw;int count =atomic_read (&chan->descs_allocated);struct axi_dma_hw_desc *hw_desc;int descs_put;for (descs_put =0 ; descs_put < count; descs_put++) { hw_desc = &desc->hw_desc[descs_put]; -dma_pool_free (dw->desc_pool, hw_desc->lli, hw_desc->llp); +dma_pool_free (chan->desc_pool, hw_desc->lli, hw_desc->llp); }kfree (desc->hw_desc);
@@ -360,6 +358,15 @@ static int dma_chan_alloc_chan_resources(struct dma_chan *dchan)return -EBUSY ; } +/* LLI address must be aligned to a 64-byte boundary */ + chan->desc_pool =dma_pool_create (dev_name (chan2dev (chan)), + chan->chip->dev, +sizeof (struct axi_dma_lli ), +64 ,0 ); +if (!chan->desc_pool) { +dev_err (chan2dev (chan),"No memory for descriptors\n" ); +return -ENOMEM ; + }dev_vdbg (dchan2dev (dchan),"%s: allocating\n" ,axi_chan_name (chan));pm_runtime_get (chan->chip->dev);
@@ -381,6 +388,8 @@ static void dma_chan_free_chan_resources(struct dma_chan *dchan)vchan_free_chan_resources (&chan->vc); +dma_pool_destroy (chan->desc_pool); + chan->desc_pool =NULL ;dev_vdbg (dchan2dev (dchan),"%s: free resources, descriptor still allocated: %u\n" ,axi_chan_name (chan),atomic_read (&chan->descs_allocated));
@@ -896,13 +905,6 @@ static int dw_probe(struct platform_device *pdev)if (ret)return ret; -/* Lli address must be aligned to a 64-byte boundary */ - dw->desc_pool =dmam_pool_create (KBUILD_MODNAME , chip->dev, -sizeof (struct axi_dma_lli ),64 ,0 ); -if (!dw->desc_pool) { -dev_err (chip->dev,"No memory for descriptors dma pool\n" ); -return -ENOMEM ; - }INIT_LIST_HEAD (&dw->dma.channels);for (i =0 ; i < hdata->nr_channels; i++) {
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -1
@@ -39,6 +39,7 @@ struct axi_dma_chan {u8 id;atomic_t descs_allocated; +struct dma_pool *desc_pool;struct virt_dma_chan vc;struct axi_dma_desc *desc;
@@ -49,7 +50,6 @@ struct axi_dma_chan {struct dw_axi_dma {struct dma_device dma;struct dw_axi_dma_hcfg *hdata; -struct dma_pool *desc_pool;/* channels */ struct axi_dma_chan *chan;
Signature · 1 line
2.18.0
PATCH v6 4/16 dmaengine: dw-axi-dmac: Add device_synchronize() callback
In reply to Sia Jee HengAdd support for device_synchronize() callback function to sync with dmaengine_terminate_sync().
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +8 -0
@@ -347,6 +347,13 @@ static void dma_chan_issue_pending(struct dma_chan *dchan)spin_unlock_irqrestore (&chan->vc.lock, flags); } +static void dw_axi_dma_synchronize (struct dma_chan *dchan) +{ +struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); + +vchan_synchronize (&chan->vc); +} +static int dma_chan_alloc_chan_resources (struct dma_chan *dchan) {struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan);
@@ -940,6 +947,7 @@ static int dw_probe(struct platform_device *pdev) dw->dma.device_free_chan_resources = dma_chan_free_chan_resources; dw->dma.device_prep_dma_memcpy = dma_chan_prep_dma_memcpy; + dw->dma.device_synchronize = dw_axi_dma_synchronize;platform_set_drvdata (pdev, chip);
Signature · 1 line
2.18.0
PATCH v6 5/16 dmaengine: dw-axi-dmac: Add device_config operation
In reply to Sia Jee HengAdd device_config() callback function so that the device address can be passed to the dma driver.
DMA clients use this interface to pass in the device address to the AxiDMA. Without this interface, data transfer between device to memory and memory to device would failed.
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 11 +++++++++++ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 12 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +11 -0
@@ -559,6 +559,16 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr,return NULL ; } +static int dw_axi_dma_chan_slave_config (struct dma_chan *dchan, +struct dma_slave_config *config) +{ +struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); + +memcpy (&chan->config, config,sizeof (*config)); + +return 0 ; +} +static void axi_chan_dump_lli (struct axi_dma_chan *chan,struct axi_dma_hw_desc *desc) {
@@ -948,6 +958,7 @@ static int dw_probe(struct platform_device *pdev) dw->dma.device_prep_dma_memcpy = dma_chan_prep_dma_memcpy; dw->dma.device_synchronize = dw_axi_dma_synchronize; + dw->dma.device_config = dw_axi_dma_chan_slave_config;platform_set_drvdata (pdev, chip);
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -43,6 +43,7 @@ struct axi_dma_chan {struct virt_dma_chan vc;struct axi_dma_desc *desc; +struct dma_slave_config config;/* these other elements are all protected by vc.lock */ bool is_paused; };
Signature · 1 line
2.18.0
PATCH v6 6/16 dmaengine: dw-axi-dmac: Support device_prep_slave_sg
In reply to Sia Jee HengAdd device_prep_slave_sg() callback function so that DMA_MEM_TO_DEV and DMA_DEV_TO_MEM operations in single mode can be supported.
Existing AxiDMA driver only support data transfer between memory to memory. Data transfer between device to memory and memory to device in single mode would failed if this interface is not supported by the AxiDMA driver.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 154 ++++++++++++++++++ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 155 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +154 -0
@@ -307,6 +307,22 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan, priority <<CH_CFG_H_PRIORITY_POS |DWAXIDMAC_HS_SEL_HW <<CH_CFG_H_HS_SEL_DST_POS | DWAXIDMAC_HS_SEL_HW << CH_CFG_H_HS_SEL_SRC_POS); +switch (chan->direction) { +case DMA_MEM_TO_DEV : + reg |= (chan->config.device_fc ? +DWAXIDMAC_TT_FC_MEM_TO_PER_DST : +DWAXIDMAC_TT_FC_MEM_TO_PER_DMAC ) + <<CH_CFG_H_TT_FC_POS ; +break ; +case DMA_DEV_TO_MEM : + reg |= (chan->config.device_fc ? +DWAXIDMAC_TT_FC_PER_TO_MEM_SRC : +DWAXIDMAC_TT_FC_PER_TO_MEM_DMAC ) + <<CH_CFG_H_TT_FC_POS ; +break ; +default : +break ; + }axi_chan_iowrite32 (chan,CH_CFG_H , reg);write_chan_llp (chan, first->hw_desc[0 ].llp | lms);
@@ -454,6 +470,141 @@ static void set_desc_dest_master(struct axi_dma_hw_desc *hw_desc, hw_desc->lli->ctl_lo =cpu_to_le32 (val); } +static int dw_axi_dma_set_hw_desc (struct axi_dma_chan *chan, +struct axi_dma_hw_desc *hw_desc, +dma_addr_t mem_addr,size_t len) +{ +unsigned int data_width =BIT (chan->chip->dw->hdata->m_data_width); +unsigned int reg_width; +unsigned int mem_width; +dma_addr_t device_addr; +size_t axi_block_ts; +size_t block_ts; +u32 ctllo, ctlhi; +u32 burst_len; + + axi_block_ts = chan->chip->dw->hdata->block_size[chan->id]; + + mem_width =__ffs (data_width | mem_addr | len); +if (mem_width >DWAXIDMAC_TRANS_WIDTH_32 ) + mem_width =DWAXIDMAC_TRANS_WIDTH_32 ; + +switch (chan->direction) { +case DMA_MEM_TO_DEV : + reg_width =__ffs (chan->config.dst_addr_width); + device_addr = chan->config.dst_addr; + ctllo = reg_width <<CH_CTL_L_DST_WIDTH_POS | + mem_width <<CH_CTL_L_SRC_WIDTH_POS | +DWAXIDMAC_CH_CTL_L_NOINC <<CH_CTL_L_DST_INC_POS | +DWAXIDMAC_CH_CTL_L_INC <<CH_CTL_L_SRC_INC_POS ; + block_ts = len >> mem_width; +break ; +case DMA_DEV_TO_MEM : + reg_width =__ffs (chan->config.src_addr_width); + device_addr = chan->config.src_addr; + ctllo = reg_width <<CH_CTL_L_SRC_WIDTH_POS | + mem_width <<CH_CTL_L_DST_WIDTH_POS | +DWAXIDMAC_CH_CTL_L_INC <<CH_CTL_L_DST_INC_POS | +DWAXIDMAC_CH_CTL_L_NOINC <<CH_CTL_L_SRC_INC_POS ; + block_ts = len >> reg_width; +break ; +default : +return -EINVAL ; + } + +if (block_ts > axi_block_ts) +return -EINVAL ; + + hw_desc->lli =axi_desc_get (chan, &hw_desc->llp); +if (unlikely (!hw_desc->lli)) +return -ENOMEM ; + + ctlhi =CH_CTL_H_LLI_VALID ; + +if (chan->chip->dw->hdata->restrict_axi_burst_len) { + burst_len = chan->chip->dw->hdata->axi_rw_burst_len; + ctlhi |=CH_CTL_H_ARLEN_EN |CH_CTL_H_AWLEN_EN | + burst_len <<CH_CTL_H_ARLEN_POS | + burst_len <<CH_CTL_H_AWLEN_POS ; + } + + hw_desc->lli->ctl_hi =cpu_to_le32 (ctlhi); + +if (chan->direction ==DMA_MEM_TO_DEV ) { +write_desc_sar (hw_desc, mem_addr); +write_desc_dar (hw_desc, device_addr); + }else { +write_desc_sar (hw_desc, device_addr); +write_desc_dar (hw_desc, mem_addr); + } + + hw_desc->lli->block_ts_lo =cpu_to_le32 (block_ts -1 ); + + ctllo |=DWAXIDMAC_BURST_TRANS_LEN_4 <<CH_CTL_L_DST_MSIZE_POS | +DWAXIDMAC_BURST_TRANS_LEN_4 <<CH_CTL_L_SRC_MSIZE_POS ; + hw_desc->lli->ctl_lo =cpu_to_le32 (ctllo); + +set_desc_src_master (hw_desc); + +return 0 ; +} + +static struct dma_async_tx_descriptor * +dw_axi_dma_chan_prep_slave_sg (struct dma_chan *dchan,struct scatterlist *sgl, +unsigned int sg_len, +enum dma_transfer_direction direction, +unsigned long flags,void *context) +{ +struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); +struct axi_dma_hw_desc *hw_desc =NULL ; +struct axi_dma_desc *desc =NULL ; +struct scatterlist *sg; +unsigned int i; +u32 mem, len; +int status; +u64 llp =0 ; +u8 lms =0 ;/* Select AXI0 master for LLI fetching */ + +if (unlikely (!is_slave_direction (direction) || !sg_len)) +return NULL ; + + chan->direction = direction; + + desc =axi_desc_alloc (sg_len); +if (unlikely (!desc)) + goto err_desc_get; + + desc->chan = chan; + +for_each_sg (sgl, sg, sg_len, i) { + mem =sg_dma_address (sg); + len =sg_dma_len (sg); + hw_desc = &desc->hw_desc[i]; + + status =dw_axi_dma_set_hw_desc (chan, hw_desc, mem, len); +if (status <0 ) + goto err_desc_get; + } + +/* Set end-of-link to the last link descriptor of list */ +set_desc_last (&desc->hw_desc[sg_len -1 ]); + +/* Managed transfer list */ +do { + hw_desc = &desc->hw_desc[--sg_len]; +write_desc_llp (hw_desc, llp | lms); + llp = hw_desc->llp; + }while (sg_len); + +return vchan_tx_prep (&chan->vc, &desc->vd, flags); + +err_desc_get: +if (desc) +axi_desc_put (desc); + +return NULL ; +} +static struct dma_async_tx_descriptor *dma_chan_prep_dma_memcpy (struct dma_chan *dchan,dma_addr_t dst_adr,dma_addr_t src_adr,size_t len,unsigned long flags)
@@ -938,12 +1089,14 @@ static int dw_probe(struct platform_device *pdev)/* Set capabilities */ dma_cap_set (DMA_MEMCPY , dw->dma.cap_mask); +dma_cap_set (DMA_SLAVE , dw->dma.cap_mask);/* DMA capabilities */ dw->dma.chancnt = hdata->nr_channels; dw->dma.src_addr_widths =AXI_DMA_BUSWIDTHS ; dw->dma.dst_addr_widths =AXI_DMA_BUSWIDTHS ; dw->dma.directions =BIT (DMA_MEM_TO_MEM ); + dw->dma.directions |=BIT (DMA_MEM_TO_DEV ) |BIT (DMA_DEV_TO_MEM ); dw->dma.residue_granularity =DMA_RESIDUE_GRANULARITY_DESCRIPTOR ; dw->dma.dev = chip->dev;
@@ -959,6 +1112,7 @@ static int dw_probe(struct platform_device *pdev) dw->dma.device_prep_dma_memcpy = dma_chan_prep_dma_memcpy; dw->dma.device_synchronize = dw_axi_dma_synchronize; dw->dma.device_config = dw_axi_dma_chan_slave_config; + dw->dma.device_prep_slave_sg = dw_axi_dma_chan_prep_slave_sg;platform_set_drvdata (pdev, chip);
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -44,6 +44,7 @@ struct axi_dma_chan {struct axi_dma_desc *desc;struct dma_slave_config config; +enum dma_transfer_direction direction;/* these other elements are all protected by vc.lock */ bool is_paused; };
Signature · 1 line
2.18.0
PATCH v6 7/16 dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()
In reply to Sia Jee HengAdd support for device_prep_dma_cyclic() callback function to benefit DMA cyclic client, for example ALSA.
Existing AxiDMA driver only support data transfer between memory to memory. Data transfer between device to memory and memory to device in cyclic mode would failed if this interface is not supported by the AxiDMA driver.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 111 ++++++++++++++++-- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 + 2 files changed, 106 insertions(+), 7 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +104 -7
@@ -15,6 +15,8 @@#include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/iopoll.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h>
@@ -549,6 +551,64 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,return 0 ; } +static struct dma_async_tx_descriptor * +dw_axi_dma_chan_prep_cyclic (struct dma_chan *dchan,dma_addr_t dma_addr, +size_t buf_len,size_t period_len, +enum dma_transfer_direction direction, +unsigned long flags) +{ +struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); +struct axi_dma_hw_desc *hw_desc =NULL ; +struct axi_dma_desc *desc =NULL ; +dma_addr_t src_addr = dma_addr; +u32 num_periods = buf_len / period_len; +unsigned int i; +int status; +u64 llp =0 ; +u8 lms =0 ;/* Select AXI0 master for LLI fetching */ + + desc =axi_desc_alloc (num_periods); +if (unlikely (!desc)) + goto err_desc_get; + + chan->direction = direction; + desc->chan = chan; + chan->cyclic = true; + +for (i =0 ; i < num_periods; i++) { + hw_desc = &desc->hw_desc[i]; + + status =dw_axi_dma_set_hw_desc (chan, hw_desc, src_addr, + period_len); +if (status <0 ) + goto err_desc_get; + +/* Set end-of-link to the linked descriptor, so that cyclic +* callback function can be triggered during interrupt. +*/ +set_desc_last (hw_desc); + + src_addr += period_len; + } + + llp = desc->hw_desc[0 ].llp; + +/* Managed transfer list */ +do { + hw_desc = &desc->hw_desc[--num_periods]; +write_desc_llp (hw_desc, llp | lms); + llp = hw_desc->llp; + }while (num_periods); + +return vchan_tx_prep (&chan->vc, &desc->vd, flags); + +err_desc_get: +if (desc) +axi_desc_put (desc); + +return NULL ; +} +static struct dma_async_tx_descriptor * dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, unsigned int sg_len,
@@ -773,8 +833,13 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)static void axi_chan_block_xfer_complete (struct axi_dma_chan *chan) { +int count =atomic_read (&chan->descs_allocated); +struct axi_dma_hw_desc *hw_desc; +struct axi_dma_desc *desc;struct virt_dma_desc *vd;unsigned long flags; +u64 llp; +int i;spin_lock_irqsave (&chan->vc.lock, flags);if (unlikely (axi_chan_is_hw_enable (chan))) {
@@ -785,12 +850,32 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)/* The completed descriptor currently is in the head of vc list */ vd =vchan_next_desc (&chan->vc); -/* Remove the completed descriptor from issued list before completing */ -list_del (&vd->node); -vchan_cookie_complete (vd); -/* Submit queued descriptors after processing the completed ones */ -axi_chan_start_first_queued (chan); +if (chan->cyclic) { +vchan_cyclic_callback (vd); + desc =vd_to_axi_desc (vd); +if (desc) { + llp =lo_hi_readq (chan->chan_regs +CH_LLP ); +for (i =0 ; i < count; i++) { + hw_desc = &desc->hw_desc[i]; +if (hw_desc->llp == llp) { +axi_chan_irq_clear (chan, hw_desc->lli->status_lo); + hw_desc->lli->ctl_hi |=CH_CTL_H_LLI_VALID ; + desc->completed_blocks = i; +break ; + } + } + +axi_chan_enable (chan); + } + }else { +/* Remove the completed descriptor from issued list before completing */ +list_del (&vd->node); +vchan_cookie_complete (vd); + +/* Submit queued descriptors after processing the completed ones */ +axi_chan_start_first_queued (chan); + }spin_unlock_irqrestore (&chan->vc.lock, flags); }
@@ -830,15 +915,25 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)static int dma_chan_terminate_all (struct dma_chan *dchan) {struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); +u32 chan_active =BIT (chan->id) <<DMAC_CHAN_EN_SHIFT ;unsigned long flags; +u32 val; +int ret;LIST_HEAD (head); -spin_lock_irqsave (&chan->vc.lock, flags); -axi_chan_disable (chan); + ret =readl_poll_timeout_atomic (chan->chip->regs +DMAC_CHEN , val, + !(val & chan_active),1000 ,10000 ); +if (ret == -ETIMEDOUT ) +dev_warn (dchan2dev (dchan), +"%s failed to stop\n" ,axi_chan_name (chan)); + +spin_lock_irqsave (&chan->vc.lock, flags); +vchan_get_all_descriptors (&chan->vc, &head); + chan->cyclic = false;spin_unlock_irqrestore (&chan->vc.lock, flags);vchan_dma_desc_free_list (&chan->vc, &head);
@@ -1090,6 +1185,7 @@ static int dw_probe(struct platform_device *pdev)/* Set capabilities */ dma_cap_set (DMA_MEMCPY , dw->dma.cap_mask);dma_cap_set (DMA_SLAVE , dw->dma.cap_mask); +dma_cap_set (DMA_CYCLIC , dw->dma.cap_mask);/* DMA capabilities */ dw->dma.chancnt = hdata->nr_channels;
@@ -1113,6 +1209,7 @@ static int dw_probe(struct platform_device *pdev) dw->dma.device_synchronize = dw_axi_dma_synchronize; dw->dma.device_config = dw_axi_dma_chan_slave_config; dw->dma.device_prep_slave_sg = dw_axi_dma_chan_prep_slave_sg; + dw->dma.device_prep_dma_cyclic = dw_axi_dma_chan_prep_cyclic;platform_set_drvdata (pdev, chip);
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +2 -0
@@ -45,6 +45,7 @@ struct axi_dma_chan {struct axi_dma_desc *desc;struct dma_slave_config config;enum dma_transfer_direction direction; +bool cyclic;/* these other elements are all protected by vc.lock */ bool is_paused; };
@@ -93,6 +94,7 @@ struct axi_dma_desc {struct virt_dma_desc vd;struct axi_dma_chan *chan; +u32 completed_blocks; };static inline struct device *dchan2dev (struct dma_chan *dchan)
Signature · 1 line
2.18.0
PATCH v6 8/16 dmaengine: dw-axi-dmac: Support of_dma_controller_register()
In reply to Sia Jee HengAdd support for of_dma_controller_register() so that DMA clients can pass in device handshake number to the AxiDMA driver.
DMA clients shall code the device handshake number in the Device tree. When DMA activities are needed, DMA clients shall invoke OF helper function to pass in the device handshake number to the AxiDMA.
Without register to the of_dma_controller_register(), data transfer between memory to device and device to memory operations would failed.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 +++++++++++++++++++ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 27 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +26 -0
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_dma.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/property.h>
@@ -1044,6 +1045,22 @@ static int __maybe_unused axi_dma_runtime_resume(struct device *dev)return axi_dma_resume (chip); } +static struct dma_chan *dw_axi_dma_of_xlate (struct of_phandle_args *dma_spec, +struct of_dma *ofdma) +{ +struct dw_axi_dma *dw = ofdma->of_dma_data; +struct axi_dma_chan *chan; +struct dma_chan *dchan; + + dchan =dma_get_any_slave_channel (&dw->dma); +if (!dchan) +return NULL ; + + chan =dchan_to_axi_dma_chan (dchan); + chan->hw_handshake_num = dma_spec->args[0 ]; +return dchan; +} +static int parse_device_properties (struct axi_dma_chip *chip) {struct device *dev = chip->dev;
@@ -1233,6 +1250,13 @@ static int dw_probe(struct platform_device *pdev)if (ret) goto err_pm_disable; +/* Register with OF helpers for DMA lookups */ + ret =of_dma_controller_register (pdev->dev.of_node, + dw_axi_dma_of_xlate, dw); +if (ret <0 ) +dev_warn (&pdev->dev, +"Failed to register OF DMA controller, fallback to MEM_TO_MEM mode\n" ); +dev_info (chip->dev,"DesignWare AXI DMA Controller, %d channels\n" , dw->hdata->nr_channels);
@@ -1266,6 +1290,8 @@ static int dw_remove(struct platform_device *pdev)devm_free_irq (chip->dev, chip->irq, chip); +of_dma_controller_free (chip->dev->of_node); +list_for_each_entry_safe (chan, _chan, &dw->dma.channels, vc.chan.device_node) {list_del (&chan->vc.chan.device_node);
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -37,6 +37,7 @@ struct axi_dma_chan {struct axi_dma_chip *chip;void __iomem *chan_regs;u8 id; +u8 hw_handshake_num;atomic_t descs_allocated;struct dma_pool *desc_pool;
Signature · 1 line
2.18.0
PATCH v6 9/16 dmaengine: dw-axi-dmac: Support burst residue granularity
In reply to Sia Jee HengAdd support for DMA_RESIDUE_GRANULARITY_BURST so that AxiDMA can report DMA residue.
Existing AxiDMA driver only support data transfer between memory to memory operation, therefore reporting DMA residue to the DMA clients is not supported.
Reporting DMA residue to the DMA clients is important as DMA clients shall invoke dmaengine_tx_status() to understand the number of bytes been transferred so that the buffer pointer can be updated accordingly.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 43 ++++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 + 2 files changed, 38 insertions(+), 7 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +36 -7
@@ -265,14 +265,36 @@ dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie, struct dma_tx_state *txstate) {struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan); -enum dma_status ret; +struct virt_dma_desc *vdesc; +enum dma_status status; +u32 completed_length; +unsigned long flags; +u32 completed_blocks; +size_t bytes =0 ; +u32 length; +u32 len; - ret =dma_cookie_status (dchan, cookie, txstate); + status =dma_cookie_status (dchan, cookie, txstate); +if (status ==DMA_COMPLETE || !txstate) +return status; -if (chan->is_paused && ret ==DMA_IN_PROGRESS ) - ret =DMA_PAUSED ; +spin_lock_irqsave (&chan->vc.lock, flags); -return ret; + vdesc =vchan_find_desc (&chan->vc, cookie); +if (vdesc) { + length =vd_to_axi_desc (vdesc)->length; + completed_blocks =vd_to_axi_desc (vdesc)->completed_blocks; + len =vd_to_axi_desc (vdesc)->hw_desc[0 ].len; + completed_length = completed_blocks * len; + bytes = length - completed_length; + }else { + bytes =vd_to_axi_desc (vdesc)->length; + } + +spin_unlock_irqrestore (&chan->vc.lock, flags); +dma_set_residue (txstate, bytes); + +return status; }static void write_desc_llp (struct axi_dma_hw_desc *desc,dma_addr_t adr)
@@ -549,6 +571,7 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,set_desc_src_master (hw_desc); + hw_desc->len = len;return 0 ; }
@@ -575,6 +598,7 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr, chan->direction = direction; desc->chan = chan; chan->cyclic = true; + desc->length =0 ;for (i =0 ; i < num_periods; i++) { hw_desc = &desc->hw_desc[i];
@@ -584,6 +608,7 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr,if (status <0 ) goto err_desc_get; + desc->length += hw_desc->len;/* Set end-of-link to the linked descriptor, so that cyclic * callback function can be triggered during interrupt. */
@@ -636,6 +661,7 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, goto err_desc_get; desc->chan = chan; + desc->length =0 ;for_each_sg (sgl, sg, sg_len, i) { mem =sg_dma_address (sg);
@@ -645,6 +671,7 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, status =dw_axi_dma_set_hw_desc (chan, hw_desc, mem, len);if (status <0 ) goto err_desc_get; + desc->length += hw_desc->len; }/* Set end-of-link to the last link descriptor of list */
@@ -690,6 +717,7 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr, desc->chan = chan; num =0 ; + desc->length =0 ;while (len) { xfer_len = len;
@@ -742,7 +770,8 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr,set_desc_src_master (hw_desc);set_desc_dest_master (hw_desc, desc); - + hw_desc->len = xfer_len; + desc->length += hw_desc->len;/* update the length and addresses for the next loop cycle */ len -= xfer_len; dst_adr += xfer_len;
@@ -1210,7 +1239,7 @@ static int dw_probe(struct platform_device *pdev) dw->dma.dst_addr_widths =AXI_DMA_BUSWIDTHS ; dw->dma.directions =BIT (DMA_MEM_TO_MEM ); dw->dma.directions |=BIT (DMA_MEM_TO_DEV ) |BIT (DMA_DEV_TO_MEM ); - dw->dma.residue_granularity =DMA_RESIDUE_GRANULARITY_DESCRIPTOR ; + dw->dma.residue_granularity =DMA_RESIDUE_GRANULARITY_BURST ; dw->dma.dev = chip->dev; dw->dma.device_tx_status = dma_chan_tx_status;
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +2 -0
@@ -88,6 +88,7 @@ struct __packed axi_dma_lli {struct axi_dma_hw_desc {struct axi_dma_lli *lli;dma_addr_t llp; +u32 len; };struct axi_dma_desc {
@@ -96,6 +97,7 @@ struct axi_dma_desc {struct virt_dma_desc vd;struct axi_dma_chan *chan;u32 completed_blocks; +u32 length; };static inline struct device *dchan2dev (struct dma_chan *dchan)
Signature · 1 line
2.18.0
PATCH v6 10/16 dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
In reply to Sia Jee HengAdd support for Intel KeemBay AxiDMA to the dw-axi-dmac Schemas DT binding.
--- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +5 -0
@@ -8,6 +8,7 @@ title: Synopsys DesignWare AXI DMA Controller maintainers: - Eugeniy Paltsev <[email protected]> + - Jee Heng Sia <[email protected]> description: Synopsys DesignWare AXI DMA Controller DT Binding
@@ -16,14 +17,18 @@ properties: compatible: enum: - snps,axi-dma-1.01a + - intel,kmb-axi-dma reg: + minItems: 1 items: - description: Address range of the DMAC registers + - description: Address range of the DMAC APB registers reg-names: items: - const: axidma_ctrl_regs + - const: axidma_apb_regs interrupts: maxItems: 1
Signature · 1 line
2.18.0
Re: [PATCH v6 10/16] dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
Quoted 8 lines · Sia Jee Heng
Add support for Intel KeemBay AxiDMA to the dw-axi-dmac Schemas DT binding.
Signed-off-by Sia Jee Heng <[email protected]>--- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 5 +++++ 1 file changed, 5 insertions(+)
RE: [PATCH v6 10/16] dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
Quoted 18 lines
-----Original Message-----
From: Rob Herring <[email protected]>
Sent: 15 December 2020 6:53 AM
To: Sia, Jee Heng <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v6 10/16] dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMAQuoted 1 line · Sia Jee Heng
Add support for Intel KeemBay AxiDMA to the dw-axi-dmac Schemas
DT
Quoted 2 lines
binding.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Sia Jee Heng <[email protected]>---
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml|5 +++++
Quoted 2 lines
1 file changed, 5 insertions(+)Reviewed-by Rob Herring <[email protected]>
[>>] Thanks. Will include your Reviewed-by tag in the next release.
PATCH v6 11/16 dmaengine: dw-axi-dmac: Add Intel KeemBay DMA register fields
In reply to Sia Jee HengAdd support for Intel KeemBay DMA registers. These registers are required to run data transfer between device to memory and memory to device on Intel KeemBay SoC.
--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +14 -0
@@ -63,6 +63,7 @@ struct axi_dma_chip {struct device *dev;int irq;void __iomem *regs; +void __iomem *apb_regs;struct clk *core_clk;struct clk *cfgr_clk;struct dw_axi_dma *dw;
@@ -169,6 +170,19 @@ static inline struct axi_dma_chan *dchan_to_axi_dma_chan(struct dma_chan *dchan)#define CH_INTSIGNAL_ENA 0x090/* R/W Chan Interrupt Signal Enable */ #define CH_INTCLEAR 0x098/* W Chan Interrupt Clear */ +/* These Apb registers are used by Intel KeemBay SoC */ +#define DMAC_APB_CFG 0x000/* DMAC Apb Configuration Register */ +#define DMAC_APB_STAT 0x004/* DMAC Apb Status Register */ +#define DMAC_APB_DEBUG_STAT_0 0x008/* DMAC Apb Debug Status Register 0 */ +#define DMAC_APB_DEBUG_STAT_1 0x00C/* DMAC Apb Debug Status Register 1 */ +#define DMAC_APB_HW_HS_SEL_0 0x010/* DMAC Apb HW HS register 0 */ +#define DMAC_APB_HW_HS_SEL_1 0x014/* DMAC Apb HW HS register 1 */ +#define DMAC_APB_LPI 0x018/* DMAC Apb Low Power Interface Reg */ +#define DMAC_APB_BYTE_WR_CH_EN 0x01C/* DMAC Apb Byte Write Enable */ +#define DMAC_APB_HALFWORD_WR_CH_EN 0x020/* DMAC Halfword write enables */ + +#define UNUSED_CHANNEL 0x3F/* Set unused DMA channel to 0x3F */ +#define MAX_BLOCK_SIZE 0x1000/* 1024 blocks * 4 bytes data width */ /* DMAC_CFG */ #define DMAC_EN_POS 0
Signature · 1 line
2.18.0
PATCH v6 12/16 dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA support
In reply to Sia Jee HengAdd support for Intel KeemBay AxiDMA to the .compatible field. The AxiDMA Apb region will be accessible if the compatible string matches the "intel,kmb-axi-dma".
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +8 -0
@@ -1160,6 +1160,7 @@ static int parse_device_properties(struct axi_dma_chip *chip)static int dw_probe (struct platform_device *pdev) { +struct device_node *node = pdev->dev.of_node;struct axi_dma_chip *chip;struct resource *mem;struct dw_axi_dma *dw;
@@ -1192,6 +1193,12 @@ static int dw_probe(struct platform_device *pdev)if (IS_ERR (chip->regs))return PTR_ERR (chip->regs); +if (of_device_is_compatible (node,"intel,kmb-axi-dma" )) { + chip->apb_regs =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (chip->apb_regs)) +return PTR_ERR (chip->apb_regs); + } + chip->core_clk =devm_clk_get (chip->dev,"core-clk" );if (IS_ERR (chip->core_clk))return PTR_ERR (chip->core_clk);
@@ -1336,6 +1343,7 @@ static const struct dev_pm_ops dw_axi_dma_pm_ops = {static const struct of_device_id dw_dma_of_id_table[] = { { .compatible ="snps,axi-dma-1.01a" }, + { .compatible ="intel,kmb-axi-dma" }, {} };MODULE_DEVICE_TABLE (of, dw_dma_of_id_table);
Signature · 1 line
2.18.0
PATCH v6 13/16 dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA handshake
In reply to Sia Jee HengAdd support for Intel KeemBay AxiDMA device handshake programming. Device handshake number passed in to the AxiDMA shall be written to the Intel KeemBay AxiDMA hardware handshake registers before DMA operations are started.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +52 -0
@@ -445,6 +445,48 @@ static void dma_chan_free_chan_resources(struct dma_chan *dchan)pm_runtime_put (chan->chip->dev); } +static int dw_axi_dma_set_hw_channel (struct axi_dma_chip *chip, +u32 handshake_num,bool set) +{ +unsigned long start =0 ; +unsigned long reg_value; +unsigned long reg_mask; +unsigned long reg_set; +unsigned long mask; +unsigned long val; + +if (!chip->apb_regs) +return -ENODEV ; + +/* +* An unused DMA channel has a default value of 0x3F. +* Lock the DMA channel by assign a handshake number to the channel. +* Unlock the DMA channel by assign 0x3F to the channel. +*/ +if (set) { + reg_set =UNUSED_CHANNEL ; + val = handshake_num; + }else { + reg_set = handshake_num; + val =UNUSED_CHANNEL ; + } + + reg_value =lo_hi_readq (chip->apb_regs +DMAC_APB_HW_HS_SEL_0 ); + +for_each_set_clump8 (start, reg_mask, ®_value,64 ) { +if (reg_mask == reg_set) { + mask =GENMASK_ULL (start +7 , start); + reg_value &= ~mask; + reg_value |=rol64 (val, start); +lo_hi_writeq (reg_value, + chip->apb_regs +DMAC_APB_HW_HS_SEL_0 ); +break ; + } + } + +return 0 ; +} +/* * If DW_axi_dmac sees CHx_CTL.ShadowReg_Or_LLI_Last bit of the fetched LLI * as 1, it understands that the current block is the final block in the
@@ -626,6 +668,9 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr, llp = hw_desc->llp; }while (num_periods); +if (dw_axi_dma_set_hw_channel (chan->chip, chan->hw_handshake_num, true)) + goto err_desc_get; +return vchan_tx_prep (&chan->vc, &desc->vd, flags); err_desc_get:
@@ -684,6 +729,9 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, llp = hw_desc->llp; }while (sg_len); +if (dw_axi_dma_set_hw_channel (chan->chip, chan->hw_handshake_num, true)) + goto err_desc_get; +return vchan_tx_prep (&chan->vc, &desc->vd, flags); err_desc_get:
@@ -959,6 +1007,10 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)dev_warn (dchan2dev (dchan),"%s failed to stop\n" ,axi_chan_name (chan)); +if (chan->direction !=DMA_MEM_TO_MEM ) +dw_axi_dma_set_hw_channel (chan->chip, + chan->hw_handshake_num, false); +spin_lock_irqsave (&chan->vc.lock, flags);vchan_get_all_descriptors (&chan->vc, &head);
Signature · 1 line
2.18.0
PATCH v6 14/16 dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA BYTE and HALFWORD registers
In reply to Sia Jee HengAdd support for Intel KeemBay AxiDMA BYTE and HALFWORD registers programming.
Intel KeemBay AxiDMA supports data transfer between device to memory and memory to device operations.
This code is needed by I2C, I3C, I2S, SPI and UART which uses FIFO size of 8bits and 16bits to perform memory to device data transfer operation. 0-padding functionality is provided to avoid pre-processing of data on CPU.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +39 -5
@@ -312,7 +312,7 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan, struct axi_dma_desc *first) {u32 priority = chan->chip->dw->hdata->priority[chan->id]; -u32 reg, irq_mask; +u32 reg, irq_mask, reg_width, offset, val;u8 lms =0 ;/* Select AXI0 master for LLI fetching */ if (unlikely (axi_chan_is_hw_enable (chan))) {
@@ -334,6 +334,25 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan, DWAXIDMAC_HS_SEL_HW << CH_CFG_H_HS_SEL_SRC_POS);switch (chan->direction) {case DMA_MEM_TO_DEV : +if (chan->chip->apb_regs) { + reg_width =__ffs (chan->config.dst_addr_width); +/* +* Configure Byte and Halfword register +* for MEM_TO_DEV only. +*/ +if (reg_width ==DWAXIDMAC_TRANS_WIDTH_16 ) { + offset =DMAC_APB_HALFWORD_WR_CH_EN ; + val =ioread32 (chan->chip->apb_regs + offset); + val |=BIT (chan->id); +iowrite32 (val, chan->chip->apb_regs + offset); + }else if (reg_width ==DWAXIDMAC_TRANS_WIDTH_8 ) { + offset =DMAC_APB_BYTE_WR_CH_EN ; + val =ioread32 (chan->chip->apb_regs + offset); + val |=BIT (chan->id); +iowrite32 (val, chan->chip->apb_regs + offset); + } + } + reg |= (chan->config.device_fc ?DWAXIDMAC_TT_FC_MEM_TO_PER_DST :DWAXIDMAC_TT_FC_MEM_TO_PER_DMAC )
@@ -994,8 +1013,9 @@ static int dma_chan_terminate_all(struct dma_chan *dchan) {struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan);u32 chan_active =BIT (chan->id) <<DMAC_CHAN_EN_SHIFT ; +u32 reg_width =__ffs (chan->config.dst_addr_width);unsigned long flags; -u32 val; +u32 offset, val;int ret;LIST_HEAD (head);
@@ -1007,9 +1027,23 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)dev_warn (dchan2dev (dchan),"%s failed to stop\n" ,axi_chan_name (chan)); -if (chan->direction !=DMA_MEM_TO_MEM ) -dw_axi_dma_set_hw_channel (chan->chip, - chan->hw_handshake_num, false); +if (chan->direction !=DMA_MEM_TO_MEM ) { + ret =dw_axi_dma_set_hw_channel (chan->chip, + chan->hw_handshake_num, false); +if (ret ==0 && chan->direction ==DMA_MEM_TO_DEV ) { +if (reg_width ==DWAXIDMAC_TRANS_WIDTH_8 ) { + offset =DMAC_APB_BYTE_WR_CH_EN ; + val =ioread32 (chan->chip->apb_regs + offset); + val &= ~BIT (chan->id); +iowrite32 (val, chan->chip->apb_regs + offset); + }else if (reg_width ==DWAXIDMAC_TRANS_WIDTH_16 ) { + offset =DMAC_APB_HALFWORD_WR_CH_EN ; + val =ioread32 (chan->chip->apb_regs + offset); + val &= ~BIT (chan->id); +iowrite32 (val, chan->chip->apb_regs + offset); + } + } + }spin_lock_irqsave (&chan->vc.lock, flags);
Signature · 1 line
2.18.0
PATCH v6 15/16 dmaengine: dw-axi-dmac: Set constraint to the Max segment size
In reply to Sia Jee HengAdd support for DMA Scatter-Gather (SG) constraint so that DMA clients can handle the AxiDMA limitation.
Without supporting DMA constraint the default Max segment size reported by dmaengine is 64KB, which is not supported by Intel KeemBay AxiDMA.
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 ++++++++ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 9 insertions(+)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +8 -0
@@ -12,6 +12,7 @@#include <linux/device.h> #include <linux/dmaengine.h> #include <linux/dmapool.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h>
@@ -1350,6 +1351,13 @@ static int dw_probe(struct platform_device *pdev) dw->dma.device_prep_slave_sg = dw_axi_dma_chan_prep_slave_sg; dw->dma.device_prep_dma_cyclic = dw_axi_dma_chan_prep_cyclic; +/* +* Synopsis DesignWare AxiDMA datasheet mentioned Maximum +* supported blocks is 1024. Device register width is 4 bytes. +* Therefore, set constraint to 1024 * 4. +*/ + dw->dma.dev->dma_parms = &dw->dma_parms; +dma_set_max_seg_size (&pdev->dev,MAX_BLOCK_SIZE );platform_set_drvdata (pdev, chip);pm_runtime_enable (chip->dev);
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -54,6 +54,7 @@ struct axi_dma_chan {struct dw_axi_dma {struct dma_device dma;struct dw_axi_dma_hcfg *hdata; +struct device_dma_parameters dma_parms;/* channels */ struct axi_dma_chan *chan;
Signature · 1 line
2.18.0
PATCH v6 16/16 dmaengine: dw-axi-dmac: Virtually split the linked-list
In reply to Sia Jee HengAxiDMA driver exposed the dma_set_max_seg_size() to the DMAENGINE. It shall helps the DMA clients to create size-optimized linked-list for the controller.
However, there are certain situations where DMA client might not be abled to benefit from the dma_get_max_seg_size() if the segment size can't meet the nature of the DMA client's operation.
In the case of ALSA operation, ALSA application and driver expecting to run in a period of larger than 10ms regardless of the bit depth. With this large period, there is a strong request to split the linked-list in the AxiDMA driver.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 111 ++++++++++++++---- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 92 insertions(+), 20 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +91 -20
@@ -576,6 +576,11 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,if (mem_width >DWAXIDMAC_TRANS_WIDTH_32 ) mem_width =DWAXIDMAC_TRANS_WIDTH_32 ; +if (!IS_ALIGNED (mem_addr,4 )) { +dev_err (chan->chip->dev,"invalid buffer alignment\n" ); +return -EINVAL ; + } +switch (chan->direction) {case DMA_MEM_TO_DEV : reg_width =__ffs (chan->config.dst_addr_width);
@@ -637,6 +642,35 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,return 0 ; } +static size_t calculate_block_len (struct axi_dma_chan *chan, +dma_addr_t dma_addr,size_t buf_len, +enum dma_transfer_direction direction) +{ +u32 data_width, reg_width, mem_width; +size_t axi_block_ts, block_len; + + axi_block_ts = chan->chip->dw->hdata->block_size[chan->id]; + +switch (direction) { +case DMA_MEM_TO_DEV : + data_width =BIT (chan->chip->dw->hdata->m_data_width); + mem_width =__ffs (data_width | dma_addr | buf_len); +if (mem_width >DWAXIDMAC_TRANS_WIDTH_32 ) + mem_width =DWAXIDMAC_TRANS_WIDTH_32 ; + + block_len = axi_block_ts << mem_width; +break ; +case DMA_DEV_TO_MEM : + reg_width =__ffs (chan->config.src_addr_width); + block_len = axi_block_ts << reg_width; +break ; +default : + block_len =0 ; + } + +return block_len; +} +static struct dma_async_tx_descriptor * dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr, size_t buf_len, size_t period_len,
@@ -647,13 +681,27 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr,struct axi_dma_hw_desc *hw_desc =NULL ;struct axi_dma_desc *desc =NULL ;dma_addr_t src_addr = dma_addr; -u32 num_periods = buf_len / period_len; +u32 num_periods, num_segments; +size_t axi_block_len; +u32 total_segments; +u32 segment_len;unsigned int i;int status;u64 llp =0 ;u8 lms =0 ;/* Select AXI0 master for LLI fetching */ - desc =axi_desc_alloc (num_periods); + num_periods = buf_len / period_len; + + axi_block_len =calculate_block_len (chan, dma_addr, buf_len, direction); +if (axi_block_len ==0 ) +return NULL ; + + num_segments =DIV_ROUND_UP (period_len, axi_block_len); + segment_len =DIV_ROUND_UP (period_len, num_segments); + + total_segments = num_periods * num_segments; + + desc =axi_desc_alloc (total_segments);if (unlikely (!desc)) goto err_desc_get;
@@ -661,12 +709,13 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr, desc->chan = chan; chan->cyclic = true; desc->length =0 ; + desc->period_len = period_len; -for (i =0 ; i < num_periods; i++) { +for (i =0 ; i < total_segments; i++) { hw_desc = &desc->hw_desc[i]; status =dw_axi_dma_set_hw_desc (chan, hw_desc, src_addr, - period_len); + segment_len);if (status <0 ) goto err_desc_get;
@@ -676,17 +725,17 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr,*/ set_desc_last (hw_desc); - src_addr += period_len; + src_addr += segment_len; } llp = desc->hw_desc[0 ].llp;/* Managed transfer list */ do { - hw_desc = &desc->hw_desc[--num_periods]; + hw_desc = &desc->hw_desc[--total_segments];write_desc_llp (hw_desc, llp | lms); llp = hw_desc->llp; - }while (num_periods); + }while (total_segments);if (dw_axi_dma_set_hw_channel (chan->chip, chan->hw_handshake_num, true)) goto err_desc_get;
@@ -709,9 +758,13 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl,struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan);struct axi_dma_hw_desc *hw_desc =NULL ;struct axi_dma_desc *desc =NULL ; +u32 num_segments, segment_len; +unsigned int loop =0 ;struct scatterlist *sg; +size_t axi_block_len; +u32 len, num_sgs =0 ;unsigned int i; -u32 mem, len; +dma_addr_t mem;int status;u64 llp =0 ;u8 lms =0 ;/* Select AXI0 master for LLI fetching */
@@ -719,35 +772,51 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl,if (unlikely (!is_slave_direction (direction) || !sg_len))return NULL ; - chan->direction = direction; + mem =sg_dma_address (sgl); + len =sg_dma_len (sgl); + + axi_block_len =calculate_block_len (chan, mem, len, direction); +if (axi_block_len ==0 ) +return NULL ; - desc =axi_desc_alloc (sg_len); +for_each_sg (sgl, sg, sg_len, i) + num_sgs +=DIV_ROUND_UP (sg_dma_len (sg), axi_block_len); + + desc =axi_desc_alloc (num_sgs);if (unlikely (!desc)) goto err_desc_get; desc->chan = chan; desc->length =0 ; + chan->direction = direction;for_each_sg (sgl, sg, sg_len, i) { mem =sg_dma_address (sg); len =sg_dma_len (sg); - hw_desc = &desc->hw_desc[i]; - - status =dw_axi_dma_set_hw_desc (chan, hw_desc, mem, len); -if (status <0 ) - goto err_desc_get; - desc->length += hw_desc->len; + num_segments =DIV_ROUND_UP (sg_dma_len (sg), axi_block_len); + segment_len =DIV_ROUND_UP (sg_dma_len (sg), num_segments); + +do { + hw_desc = &desc->hw_desc[loop++]; + status =dw_axi_dma_set_hw_desc (chan, hw_desc, mem, segment_len); +if (status <0 ) + goto err_desc_get; + + desc->length += hw_desc->len; + len -= segment_len; + mem += segment_len; + }while (len >= segment_len); }/* Set end-of-link to the last link descriptor of list */ -set_desc_last (&desc->hw_desc[sg_len -1 ]); +set_desc_last (&desc->hw_desc[num_sgs -1 ]);/* Managed transfer list */ do { - hw_desc = &desc->hw_desc[--sg_len]; + hw_desc = &desc->hw_desc[--num_sgs];write_desc_llp (hw_desc, llp | lms); llp = hw_desc->llp; - }while (sg_len); + }while (num_sgs);if (dw_axi_dma_set_hw_channel (chan->chip, chan->hw_handshake_num, true)) goto err_desc_get;
@@ -950,7 +1019,6 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan) vd =vchan_next_desc (&chan->vc);if (chan->cyclic) { -vchan_cyclic_callback (vd); desc =vd_to_axi_desc (vd);if (desc) { llp =lo_hi_readq (chan->chan_regs +CH_LLP );
@@ -960,6 +1028,9 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)axi_chan_irq_clear (chan, hw_desc->lli->status_lo); hw_desc->lli->ctl_hi |=CH_CTL_H_LLI_VALID ; desc->completed_blocks = i; + +if (((hw_desc->len * (i +1 )) % desc->period_len) ==0 ) +vchan_cyclic_callback (vd);break ; } }
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -100,6 +100,7 @@ struct axi_dma_desc {struct axi_dma_chan *chan;u32 completed_blocks;u32 length; +u32 period_len; };static inline struct device *dchan2dev (struct dma_chan *dchan)
Signature · 1 line
2.18.0