Add Intel LGM soc DMA support
Subsystems (2)
v5 cover Add Intel LGM soc DMA support
Add DMA controller driver for Lightning Mountain(LGM) family of SoCs.
The main function of the DMA controller is the transfer of data from/to any DPlus compliant peripheral to/from the memory. A memory to memory copy capability can also be configured.
This ldma driver is used for configure the device and channnels for data and control paths.
These controllers provide DMA capabilities for a variety of on-chip devices such as SSC, HSNAND and GSWIP.
-------------
Future Plans:
-------------
LGM SOC also supports Hardware Memory Copy engine.
The role of the HW Memory copy engine is to offload memory copy operations from the CPU.
Amireddy Mallikarjuna reddy (2):
dt-bindings: dma: Add bindings for intel LGM SOC Add Intel LGM soc DMA support.
.../devicetree/bindings/dma/intel,ldma.yaml | 319 ++++ drivers/dma/Kconfig | 2 + drivers/dma/Makefile | 1 + drivers/dma/lgm/Kconfig | 9 + drivers/dma/lgm/Makefile | 2 + drivers/dma/lgm/lgm-dma.c | 1944 ++++++++++++++++++++ include/linux/dma/lgm_dma.h | 27 + 7 files changed, 2304 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/intel,ldma.yaml create mode 100644 drivers/dma/lgm/Kconfig create mode 100644 drivers/dma/lgm/Makefile create mode 100644 drivers/dma/lgm/lgm-dma.c create mode 100644 include/linux/dma/lgm_dma.h
Signature · 1 line
2.11.0
PATCH v5 1/2 dt-bindings: dma: Add bindings for intel LGM SOC
Add DT bindings YAML schema for DMA controller driver of Lightning Mountain(LGM) SoC.
---
v1:
- Initial version.
v2:
- Fix bot errors.
v3:
- No change.
v4:
- Address Thomas langer comments
- use node name pattern as dma-controller as in common binding.
- Remove "_" (underscore) in instance name.
- Remove "port-" and "chan-" in attribute name for both 'dma-ports' & 'dma-channels' child nodes.
v5:
- Moved some of the attributes in 'dma-ports' & 'dma-channels' child nodes to dma client/consumer side as cells in 'dmas' properties.
--- .../devicetree/bindings/dma/intel,ldma.yaml | 319 +++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/intel,ldma.yaml
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +319 -0
@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/intel,ldma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Lightning Mountain centralized low speed DMA and high speed DMA controllers. + +maintainers: + - [email protected] + - [email protected] + +allOf: + - $ref: "dma-controller.yaml#" + +properties: + $nodename: + pattern: "^dma-controller(@.*)?$" + + "#dma-cells": + const: 1 + + compatible: + anyOf: + - const: intel,lgm-cdma + - const: intel,lgm-dma2tx + - const: intel,lgm-dma1rx + - const: intel,lgm-dma1tx + - const: intel,lgm-dma0tx + - const: intel,lgm-dma3 + - const: intel,lgm-toe-dma30 + - const: intel,lgm-toe-dma31 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + interrupts: + maxItems: 1 + + intel,dma-poll-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according + to the system application scenario. + + intel,dma-byte-en: + type: boolean + description: + DMA byte enable is only valid for DMA write(RX). + Byte enable(1) means DMA write will be based on the number of dwords + instead of the whole burst. + + intel,dma-drb: + type: boolean + description: + DMA descriptor read back to make sure data and desc synchronization. + + intel,dma-burst: + $ref: /schemas/types.yaml#definitions/uint32 + description: + Specifiy the DMA burst size(in dwords), the valid value will be 8, 16, 32. + Default is 16 for data path dma, 32 is for memcopy DMA. + + intel,dma-polling-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according to + the system application scenario. + + intel,dma-desc-in-sram: + type: boolean + description: + DMA descritpors in SRAM or not. Some old controllers descriptors + can be in DRAM or SRAM. The new ones are all in SRAM. + + intel,dma-orrc: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA outstanding read counter. The maximum value is 16, and it may + need fine tune according to the system application scenarios. + + intel,dma-dburst-wr: + type: boolean + description: + Enable RX dynamic burst write. It only applies to RX DMA and memcopy DMA. + + + dma-ports: + type: object + description: + This sub-node must contain a sub-node for each DMA port. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^dma-ports@[0-9]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5] + description: + Which port this node refers to. + + intel,name: + $ref: /schemas/types.yaml#definitions/string-array + description: + Port name of each DMA port. + + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port. + + required: + - reg + - intel,name + - intel,chans + + + ldma-channels: + type: object + description: + This sub-node must contain a sub-node for each DMA channel. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^ldma-channels@[0-15]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + description: + Which channel this node refers to. + + intel,desc_num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per channel maximum descriptor number. The max value is 255. + + intel,hdr-mode: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The first parameter is header mode size, the second + parameter is checksum enable or disable. If enabled, + header mode size is ignored. If disabled, header mode + size must be provided. + + intel,hw-desc: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Per channel dma hardware descriptor configuration. + The first parameter is descriptor physical address and the + second parameter hardware descriptor number. + + required: + - reg + +required: + - compatible + - reg + - '#dma-cells' + +examples: + - | + dma0: dma-controller@e0e00000 { + compatible = "intel,lgm-cdma"; + reg = <0xe0e00000 0x1000>; + #dma-cells = <3>; + interrupt-parent = <&ioapic1>; + interrupts = <82 1>; + resets = <&rcu0 0x30 0>; + reset-names = "ctrl"; + clocks = <&cgu0 80>; + intel,dma-poll-cnt = <4>; + intel,dma-byte-en; + intel,dma-drb; + dma-ports { + #address-cells = <1>; + #size-cells = <0>; + + dma-ports@0 { + reg = <0>; + intel,name = "SPI0"; + intel,chans = <0 2>; + }; + dma-ports@1 { + reg = <1>; + intel,name = "SPI1"; + intel,chans = <2 2>; + }; + dma-ports@2 { + reg = <2>; + intel,name = "SPI2"; + intel,chans = <4 2>; + }; + dma-ports@3 { + reg = <3>; + intel,name = "SPI3"; + intel,chans = <6 2>; + }; + dma-ports@4 { + reg = <4>; + intel,name = "HSNAND"; + intel,chans = <8 2>; + }; + dma-ports@5 { + reg = <5>; + intel,name = "PCM"; + intel,chans = <10 6>; + }; + }; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@0 { + reg = <0>; + intel,desc_num = <1>; + }; + ldma-channels@1 { + reg = <1>; + intel,desc_num = <1>; + }; + ldma-channels@2 { + reg = <2>; + intel,desc_num = <1>; + }; + ldma-channels@3 { + reg = <3>; + intel,desc_num = <1>; + }; + ldma-channels@4 { + reg = <4>; + intel,desc_num = <1>; + }; + ldma-channels@5 { + reg = <5>; + intel,desc_num = <1>; + }; + ldma-channels@6 { + reg = <6>; + intel,desc_num = <1>; + }; + ldma-channels@7 { + reg = <7>; + intel,desc_num = <1>; + }; + ldma-channels@8 { + reg = <8>; + }; + ldma-channels@9 { + reg = <9>; + }; + ldma-channels@10 { + reg = <10>; + }; + ldma-channels@11 { + reg = <11>; + }; + ldma-channels@12 { + reg = <12>; + }; + ldma-channels@13 { + reg = <13>; + }; + ldma-channels@14 { + reg = <14>; + }; + ldma-channels@15 { + reg = <15>; + }; + }; + }; + - | + dma3: dma-controller@ec800000 { + compatible = "intel,lgm-dma3"; + reg = <0xec800000 0x1000>; + clocks = <&cgu0 71>; + resets = <&rcu0 0x10 9>; + #dma-cells = <7>; + intel,dma-burst = <32>; + intel,dma-polling-cnt = <16>; + intel,dma-desc-in-sram; + intel,dma-orrc = <16>; + intel,dma-byte-en; + intel,dma-dburst-wr; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@12 { + reg = <12>; + intel,hdr-mode = <128 0>; + intel,hw-desc = <0x20000000 8>; + }; + ldma-channels@13 { + reg = <13>; + intel,hdr-mode = <128 0>; + }; + }; + };
Signature · 1 line
2.11.0
Rob Herring
maintainerRe: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Quoted 44 lines · Amireddy Mallikarjuna reddy
Add DT bindings YAML schema for DMA controller driver of Lightning Mountain(LGM) SoC.
Signed-off-by Amireddy Mallikarjuna reddy <[email protected]>---
v1:
- Initial version.v2:
- Fix bot errors.v3:
- No change.v4:
- Address Thomas langer comments
- use node name pattern as dma-controller as in common binding.
- Remove "_" (underscore) in instance name.
- Remove "port-" and "chan-" in attribute name for both 'dma-ports' & 'dma-channels' child nodes.v5:
- Moved some of the attributes in 'dma-ports' & 'dma-channels' child nodes to dma client/consumer side as cells in 'dmas' properties.--- .../devicetree/bindings/dma/intel,ldma.yaml | 319 +++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/intel,ldma.yamlDocumentation/devicetree/bindings/dma/intel,ldma.yaml new file +11
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/intel,ldma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Lightning Mountain centralized low speed DMA and high speed DMA controllers. + +maintainers: + - [email protected] + - [email protected]
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +10
-0+ +allOf: + - $ref: "dma-controller.yaml#" + +properties: + $nodename: + pattern: "^dma-controller(@.*)?$" + + "#dma-cells": + const: 1
Example says 3.
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 32
Quoted 11 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +11
-0+ + compatible: + anyOf: + - const: intel,lgm-cdma + - const: intel,lgm-dma2tx + - const: intel,lgm-dma1rx + - const: intel,lgm-dma1tx + - const: intel,lgm-dma0tx + - const: intel,lgm-dma3 + - const: intel,lgm-toe-dma30 + - const: intel,lgm-toe-dma31
'anyOf' doesn't make sense here. This should be a single 'enum'.
Quoted 76 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +76
-0+ + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + interrupts: + maxItems: 1 + + intel,dma-poll-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according + to the system application scenario. + + intel,dma-byte-en: + type: boolean + description: + DMA byte enable is only valid for DMA write(RX). + Byte enable(1) means DMA write will be based on the number of dwords + instead of the whole burst. + + intel,dma-drb: + type: boolean + description: + DMA descriptor read back to make sure data and desc synchronization. + + intel,dma-burst: + $ref: /schemas/types.yaml#definitions/uint32 + description: + Specifiy the DMA burst size(in dwords), the valid value will be 8, 16, 32. + Default is 16 for data path dma, 32 is for memcopy DMA. + + intel,dma-polling-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according to + the system application scenario. + + intel,dma-desc-in-sram: + type: boolean + description: + DMA descritpors in SRAM or not. Some old controllers descriptors + can be in DRAM or SRAM. The new ones are all in SRAM. + + intel,dma-orrc: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA outstanding read counter. The maximum value is 16, and it may + need fine tune according to the system application scenarios. + + intel,dma-dburst-wr: + type: boolean + description: + Enable RX dynamic burst write. It only applies to RX DMA and memcopy DMA. + + + dma-ports: + type: object + description: + This sub-node must contain a sub-node for each DMA port. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^dma-ports@[0-9]+$": + type: object + + properties:
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 118
Quoted 10 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +10
-0+ reg: + items: + - enum: [0, 1, 2, 3, 4, 5] + description: + Which port this node refers to. + + intel,name: + $ref: /schemas/types.yaml#definitions/string-array + description: + Port name of each DMA port.
No other DMA controller needs this, why do you?
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 6 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.
Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
Quoted 37 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +37
-0+ + required: + - reg + - intel,name + - intel,chans + + + ldma-channels: + type: object + description: + This sub-node must contain a sub-node for each DMA channel. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^ldma-channels@[0-15]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + description: + Which channel this node refers to. + + intel,desc_num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per channel maximum descriptor number. The max value is 255. + + intel,hdr-mode: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The first parameter is header mode size, the second
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 171
Quoted 10 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +10
-0+ parameter is checksum enable or disable. If enabled, + header mode size is ignored. If disabled, header mode + size must be provided. + + intel,hw-desc: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Per channel dma hardware descriptor configuration. + The first parameter is descriptor physical address and the + second parameter hardware descriptor number.
Again, this all seems like per client information for dma cells.
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 179
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +8
-0+ + required: + - reg + +required: + - compatible + - reg + - '#dma-cells'
Add:
additionalProperties: false
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 190
Quoted 11 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +11
-0+ +examples: + - | + dma0: dma-controller@e0e00000 { + compatible = "intel,lgm-cdma"; + reg = <0xe0e00000 0x1000>; + #dma-cells = <3>; + interrupt-parent = <&ioapic1>; + interrupts = <82 1>; + resets = <&rcu0 0x30 0>; + reset-names = "ctrl";
Not documented.
Quoted 132 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +129
-0+ clocks = <&cgu0 80>; + intel,dma-poll-cnt = <4>; + intel,dma-byte-en; + intel,dma-drb; + dma-ports { + #address-cells = <1>; + #size-cells = <0>; + + dma-ports@0 { + reg = <0>; + intel,name = "SPI0"; + intel,chans = <0 2>; + }; + dma-ports@1 { + reg = <1>; + intel,name = "SPI1"; + intel,chans = <2 2>; + }; + dma-ports@2 { + reg = <2>; + intel,name = "SPI2"; + intel,chans = <4 2>; + }; + dma-ports@3 { + reg = <3>; + intel,name = "SPI3"; + intel,chans = <6 2>; + }; + dma-ports@4 { + reg = <4>; + intel,name = "HSNAND"; + intel,chans = <8 2>; + }; + dma-ports@5 { + reg = <5>; + intel,name = "PCM"; + intel,chans = <10 6>; + }; + }; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@0 { + reg = <0>; + intel,desc_num = <1>; + }; + ldma-channels@1 { + reg = <1>; + intel,desc_num = <1>; + }; + ldma-channels@2 { + reg = <2>; + intel,desc_num = <1>; + }; + ldma-channels@3 { + reg = <3>; + intel,desc_num = <1>; + }; + ldma-channels@4 { + reg = <4>; + intel,desc_num = <1>; + }; + ldma-channels@5 { + reg = <5>; + intel,desc_num = <1>; + }; + ldma-channels@6 { + reg = <6>; + intel,desc_num = <1>; + }; + ldma-channels@7 { + reg = <7>; + intel,desc_num = <1>; + }; + ldma-channels@8 { + reg = <8>; + }; + ldma-channels@9 { + reg = <9>; + }; + ldma-channels@10 { + reg = <10>; + }; + ldma-channels@11 { + reg = <11>; + }; + ldma-channels@12 { + reg = <12>; + }; + ldma-channels@13 { + reg = <13>; + }; + ldma-channels@14 { + reg = <14>; + }; + ldma-channels@15 { + reg = <15>; + }; + }; + }; + - | + dma3: dma-controller@ec800000 { + compatible = "intel,lgm-dma3"; + reg = <0xec800000 0x1000>; + clocks = <&cgu0 71>; + resets = <&rcu0 0x10 9>; + #dma-cells = <7>; + intel,dma-burst = <32>; + intel,dma-polling-cnt = <16>; + intel,dma-desc-in-sram; + intel,dma-orrc = <16>; + intel,dma-byte-en; + intel,dma-dburst-wr; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@12 { + reg = <12>; + intel,hdr-mode = <128 0>; + intel,hw-desc = <0x20000000 8>; + }; + ldma-channels@13 { + reg = <13>; + intel,hdr-mode = <128 0>; + }; + }; + };Signature · 1 line
2.11.0
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Hi Rob,
Thanks for your valuable comments. Please see my comments inline..
Quoted 48 lines · Rob Herring
Quoted 47 lines · Amireddy Mallikarjuna reddy
Add DT bindings YAML schema for DMA controller driver of Lightning Mountain(LGM) SoC.
Signed-off-by Amireddy Mallikarjuna reddy <[email protected]>---
v1:
- Initial version.v2:
- Fix bot errors.v3:
- No change.v4:
- Address Thomas langer comments
- use node name pattern as dma-controller as in common binding.
- Remove "_" (underscore) in instance name.
- Remove "port-" and "chan-" in attribute name for both 'dma-ports' & 'dma-channels' child nodes.v5:
- Moved some of the attributes in 'dma-ports' & 'dma-channels' child nodes to dma client/consumer side as cells in 'dmas' properties.--- .../devicetree/bindings/dma/intel,ldma.yaml | 319 +++++++++++++++++++++ 1 file changed, 319 insertions(+)create mode 100644
Documentation/devicetree/bindings/dma/intel,ldma.yamlDocumentation/devicetree/bindings/dma/intel,ldma.yaml new file +14
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/intel,ldma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Lightning Mountain centralized low speed DMA and high speed DMA controllers. + +maintainers: + - [email protected] + - [email protected] + +allOf: + - $ref: "dma-controller.yaml#"
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 21
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ +properties: + $nodename: + pattern: "^dma-controller(@.*)?$" + + "#dma-cells": + const: 1Example says 3.
OK, i will fix it.
Quoted 12 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 32
Quoted 12 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +11
-0+ + compatible: + anyOf: + - const: intel,lgm-cdma + - const: intel,lgm-dma2tx + - const: intel,lgm-dma1rx + - const: intel,lgm-dma1tx + - const: intel,lgm-dma0tx + - const: intel,lgm-dma3 + - const: intel,lgm-toe-dma30 + - const: intel,lgm-toe-dma31
Quoted 1 line
'anyOf' doesn't make sense here. This should be a single 'enum'.
ok. I will update it.
Quoted 80 lines
Quoted 80 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +79
-0+ + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + interrupts: + maxItems: 1 + + intel,dma-poll-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according + to the system application scenario. + + intel,dma-byte-en: + type: boolean + description: + DMA byte enable is only valid for DMA write(RX). + Byte enable(1) means DMA write will be based on the number of dwords + instead of the whole burst. + + intel,dma-drb: + type: boolean + description: + DMA descriptor read back to make sure data and desc synchronization. + + intel,dma-burst: + $ref: /schemas/types.yaml#definitions/uint32 + description: + Specifiy the DMA burst size(in dwords), the valid value will be 8, 16, 32. + Default is 16 for data path dma, 32 is for memcopy DMA. + + intel,dma-polling-cnt: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA descriptor polling counter. It may need fine tune according to + the system application scenario. + + intel,dma-desc-in-sram: + type: boolean + description: + DMA descritpors in SRAM or not. Some old controllers descriptors + can be in DRAM or SRAM. The new ones are all in SRAM. + + intel,dma-orrc: + $ref: /schemas/types.yaml#definitions/uint32 + description: + DMA outstanding read counter. The maximum value is 16, and it may + need fine tune according to the system application scenarios. + + intel,dma-dburst-wr: + type: boolean + description: + Enable RX dynamic burst write. It only applies to RX DMA and memcopy DMA. + + + dma-ports: + type: object + description: + This sub-node must contain a sub-node for each DMA port. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^dma-ports@[0-9]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5]
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 118
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ description: + Which port this node refers to. + + intel,name: + $ref: /schemas/types.yaml#definitions/string-array + description: + Port name of each DMA port.No other DMA controller needs this, why do you?
Answered below. (*ABC)
Quoted 9 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.
Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.
Quoted 41 lines
Quoted 41 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +40
-0+ + required: + - reg + - intel,name + - intel,chans + + + ldma-channels: + type: object + description: + This sub-node must contain a sub-node for each DMA channel. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^ldma-channels@[0-15]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + description: + Which channel this node refers to. + + intel,desc_num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per channel maximum descriptor number. The max value is 255. + + intel,hdr-mode: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The first parameter is header mode size, the second + parameter is checksum enable or disable. If enabled, + header mode size is ignored. If disabled, header mode + size must be provided.
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 171
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ + intel,hw-desc: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Per channel dma hardware descriptor configuration. + The first parameter is descriptor physical address and the + second parameter hardware descriptor number.Again, this all seems like per client information for dma cells.
Ok, if we move all these attributes to 'dmas' then 'dma-channels' child node is not needed in dtsi. #dma-cells number i am already using 7. If we move all these attributes to 'dmas' then integer cells will increase.
Is there any limitation in using a number of integer cells & as determined by the #dma-cells property?
Quoted 11 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 179
Quoted 9 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +8
-0+ + required: + - reg + +required: + - compatible + - reg + - '#dma-cells'Add:
Quoted 1 line
additionalProperties: false
Sure i will update it in the next patch..
Quoted 13 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 190
Quoted 12 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +11
-0+ +examples: + - | + dma0: dma-controller@e0e00000 { + compatible = "intel,lgm-cdma"; + reg = <0xe0e00000 0x1000>; + #dma-cells = <3>; + interrupt-parent = <&ioapic1>; + interrupts = <82 1>; + resets = <&rcu0 0x30 0>; + reset-names = "ctrl";Not documented.
ok. will Document in the next patch.
Quoted 133 lines
Quoted 133 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +129
-0+ clocks = <&cgu0 80>; + intel,dma-poll-cnt = <4>; + intel,dma-byte-en; + intel,dma-drb; + dma-ports { + #address-cells = <1>; + #size-cells = <0>; + + dma-ports@0 { + reg = <0>; + intel,name = "SPI0"; + intel,chans = <0 2>; + }; + dma-ports@1 { + reg = <1>; + intel,name = "SPI1"; + intel,chans = <2 2>; + }; + dma-ports@2 { + reg = <2>; + intel,name = "SPI2"; + intel,chans = <4 2>; + }; + dma-ports@3 { + reg = <3>; + intel,name = "SPI3"; + intel,chans = <6 2>; + }; + dma-ports@4 { + reg = <4>; + intel,name = "HSNAND"; + intel,chans = <8 2>; + }; + dma-ports@5 { + reg = <5>; + intel,name = "PCM"; + intel,chans = <10 6>; + }; + }; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@0 { + reg = <0>; + intel,desc_num = <1>; + }; + ldma-channels@1 { + reg = <1>; + intel,desc_num = <1>; + }; + ldma-channels@2 { + reg = <2>; + intel,desc_num = <1>; + }; + ldma-channels@3 { + reg = <3>; + intel,desc_num = <1>; + }; + ldma-channels@4 { + reg = <4>; + intel,desc_num = <1>; + }; + ldma-channels@5 { + reg = <5>; + intel,desc_num = <1>; + }; + ldma-channels@6 { + reg = <6>; + intel,desc_num = <1>; + }; + ldma-channels@7 { + reg = <7>; + intel,desc_num = <1>; + }; + ldma-channels@8 { + reg = <8>; + }; + ldma-channels@9 { + reg = <9>; + }; + ldma-channels@10 { + reg = <10>; + }; + ldma-channels@11 { + reg = <11>; + }; + ldma-channels@12 { + reg = <12>; + }; + ldma-channels@13 { + reg = <13>; + }; + ldma-channels@14 { + reg = <14>; + }; + ldma-channels@15 { + reg = <15>; + }; + }; + }; + - | + dma3: dma-controller@ec800000 { + compatible = "intel,lgm-dma3"; + reg = <0xec800000 0x1000>; + clocks = <&cgu0 71>; + resets = <&rcu0 0x10 9>; + #dma-cells = <7>; + intel,dma-burst = <32>; + intel,dma-polling-cnt = <16>; + intel,dma-desc-in-sram; + intel,dma-orrc = <16>; + intel,dma-byte-en; + intel,dma-dburst-wr; + ldma-channels { + #address-cells = <1>; + #size-cells = <0>; + + ldma-channels@12 { + reg = <12>; + intel,hdr-mode = <128 0>; + intel,hw-desc = <0x20000000 8>; + }; + ldma-channels@13 { + reg = <13>; + intel,hdr-mode = <128 0>; + }; + }; + };Signature · 1 line
2.11.0
Vinod Koul
maintainerRe: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Quoted 14 lines · MallikarjunaX
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 6 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.
Quoted 7 lines
Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.
Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
Only older soc it should create 16 channels and new 22 (hint this is hw description so perfectly okay to specify in DT or in using driver_data and compatible for each version
Quoted 49 lines
Quoted 41 lines
Quoted 41 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +40
-0+ + required: + - reg + - intel,name + - intel,chans + + + ldma-channels: + type: object + description: + This sub-node must contain a sub-node for each DMA channel. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^ldma-channels@[0-15]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + description: + Which channel this node refers to. + + intel,desc_num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per channel maximum descriptor number. The max value is 255. + + intel,hdr-mode: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The first parameter is header mode size, the second + parameter is checksum enable or disable. If enabled, + header mode size is ignored. If disabled, header mode + size must be provided.Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 171
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ + intel,hw-desc: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Per channel dma hardware descriptor configuration. + The first parameter is descriptor physical address and the + second parameter hardware descriptor number.Again, this all seems like per client information for dma cells.
Quoted 7 lines
Ok, if we move all these attributes to 'dmas' then 'dma-channels' child node is not needed in dtsi.
#dma-cells number i am already using 7. If we move all these attributes to 'dmas' then integer cells will increase.Is there any limitation in using a number of integer cells & as determined by the #dma-cells property?
No I dont think there is but it needs to make sense :-)
Signature · 1 line
~Vinod
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Hi Vinod,
Thanks for the review comments.
Quoted 19 lines · Vinod Koul
Quoted 17 lines · MallikarjunaX
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 6 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
Quoted 6 lines
Quoted 4 lines
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
OK. Agreed. I will remove port name from DT and only use intel,chans
Quoted 53 lines
Only older soc it should create 16 channels and new 22 (hint this is hw description so perfectly okay to specify in DT or in using
driver_dataand compatible for each versionQuoted 48 lines
Quoted 48 lines
Quoted 37 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +37
-0+ + required: + - reg + - intel,name + - intel,chans + + + ldma-channels: + type: object + description: + This sub-node must contain a sub-node for each DMA channel. + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^ldma-channels@[0-15]+$": + type: object + + properties: + reg: + items: + - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + description: + Which channel this node refers to. + + intel,desc_num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per channel maximum descriptor number. The max value is 255. + + intel,hdr-mode: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The first parameter is header mode size, the secondDocumentation/devicetree/bindings/dma/intel,ldma.yaml line 171
Quoted 10 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +10
-0+ parameter is checksum enable or disable. If enabled, + header mode size is ignored. If disabled, header mode + size must be provided. + + intel,hw-desc: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Per channel dma hardware descriptor configuration. + The first parameter is descriptor physical address and the + second parameter hardware descriptor number.Again, this all seems like per client information for dma cells.
Quoted 8 lines
Quoted 7 lines
Ok, if we move all these attributes to 'dmas' then 'dma-channels' child
node is not needed in dtsi.
#dma-cells number i am already using 7. If we move all these attributes to 'dmas' then integer cells will increase.Is there any limitation in using a number of integer cells & as determined by the #dma-cells property?
No I dont think there is but it needs to make sense :-)
OK.
Quoted 1 line
Vinod Koul
maintainerRe: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Quoted 23 lines · MallikarjunaX
Hi Vinod,
Thanks for the review comments.Quoted 19 lines · Vinod Koul
Quoted 17 lines · MallikarjunaX
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 6 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
OK. Agreed. I will remove port name from DT and only use intel,chans
what is intel,chans, why not use dma-channels?
Signature · 1 line
~Vinod
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Hi Vinod,
Thanks for the review. Please see my comment inline.
Quoted 24 lines · Vinod Koul
Quoted 23 lines · MallikarjunaX
Hi Vinod,
Thanks for the review comments.Quoted 19 lines · Vinod Koul
Quoted 17 lines · MallikarjunaX
Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 124
Quoted 6 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
Quoted 8 lines
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
OK. Agreed. I will remove port name from DT and only use intel,chans
what is intel,chans, why not use dma-channels?
The intel,chans says about the channels included on the correspondng port. Format is channel start number and how many channels on this port. The reasong behind using this attribute instead of standrad dma-channels is...
DMA_VER22 HW supports 22 channels. But there is a hole in HW, total it can use only 16.
Old soc supports 4ports and 16 channels.
New soc supports 6ports and 22 channels.
(old and new soc carry the same version VER22)
port channel mapping for the old and new soc also not the same. old soc: logical channels:(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - HSNAND
12, 14, 13, 15 - Memcopy
New soc: Logical channels(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - SPI2
6, 7 - SPI3
8, 9 - HSNAND
10 to 21 - Mcopy
Because of these reasons we are trying to use "intel,chans" attribute, and reading then number of channels from the dt. Advantaage:
1. we can map the channels correspondign to port
2. Dynamically configure the channels (due to hw limitation)
If this is not ok, please suggest us the better way to handle this.
Quoted 1 line
Vinod Koul
maintainerRe: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Quoted 33 lines · MallikarjunaX
Hi Vinod,
Thanks for the review. Please see my comment inline.
Quoted 28 lines · Vinod Koul
Quoted 27 lines · MallikarjunaX
Hi Vinod,
Thanks for the review comments.Quoted 23 lines · Vinod Koul
Quoted 21 lines · MallikarjunaX
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.
Quoted 5 lines
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
OK. Agreed. I will remove port name from DT and only use intel,chans
what is intel,chans, why not use dma-channels?
The intel,chans says about the channels included on the correspondng port.
What do you mean by a port here?
Quoted 1 line
Format is channel start number and how many channels on this port.
It is perfectly reasonable to have 16 channels but linux not use use all, lets say from 5th channel channel onwards
So you need to use standard dma-channels also with dma-channel-mask to specify which channels linux can use
Quoted 18 lines
The reasong behind using this attribute instead of standrad dma-channels is...
DMA_VER22HW supports 22 channels. But there is a hole in HW, total it can use only 16.Old soc supports 4ports and 16 channels.
New soc supports 6ports and 22 channels.
(old and new soc carry the same version VER22)port channel mapping for the old and new soc also not the same. old soc: logical channels:(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - HSNAND
12, 14, 13, 15 - Memcopy
Quoted 7 lines
New soc: Logical
channels(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - SPI2
6, 7 - SPI3
8, 9 - HSNAND
10 to 21 - Mcopy
Mapping is different, client can set that channel required in dmas property and use a specific required channel.
Quoted 8 lines
Because of these reasons we are trying to use "intel,chans" attribute, and reading then number of channels from the dt.
Advantaage:
1. we can map the channels correspondign to port
2. Dynamically configure the channels (due to hw limitation)If this is not ok, please suggest us the better way to handle this.
Quoted 1 line
Signature · 1 line
~Vinod
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Hi Vinod,
Thanks for the review, please see my comments inline.
Quoted 34 lines · Vinod Koul
Quoted 33 lines · MallikarjunaX
Hi Vinod,
Thanks for the review. Please see my comment inline.
Quoted 28 lines · Vinod Koul
Quoted 27 lines · MallikarjunaX
Hi Vinod,
Thanks for the review comments.Quoted 23 lines · Vinod Koul
Quoted 21 lines · MallikarjunaX
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ + intel,chans: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + The channels included on this port. Format is channel start + number and how many channels on this port.Why does this need to be in DT? This all seems like it can be in the dma cells for each client.
(*ABC)
Yes. We need this.
for dma0(lgm-cdma) old SOC supports 16 channels and the new SOC supports 22 channels. and the logical channel mapping for the peripherals also differ b/w old and new SOCs.Because of this hardware limitation we are trying to configure the total channels and port-channel mapping dynamically from device tree.
based on port name we are trying to configure the default values for different peripherals(ports).
Example: burst length is not same for all ports, so using port name to do default configurations.
Quoted 6 lines
Quoted 5 lines
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Sorry that does not make sense to me, why not specify the values to be used here instead of defining your own name scheme!
OK. Agreed. I will remove port name from DT and only use intel,chans
what is intel,chans, why not use dma-channels?
The intel,chans says about the channels included on the correspondng port.
What do you mean by a port here?
Here Port is nothing but Peripheral(SPI, HSNAND...)
Quoted 7 lines
Quoted 2 lines
Format is channel start number and how many channels on this port.
It is perfectly reasonable to have 16 channels but linux not use use all, lets say from 5th channel channel onwards
So you need to use standard dma-channels also with dma-channel-mask to specify which channels linux can use
Ok, let me verify and use the standard dma-channels also dma-channel-mask.
Quoted 26 lines
Quoted 19 lines
The reasong behind using this attribute instead of standrad dma-channels
is...
DMA_VER22HW supports 22 channels. But there is a hole in HW, total it can use only 16.Old soc supports 4ports and 16 channels.
New soc supports 6ports and 22 channels.
(old and new soc carry the same version VER22)port channel mapping for the old and new soc also not the same. old soc: logical channels:(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - HSNAND
12, 14, 13, 15 - MemcopyQuoted 7 lines
New soc: Logical
channels(Rx, Tx)
0, 1 - SPI0
2, 3 - SPI1
4, 5 - SPI2
6, 7 - SPI3
8, 9 - HSNAND
10 to 21 - Mcopy
Quoted 2 lines
Mapping is different, client can set that channel required in dmas property and use a specific required channel.
OK.
Quoted 8 lines
Quoted 8 lines
Because of these reasons we are trying to use "intel,chans" attribute, and reading then number of channels from the dt.
Advantaage:
1. we can map the channels correspondign to port
2. Dynamically configure the channels (due to hw limitation)If this is not ok, please suggest us the better way to handle this.
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
In reply to Reddy, MallikarjunaXQuoted 68 lines · MallikarjunaX
Hi Rob,
Thanks for your valuable comments. Please see my comments inline..Quoted 56 lines · Rob Herring
Quoted 54 lines · Amireddy Mallikarjuna reddy
Add DT bindings YAML schema for DMA controller driver of Lightning Mountain(LGM) SoC.
Signed-off-by: Amireddy Mallikarjuna reddy
<[email protected]>
---
v1:
- Initial version.v2:
- Fix bot errors.v3:
- No change.v4:
- Address Thomas langer comments
- use node name pattern as dma-controller as in common binding.
- Remove "_" (underscore) in instance name.
- Remove "port-" and "chan-" in attribute name for both 'dma-ports' & 'dma-channels' child nodes.v5:
- Moved some of the attributes in 'dma-ports' & 'dma-channels' child nodes to dma client/consumer side as cells in 'dmas' properties.
---
.../devicetree/bindings/dma/intel,ldma.yaml | 319
+++++++++++++++++++++1 file changed, 319 insertions(+)create mode 100644
Documentation/devicetree/bindings/dma/intel,ldma.yamlDocumentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/intel,ldma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Lightning Mountain centralized low speed DMA and high speedDMA controllers.
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ +maintainers: + - [email protected] + - [email protected] + +allOf: + - $ref: "dma-controller.yaml#"Quoted 8 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml line 21
Quoted 7 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0+ +properties: + $nodename: + pattern: "^dma-controller(@.*)?$" + + "#dma-cells": + const: 1Example says 3.
Quoted 1 line
OK, i will fix it.
It would help if you would add description of what is the meaning of the individual cell.
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 1/2] dt-bindings: dma: Add bindings for intel LGM SOC
Quoted 70 lines · Peter Ujfalusi
Quoted 68 lines · MallikarjunaX
Hi Rob,
Thanks for your valuable comments. Please see my comments inline..Quoted 64 lines · Rob Herring
Quoted 51 lines · Amireddy Mallikarjuna reddy
Add DT bindings YAML schema for DMA controller driver of Lightning Mountain(LGM) SoC.
Signed-off-by: Amireddy Mallikarjuna reddy
<[email protected]>
---
v1:
- Initial version.v2:
- Fix bot errors.v3:
- No change.v4:
- Address Thomas langer comments
- use node name pattern as dma-controller as in common binding.
- Remove "_" (underscore) in instance name.
- Remove "port-" and "chan-" in attribute name for both
'dma-ports' & 'dma-channels' child nodes.v5:
- Moved some of the attributes in 'dma-ports' & 'dma-channels' child nodes to dma client/consumer side as cells in 'dmas' properties.--- .../devicetree/bindings/dma/intel,ldma.yaml | 319 +++++++++++++++++++++ 1 file changed, 319 insertions(+)create mode 100644
Documentation/devicetree/bindings/dma/intel,ldma.yamlDocumentation/devicetree/bindings/dma/intel,ldma.yaml new file +7
-0@@ -0,0 +1,319 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/intel,ldma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Lightning Mountain centralized low speed DMA and high speedDMA controllers.
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +4
-0+ +maintainers: + - [email protected] + - [email protected]Documentation/devicetree/bindings/dma/intel,ldma.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/dma/intel,ldma.yaml new file +10
-0+ +allOf: + - $ref: "dma-controller.yaml#" + +properties: + $nodename: + pattern: "^dma-controller(@.*)?$" + + "#dma-cells": + const: 1Example says 3.
Quoted 3 lines
Quoted 1 line
OK, i will fix it.
It would help if you would add description of what is the meaning of the individual cell.
I am already prepared the patch by addressing previous comments and just before sending i received your review comment. :-)
Let me Edit , include the description and prepare the patch again.
Quoted 6 lines
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v5 2/2 Add Intel LGM soc DMA support.
In reply to Amireddy Mallikarjuna reddyAdd DMA controller driver for Lightning Mountain(LGM) family of SoCs.
The main function of the DMA controller is the transfer of data from/to any DPlus compliant peripheral to/from the memory. A memory to memory copy capability can also be configured.
This ldma driver is used for configure the device and channnels for data and control paths.
---
v1:
- Initial version.
v2:
- Fix device tree bot issues, correspondign driver changes done.
- Fix kerntel test robot warnings.
--------------------------------------------------------
Quoted 1 line
Quoted 1 line
drivers/dma/lgm/lgm-dma.c:729:5: warning: no previous prototype for function 'intel_dma_chan_desc_cfg' [-Wmissing-prototypes]
int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t desc_base,
^
drivers/dma/lgm/lgm-dma.c:729:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t desc_base,
^
static
1 warning generated.
vim +/intel_dma_chan_desc_cfg +729 drivers/dma/lgm/lgm-dma.c
728
Quoted 1 line
729 int intel_dma_chan_desc_cfg(struct
dma_chan*chan,dma_addr_tdesc_base,
730 int desc_num)
731 {
732 return ldma_chan_desc_cfg(to_ldma_chan(chan), desc_base, desc_num);
733 }
734 EXPORT_SYMBOL_GPL(intel_dma_chan_desc_cfg);
735---------------------------------------------------------------
v3:
- Fix smatch warning.
----------------------------------------------------------------
smatch warnings:
drivers/dma/lgm/lgm-dma.c:1306 ldma_cfg_init() error: uninitialized symbol 'ret'.
----------------------------------------------------------------
v4:
- Address Thomas Langer comments in dtbinding and corresponding driver side changes.
- Driver side changes to corresponding device tree changes.
v5:
- Add changes to read 'dmas' properties and update the config properties driver side.
- Add virt_dma_desc utilizes virt-dma API.
--- drivers/dma/Kconfig | 2 + drivers/dma/Makefile | 1 + drivers/dma/lgm/Kconfig | 9 + drivers/dma/lgm/Makefile | 2 + drivers/dma/lgm/lgm-dma.c | 1944 +++++++++++++++++++++++++++++++++++++++++++ include/linux/dma/lgm_dma.h | 27 + 6 files changed, 1985 insertions(+) create mode 100644 drivers/dma/lgm/Kconfig create mode 100644 drivers/dma/lgm/Makefile create mode 100644 drivers/dma/lgm/lgm-dma.c create mode 100644 include/linux/dma/lgm_dma.h
drivers/dma/Kconfig +2 -0
@@ -737,6 +737,8 @@ source "drivers/dma/ti/Kconfig" source "drivers/dma/fsl-dpaa2-qdma/Kconfig" +source "drivers/dma/lgm/Kconfig" + # clients comment "DMA Clients" depends on DMA_ENGINE
drivers/dma/Makefile +1 -0
@@ -83,6 +83,7 @@ obj-$(CONFIG_XGENE_DMA) += xgene-dma.o obj-$(CONFIG_ZX_DMA) += zx_dma.o obj-$(CONFIG_ST_FDMA) += st_fdma.o obj-$(CONFIG_FSL_DPAA2_QDMA) += fsl-dpaa2-qdma/ +obj-$(CONFIG_INTEL_LDMA) += lgm/ obj-y += mediatek/ obj-y += qcom/
drivers/dma/lgm/Kconfig new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +config INTEL_LDMA + bool "Lightning Mountain centralized low speed DMA and high speed DMA controllers" + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + help + Enable support for intel Lightning Mountain SOC DMA controllers. + These controllers provide DMA capabilities for a variety of on-chip + devices such as SSC, HSNAND and GSWIP.
drivers/dma/lgm/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_INTEL_LDMA) += lgm-dma.o
drivers/dma/lgm/lgm-dma.c new file +1944 -0
1,944 lines not on this page · raw message
include/linux/dma/lgm_dma.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2016 ~ 2019 Intel Corporation. +*/ +#ifndef LGM_DMA_H +#define LGM_DMA_H + +#include <linux/types.h> +#include <linux/dmaengine.h> + +/*! +* \fn int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t desc_base, +* int desc_num) +* \brief Configure low level channel descriptors +* \param[in] chan pointer to DMA channel that the client is using +* \param[in] desc_base descriptor base physical address +* \param[in] desc_num number of descriptors +* \return 0 on success +* \return kernel bug reported on failure +* +* This function configure the low level channel descriptors. It will be +* used by CBM whose descriptor is not DDR, actually some registers. +*/ +int intel_dma_chan_desc_cfg (struct dma_chan *chan,dma_addr_t desc_base, +int desc_num); + +#endif /* LGM_DMA_H */
Signature · 1 line
2.11.0
kernel test robot
build botRe: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Thank you for the patch! Perhaps something to improve:
Hi Amireddy,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on vkoul-dmaengine/next]
[also build test WARNING on v5.8 next-20200814]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Amireddy-Mallikarjuna-reddy/Add-Intel-LGM-soc-DMA-support/20200814-134726 base: https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next config: nios2-allyesconfig (attached as .config) compiler: nios2-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=nios2
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/dma/lgm/lgm-dma.c:1570:5: warning: no previous prototype for 'update_client_configs' [-Wmissing-prototypes]
1570 | int update_client_configs(struct of_dma *ofdma, struct of_phandle_args *spec)
| ^~~~~~~~~~~~~~~~~~~~~
vim +/update_client_configs +1570 drivers/dma/lgm/lgm-dma.c
1569
> 1570 int update_client_configs(struct of_dma *ofdma, struct of_phandle_args *spec)
1571 {
1572 struct ldma_dev *d = ofdma->of_dma_data;
1573 struct ldma_port *p;
1574 struct ldma_chan *c;
1575 u32 chan_id = spec->args[0];
1576 u32 port_id = spec->args[1];
1577
1578 if (chan_id >= d->chan_nrs || port_id >= d->port_nrs)
1579 return 0;
1580
1581 p = &d->ports[port_id];
1582 c = &d->chans[chan_id];
1583
1584 if (d->ver == DMA_VER22) {
1585 u32 burst = spec->args[2];
1586
1587 if (burst != 2 && burst != 4 && burst != 8)
1588 return 0;
1589
1590 /* TX and RX has the same burst length */
1591 p->txbl = ilog2(burst);
1592 p->rxbl = p->txbl;
1593
1594 ldma_port_cfg(p);
1595 } else {
1596 if (spec->args[2] > 0 && spec->args[2] <= DMA_ENDIAN_TYPE3) {
1597 c->data_endian = spec->args[2];
1598 c->data_endian_en = true;
1599 }
1600
1601 if (spec->args[3] > 0 && spec->args[3] <= DMA_ENDIAN_TYPE3) {
1602 c->desc_endian = spec->args[3];
1603 c->desc_endian_en = true;
1604 }
1605
1606 if (spec->args[4] > 0 && spec->args[4] < 128)
1607 c->boff_len = spec->args[4];
1608
1609 if (spec->args[5])
1610 c->desc_rx_np = true;
1611
1612 /*
1613 * If channel packet drop enabled, port packet drop should
1614 * be enabled
1615 */
1616 if (spec->args[6]) {
1617 c->pden = true;
1618 p->pkt_drop = DMA_PKT_DROP_EN;
1619 }
1620 ldma_port_cfg(p);
1621 ldma_chan_cfg(c);
1622 }
1623
1624 return 1;
1625 }
1626
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
In reply to Amireddy Mallikarjuna reddyHi,
Quoted 10 lines · Amireddy Mallikarjuna reddy
Add DMA controller driver for Lightning Mountain(LGM) family of SoCs.
The main function of the DMA controller is the transfer of data from/to any DPlus compliant peripheral to/from the memory. A memory to memory copy capability can also be configured.
This ldma driver is used for configure the device and channnels for data and control paths.
Signed-off-by Amireddy Mallikarjuna reddy <[email protected]>
...
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+static int ldma_chan_cfg (struct ldma_chan *c) +{ +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +u32 reg; + + reg = c->pden ?DMA_CCTRL_PDEN :0 ; + reg |= c->onoff ?DMA_CCTRL_ON :0 ; + reg |= c->rst ?DMA_CCTRL_RST :0 ; + +ldma_chan_cctrl_cfg (c, reg);
drivers/dma/lgm/lgm-dma.c line 942
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ldma_chan_irq_init (c); + +if (d->ver >DMA_VER22 ) { +ldma_chan_set_class (c, c->nr); +ldma_chan_byte_offset_cfg (c, c->boff_len); +ldma_chan_data_endian_cfg (c, c->data_endian_en, c->data_endian); +ldma_chan_desc_endian_cfg (c, c->desc_endian_en, c->desc_endian); +ldma_chan_hdr_mode_cfg (c, c->hdrm_len, c->hdrm_csum); +ldma_chan_rxwr_np_cfg (c, c->desc_rx_np); +ldma_chan_abc_cfg (c, c->abc_en);
Each of these functions will lock and unlock the same lock, would it make sense to restructur things to have less activity with the spinlock?
Quoted 7 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ +if (ldma_chan_is_hw_desc (c)) +ldma_chan_desc_hw_cfg (c, c->desc_phys, c->desc_cnt); + } + +return 0 ; +}
...
drivers/dma/lgm/lgm-dma.c line 1226
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +8
-0+static void dma_free_desc_resource (struct virt_dma_desc *vdesc) +{ +struct dw2_desc_sw *ds =to_lgm_dma_desc (vdesc); +struct ldma_chan *c = ds->chan; + +dma_pool_free (c->desc_pool, ds->desc_hw, ds->desc_phys); +kfree (ds); + c->ds =NULL ;
Is there a chance that c->ds != ds?
Quoted 52 lines
drivers/dma/lgm/lgm-dma.c new file +52
-0+} + +static struct dw2_desc_sw * +dma_alloc_desc_resource (int num,struct ldma_chan *c) +{ +struct device *dev = c->vchan.chan.device->dev; +struct dw2_desc_sw *ds; + +if (num > c->desc_num) { +dev_err (dev,"sg num %d exceed max %d\n" , num, c->desc_num); +return NULL ; + } + + ds =kzalloc (sizeof (*ds),GFP_NOWAIT ); +if (!ds) +return NULL ; + + ds->chan = c; + + ds->desc_hw =dma_pool_zalloc (c->desc_pool,GFP_ATOMIC , + &ds->desc_phys); +if (!ds->desc_hw) { +dev_dbg (dev,"out of memory for link descriptor\n" ); +kfree (ds); +return NULL ; + } + ds->desc_cnt = num; + +return ds; +} + +static void ldma_chan_irq_en (struct ldma_chan *c) +{ +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +unsigned long flags; + +spin_lock_irqsave (&d->dev_lock, flags); +writel (c->nr, d->base +DMA_CS ); +writel (DMA_CI_EOP , d->base +DMA_CIE ); +writel (BIT (c->nr), d->base +DMA_IRNEN ); +spin_unlock_irqrestore (&d->dev_lock, flags); +} + +static void dma_issue_pending (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +unsigned long flags; + +if (d->ver ==DMA_VER22 ) { +spin_lock_irqsave (&c->vchan.lock, flags); +if (vchan_issue_pending (&c->vchan)) {
drivers/dma/lgm/lgm-dma.c line 1288
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+struct virt_dma_desc *vdesc; + +/* Get the next descriptor */ + vdesc =vchan_next_desc (&c->vchan); +if (!vdesc) { + c->ds =NULL ; +return ; + } +list_del (&vdesc->node); + c->ds =to_lgm_dma_desc (vdesc);
you have set c->ds in dma_prep_slave_sg and the only way I can see that you will not leak memory is that the client must terminate_sync() after each transfer so that the synchronize callback is invoked between each prep_sg/issue_pending/competion.
drivers/dma/lgm/lgm-dma.c line 1292
Quoted 4 lines
drivers/dma/lgm/lgm-dma.c new file +4
-0+spin_unlock_irqrestore (&c->vchan.lock, flags); +ldma_chan_desc_hw_cfg (c, c->ds->desc_phys, c->ds->desc_cnt); +ldma_chan_irq_en (c); + }
If there is nothing peding, you will leave the spinlock wide open...
Quoted 122 lines
drivers/dma/lgm/lgm-dma.c new file +122
-0+ } +ldma_chan_on (c); +} + +static void dma_synchronize (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +/* +* clear any pending work if any. In that +* case the resource needs to be free here. +*/ +cancel_work_sync (&c->work); +vchan_synchronize (&c->vchan); +if (c->ds) +dma_free_desc_resource (&c->ds->vdesc); +} + +static int dma_terminate_all (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +unsigned long flags; +LIST_HEAD (head); + +spin_lock_irqsave (&c->vchan.lock, flags); +vchan_get_all_descriptors (&c->vchan, &head); +spin_unlock_irqrestore (&c->vchan.lock, flags); +vchan_dma_desc_free_list (&c->vchan, &head); + +return ldma_chan_reset (c); +} + +static int dma_resume_chan (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +ldma_chan_on (c); + +return 0 ; +} + +static int dma_pause_chan (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +return ldma_chan_off (c); +} + +static enum dma_status +dma_tx_status (struct dma_chan *chan,dma_cookie_t cookie, +struct dma_tx_state *txstate) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +enum dma_status status =DMA_COMPLETE ; + +if (d->ver ==DMA_VER22 ) + status =dma_cookie_status (chan, cookie, txstate); + +return status; +} + +static void dma_chan_irq (int irq,void *data) +{ +struct ldma_chan *c = data; +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +u32 stat; + +/* Disable channel interrupts */ +writel (c->nr, d->base +DMA_CS ); + stat =readl (d->base +DMA_CIS ); +if (!stat) +return ; + +writel (readl (d->base +DMA_CIE ) & ~DMA_CI_ALL , d->base +DMA_CIE ); +writel (stat, d->base +DMA_CIS ); +queue_work (d->wq, &c->work); +} + +static irqreturn_t dma_interrupt (int irq,void *dev_id) +{ +struct ldma_dev *d = dev_id; +struct ldma_chan *c; +unsigned long irncr; +u32 cid; + + irncr =readl (d->base +DMA_IRNCR ); +if (!irncr) { +dev_err (d->dev,"dummy interrupt\n" ); +return IRQ_NONE ; + } + +for_each_set_bit (cid, &irncr, d->chan_nrs) { +/* Mask */ +writel (readl (d->base +DMA_IRNEN ) & ~BIT (cid), d->base +DMA_IRNEN ); +/* Ack */ +writel (readl (d->base +DMA_IRNCR ) |BIT (cid), d->base +DMA_IRNCR ); + + c = &d->chans[cid]; +dma_chan_irq (irq, c); + } + +return IRQ_HANDLED ; +} + +static struct dma_async_tx_descriptor * +dma_prep_slave_sg (struct dma_chan *chan,struct scatterlist *sgl, +unsigned int sglen,enum dma_transfer_direction dir, +unsigned long flags,void *context) +{ +struct ldma_chan *c =to_ldma_chan (chan); +size_t len, avail, total =0 ; +struct dw2_desc *hw_ds; +struct dw2_desc_sw *ds; +struct scatterlist *sg; +int num = sglen, i; +dma_addr_t addr; + +if (!sgl) +return NULL ; + +for_each_sg (sgl, sg, sglen, i) {
drivers/dma/lgm/lgm-dma.c line 1424
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ avail =sg_dma_len (sg); +if (avail >DMA_MAX_SIZE ) + num +=DIV_ROUND_UP (avail,DMA_MAX_SIZE ) -1 ; + } + + ds =dma_alloc_desc_resource (num, c); +if (!ds) +return NULL ; + + c->ds = ds;
If you still have a transfer running then you are going to get lost that dscriptor?
Quoted 55 lines
drivers/dma/lgm/lgm-dma.c new file +55
-0+ + num =0 ; +/* sop and eop has to be handled nicely */ +for_each_sg (sgl, sg, sglen, i) { + addr =sg_dma_address (sg); + avail =sg_dma_len (sg); + total += avail; + +do { + len =min_t (size_t, avail,DMA_MAX_SIZE ); + + hw_ds = &ds->desc_hw[num]; +switch (sglen) { +case 1 : + hw_ds->status.field.sop =1 ; + hw_ds->status.field.eop =1 ; +break ; +default : +if (num ==0 ) { + hw_ds->status.field.sop =1 ; + hw_ds->status.field.eop =0 ; + }else if (num == (sglen -1 )) { + hw_ds->status.field.sop =0 ; + hw_ds->status.field.eop =1 ; + }else { + hw_ds->status.field.sop =0 ; + hw_ds->status.field.eop =0 ; + } +break ; + } + +/* Only 32 bit address supported */ + hw_ds->addr = (u32 )addr; + hw_ds->status.field.len = len; + hw_ds->status.field.c =0 ; + hw_ds->status.field.bofs = addr &0x3 ; +/* Ensure data ready before ownership change */ +wmb (); + hw_ds->status.field.own =DMA_OWN ; +/* Ensure ownership changed before moving forward */ +wmb (); + num++; + addr += len; + avail -= len; + }while (avail); + } + + ds->size = total; + +return vchan_tx_prep (&c->vchan, &ds->vdesc,DMA_CTRL_ACK ); +} + +static int +dma_slave_config (struct dma_chan *chan,struct dma_slave_config *cfg) +{
drivers/dma/lgm/lgm-dma.c line 1489
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +struct ldma_port *p = c->port; +unsigned long flags; +u32 bl; + + if ((cfg->direction == DMA_DEV_TO_MEM && + cfg->src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) || + (cfg->direction == DMA_MEM_TO_DEV && + cfg->dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||
According to the probe function these width restrictions are only valid for DMA_VER22?
drivers/dma/lgm/lgm-dma.c line 1495
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ !is_slave_direction(cfg->direction)) +return -EINVAL ; + +/* Default setting will be used */ +if (!cfg->src_maxburst && !cfg->dst_maxburst) +return 0 ;
maxburst == 0 is identical to maxburst == 1, it is just not set explicitly. Iow 1 word per DMA request.
Quoted 7 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ +/* Must be the same */ +if (cfg->src_maxburst && cfg->dst_maxburst && + cfg->src_maxburst != cfg->dst_maxburst) +return -EINVAL ; + +if (cfg->dst_maxburst)
drivers/dma/lgm/lgm-dma.c line 1512
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ cfg->src_maxburst = cfg->dst_maxburst; + + bl =ilog2 (cfg->src_maxburst); + +spin_lock_irqsave (&d->dev_lock, flags); +writel (p->portid, d->base +DMA_PS ); +ldma_update_bits (d,DMA_PCTRL_RXBL |DMA_PCTRL_TXBL , +FIELD_PREP (DMA_PCTRL_RXBL , bl) | +FIELD_PREP (DMA_PCTRL_TXBL , bl),DMA_PCTRL ); +spin_unlock_irqrestore (&d->dev_lock, flags);
What drivers usually do is to save the cfg and inprepare time take it into account when setting up the transfer.
Write the change to the HW before the trasnfer is started (if it has changed from previous settings)
Client drivers usually set the slave config ones, in most cases during probe, so the slave config rarely changes runtime, but there are cases for that.
Quoted 45 lines
drivers/dma/lgm/lgm-dma.c new file +45
-0+ +return 0 ; +} + +static int dma_alloc_chan_resources (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +struct device *dev = c->vchan.chan.device->dev; +size_t desc_sz; + +if (d->ver >DMA_VER22 ) { + c->flags |=CHAN_IN_USE ; +return 0 ; + } + +if (c->desc_pool) +return c->desc_num; + + desc_sz = c->desc_num *sizeof (struct dw2_desc ); + c->desc_pool =dma_pool_create (c->name, dev, desc_sz, + __alignof__(struct dw2_desc ),0 ); + +if (!c->desc_pool) { +dev_err (dev,"unable to allocate descriptor pool\n" ); +return -ENOMEM ; + } + +return c->desc_num; +} + +static void dma_free_chan_resources (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); + +if (d->ver ==DMA_VER22 ) { +dma_pool_destroy (c->desc_pool); + c->desc_pool =NULL ; +vchan_free_chan_resources (to_virt_chan (chan)); +ldma_chan_reset (c); + }else { + c->flags &= ~CHAN_IN_USE ; + } +}
drivers/dma/lgm/lgm-dma.c line 1567
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ +static void dma_work (struct work_struct *work) +{ + struct ldma_chan *c = container_of(work, struct ldma_chan, work); +struct dma_async_tx_descriptor *tx = &c->ds->vdesc.tx; +struct dmaengine_desc_callback cb; + +dmaengine_desc_get_callback (tx, &cb); +dma_cookie_complete (tx); +dmaengine_desc_callback_invoke (&cb,NULL );
When you are going to free up the descriptor?
Quoted 307 lines
drivers/dma/lgm/lgm-dma.c new file +307
-0+} + +int update_client_configs (struct of_dma *ofdma,struct of_phandle_args *spec) +{ +struct ldma_dev *d = ofdma->of_dma_data; +struct ldma_port *p; +struct ldma_chan *c; +u32 chan_id = spec->args[0 ]; +u32 port_id = spec->args[1 ]; + +if (chan_id >= d->chan_nrs || port_id >= d->port_nrs) +return 0 ; + + p = &d->ports[port_id]; + c = &d->chans[chan_id]; + +if (d->ver ==DMA_VER22 ) { +u32 burst = spec->args[2 ]; + +if (burst !=2 && burst !=4 && burst !=8 ) +return 0 ; + +/* TX and RX has the same burst length */ + p->txbl =ilog2 (burst); + p->rxbl = p->txbl; + +ldma_port_cfg (p); + }else { +if (spec->args[2 ] >0 && spec->args[2 ] <=DMA_ENDIAN_TYPE3 ) { + c->data_endian = spec->args[2 ]; + c->data_endian_en = true; + } + +if (spec->args[3 ] >0 && spec->args[3 ] <=DMA_ENDIAN_TYPE3 ) { + c->desc_endian = spec->args[3 ]; + c->desc_endian_en = true; + } + +if (spec->args[4 ] >0 && spec->args[4 ] <128 ) + c->boff_len = spec->args[4 ]; + +if (spec->args[5 ]) + c->desc_rx_np = true; + +/* +* If channel packet drop enabled, port packet drop should +* be enabled +*/ +if (spec->args[6 ]) { + c->pden = true; + p->pkt_drop =DMA_PKT_DROP_EN ; + } +ldma_port_cfg (p); +ldma_chan_cfg (c); + } + +return 1 ; +} + +static struct dma_chan *ldma_xlate (struct of_phandle_args *spec, +struct of_dma *ofdma) +{ +struct ldma_dev *d = ofdma->of_dma_data; +u32 chan_id = spec->args[0 ]; +int ret; + +if (!spec->args_count) +return NULL ; + +/* if args_count is 1 use driver default config settings */ +if (spec->args_count >1 ) { + ret =update_client_configs (ofdma, spec); +if (!ret) +return NULL ; + } + +return dma_get_slave_channel (&d->chans[chan_id].vchan.chan); +} + +static void ldma_clk_disable (void *data) +{ +struct ldma_dev *d = data; + +clk_disable_unprepare (d->core_clk); +} + +static struct dma_dev_ops dma0_ops = { + .device_alloc_chan_resources = dma_alloc_chan_resources, + .device_free_chan_resources = dma_free_chan_resources, + .device_config = dma_slave_config, + .device_prep_slave_sg = dma_prep_slave_sg, + .device_tx_status = dma_tx_status, + .device_pause = dma_pause_chan, + .device_resume = dma_resume_chan, + .device_terminate_all = dma_terminate_all, + .device_synchronize = dma_synchronize, + .device_issue_pending = dma_issue_pending, +}; + +static struct dma_dev_ops hdma_ops = { + .device_alloc_chan_resources = dma_alloc_chan_resources, + .device_free_chan_resources = dma_free_chan_resources, + .device_terminate_all = dma_terminate_all, + .device_issue_pending = dma_issue_pending, + .device_tx_status = dma_tx_status, + .device_resume = dma_resume_chan, + .device_pause = dma_pause_chan, +}; + +static const struct ldma_inst_data dma0 = { + .name ="dma0" , + .ops = &dma0_ops, +}; + +static const struct ldma_inst_data dma2tx = { + .name ="dma2tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma1rx = { + .name ="dma1rx" , + .type =DMA_TYPE_RX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma1tx = { + .name ="dma1tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma0tx = { + .name ="dma0tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma3 = { + .name ="dma3" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data toe_dma30 = { + .name ="toe_dma30" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data toe_dma31 = { + .name ="toe_dma31" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct of_device_id intel_ldma_match[] = { + { .compatible ="intel,lgm-cdma" , .data = &dma0}, + { .compatible ="intel,lgm-dma2tx" , .data = &dma2tx}, + { .compatible ="intel,lgm-dma1rx" , .data = &dma1rx}, + { .compatible ="intel,lgm-dma1tx" , .data = &dma1tx}, + { .compatible ="intel,lgm-dma0tx" , .data = &dma0tx}, + { .compatible ="intel,lgm-dma3" , .data = &dma3}, + { .compatible ="intel,lgm-toe-dma30" , .data = &toe_dma30}, + { .compatible ="intel,lgm-toe-dma31" , .data = &toe_dma31}, + {} +}; + +static int intel_ldma_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct dma_device *dma_dev; +struct ldma_chan *c; +struct ldma_port *p; +struct ldma_dev *d; +u32 id, bitn =32 ; +int i, j, k, ret; + + d =devm_kzalloc (dev,sizeof (*d),GFP_KERNEL ); +if (!d) +return -ENOMEM ; + +/* Link controller to platform device */ + d->dev = &pdev->dev; + + d->inst =device_get_match_data (dev); +if (!d->inst) { +dev_err (dev,"No device match found\n" ); +return -ENODEV ; + } + + d->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (d->base)) +return PTR_ERR (d->base); + +/* Power up and reset the dma engine, some DMAs always on?? */ + d->core_clk =devm_clk_get_optional (dev,NULL ); +if (IS_ERR (d->core_clk)) +return PTR_ERR (d->core_clk); +clk_prepare_enable (d->core_clk); + + ret =devm_add_action_or_reset (dev, ldma_clk_disable, d); +if (ret) { +dev_err (dev,"Failed to devm_add_action_or_reset, %d\n" , ret); +return ret; + } + + d->rst =devm_reset_control_get_optional (dev,NULL ); +if (IS_ERR (d->rst)) +return PTR_ERR (d->rst); +reset_control_deassert (d->rst); + + id =readl (d->base +DMA_ID ); + d->chan_nrs =FIELD_GET (DMA_ID_CHNR , id); + d->port_nrs =FIELD_GET (DMA_ID_PNR , id); + d->ver =FIELD_GET (DMA_ID_REV , id); + +if (id &DMA_ID_AW_36B ) + d->flags |=DMA_ADDR_36BIT ; + +if (IS_ENABLED (CONFIG_64BIT )) { +if (id &DMA_ID_AW_36B ) + bitn =36 ; + } + +if (id &DMA_ID_DW_128B ) + d->flags |=DMA_DATA_128BIT ; + + ret =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (bitn)); +if (ret) { +dev_err (dev,"No usable DMA configuration\n" ); +return ret; + } + +if (d->ver ==DMA_VER22 ) { + d->irq =platform_get_irq (pdev,0 ); +if (d->irq <0 ) +return d->irq; + + ret =devm_request_irq (&pdev->dev, d->irq, dma_interrupt, +0 ,DRIVER_NAME , d); +if (ret) +return ret; + + d->wq =alloc_ordered_workqueue ("dma_wq" ,WQ_MEM_RECLAIM | +WQ_HIGHPRI ); +if (!d->wq) +return -ENOMEM ; + } + + dma_dev = &d->dma_dev; +dma_cap_set (DMA_SLAVE , dma_dev->cap_mask); + +/* Channel initializations */ +INIT_LIST_HEAD (&dma_dev->channels); + +/* Port Initializations */ + d->ports =devm_kcalloc (dev, d->port_nrs,sizeof (*p),GFP_KERNEL ); +if (!d->ports) +return -ENOMEM ; + +for (i =0 ; i < d->port_nrs; i++) { + p = &d->ports[i]; + p->portid = i; + p->ldev = d; + } + + ret =ldma_cfg_init (d); +if (ret) +return ret; + + dma_dev->dev = &pdev->dev; +/* +* Link channel id to channel index and link to dma channel list +* It also back points to controller and its port +*/ +for (i =0 , k =0 ; i < d->port_nrs; i++) { +if (d->ver ==DMA_VER22 ) { +u32 chan_end; + + p = &d->ports[i]; + chan_end = p->chan_start + p->chan_sz; +for (j = p->chan_start; j < chan_end; j++) { + c = &d->chans[k]; + c->port = p; + c->nr = j;/* Real channel number */ + c->rst =DMA_CHAN_RST ; +snprintf (c->name,sizeof (c->name),"chan%d" , + c->nr); +INIT_WORK (&c->work, dma_work); + c->vchan.desc_free = dma_free_desc_resource; +vchan_init (&c->vchan, dma_dev); + k++; + } + }else { + p = &d->ports[i]; +for (i =0 ; i < d->chan_nrs; i++) { + c = &d->chans[i]; + c->port = p; + c->data_endian =DMA_DFT_ENDIAN ; + c->desc_endian =DMA_DFT_ENDIAN ; + c->data_endian_en = false; + c->desc_endian_en = false; + c->desc_rx_np = false; + c->flags |=DEVICE_ALLOC_DESC ; + c->onoff =DMA_CH_OFF ; + c->rst =DMA_CHAN_RST ;
drivers/dma/lgm/lgm-dma.c line 1884
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ c->abc_en = true; + c->nr = i; + c->vchan.desc_free = dma_free_desc_resource; +vchan_init (&c->vchan, dma_dev); + } + } + } + +/* Set DMA capabilities */ +dma_cap_zero (dma_dev->cap_mask);
You just cleared the DMA_SLAVE capability you set earlier...
Quoted 12 lines
drivers/dma/lgm/lgm-dma.c new file +12
-0+ + dma_dev->device_alloc_chan_resources = + d->inst->ops->device_alloc_chan_resources; + dma_dev->device_free_chan_resources = + d->inst->ops->device_free_chan_resources; + dma_dev->device_terminate_all = d->inst->ops->device_terminate_all; + dma_dev->device_issue_pending = d->inst->ops->device_issue_pending; + dma_dev->device_tx_status = d->inst->ops->device_tx_status; + dma_dev->device_resume = d->inst->ops->device_resume; + dma_dev->device_pause = d->inst->ops->device_pause; + dma_dev->device_config = d->inst->ops->device_config; + dma_dev->device_prep_slave_sg = d->inst->ops->device_prep_slave_sg;
drivers/dma/lgm/lgm-dma.c line 1906
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ dma_dev->device_synchronize = d->inst->ops->device_synchronize; + +if (d->ver ==DMA_VER22 ) { + dma_dev->src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); + dma_dev->dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); + dma_dev->directions =BIT (DMA_MEM_TO_DEV ) | +BIT (DMA_DEV_TO_MEM ); + dma_dev->residue_granularity = +DMA_RESIDUE_GRANULARITY_DESCRIPTOR ; + }
So, if version is != DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?
Quoted 62 lines
drivers/dma/lgm/lgm-dma.c new file +38
-0+ +platform_set_drvdata (pdev, d); + +ldma_dev_init (d); + + ret =dma_async_device_register (dma_dev); +if (ret) { +dev_err (dev,"Failed to register slave DMA engine device\n" ); +return ret; + } + + ret =of_dma_controller_register (pdev->dev.of_node, ldma_xlate, d); +if (ret) { +dev_err (dev,"Failed to register of DMA controller\n" ); +dma_async_device_unregister (dma_dev); +return ret; + } + +dev_info (dev,"Init done - rev: %x, ports: %d channels: %d\n" , d->ver, + d->port_nrs, d->chan_nrs); + +return 0 ; +} + +static struct platform_driver intel_ldma_driver = { + .probe = intel_ldma_probe, + .driver = { + .name =DRIVER_NAME , + .of_match_table = intel_ldma_match, + }, +}; + +static int __init intel_ldma_init (void ) +{ +return platform_driver_register (&intel_ldma_driver); +} + +device_initcall (intel_ldma_init);include/linux/dma/lgm_dma.h new file +17
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2016 ~ 2019 Intel Corporation. +*/ +#ifndef LGM_DMA_H +#define LGM_DMA_H + +#include <linux/types.h> +#include <linux/dmaengine.h> + +/*! +* \fn int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t desc_base, +* int desc_num) +* \brief Configure low level channel descriptors +* \param[in] chan pointer to DMA channel that the client is using +* \param[in] desc_base descriptor base physical address +* \param[in] desc_num number of descriptors
include/linux/dma/lgm_dma.h line 27
Quoted 10 lines
include/linux/dma/lgm_dma.h new file +10
-0+* \return 0 on success +* \return kernel bug reported on failure +* +* This function configure the low level channel descriptors. It will be +* used by CBM whose descriptor is not DDR, actually some registers. +*/ +int intel_dma_chan_desc_cfg (struct dma_chan *chan,dma_addr_t desc_base, +int desc_num); + +#endif /* LGM_DMA_H */
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
On 18/08/2020 13.16, Peter Ujfalusi wrote:
...
Quoted 25 lines
Quoted 9 lines
drivers/dma/lgm/lgm-dma.c new file +9
-0+static void dma_issue_pending (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +unsigned long flags; + +if (d->ver ==DMA_VER22 ) { +spin_lock_irqsave (&c->vchan.lock, flags); +if (vchan_issue_pending (&c->vchan)) {drivers/dma/lgm/lgm-dma.c line 1288
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+struct virt_dma_desc *vdesc; + +/* Get the next descriptor */ + vdesc =vchan_next_desc (&c->vchan); +if (!vdesc) { + c->ds =NULL ; +return ; + } +list_del (&vdesc->node); + c->ds =to_lgm_dma_desc (vdesc);you have set
c->dsindma_prep_slave_sgand the only way I can see that you will not leak memory is that the client mustterminate_sync()after each transfer so that the synchronize callback is invoked between each prep_sg/issue_pending/competion.
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c line 1292
Quoted 4 lines
drivers/dma/lgm/lgm-dma.c new file +4
-0+spin_unlock_irqrestore (&c->vchan.lock, flags); +ldma_chan_desc_hw_cfg (c, c->ds->desc_phys, c->ds->desc_cnt); +ldma_chan_irq_en (c); + }If there is nothing pending, you will leave the spinlock wide open...
you leave it locked...
Quoted 4 lines
drivers/dma/lgm/lgm-dma.c line 1295
Quoted 4 lines
drivers/dma/lgm/lgm-dma.c new file +3
-0+ } +ldma_chan_on (c); +}
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
In reply to Peter UjfalusiHi Peter,
Thanks for the review comments. Please see my comments inline..
Quoted 29 lines · Peter Ujfalusi
Hi,
Quoted 10 lines · Amireddy Mallikarjuna reddy
Add DMA controller driver for Lightning Mountain(LGM) family of SoCs.
The main function of the DMA controller is the transfer of data from/to any DPlus compliant peripheral to/from the memory. A memory to memory copy capability can also be configured.
This ldma driver is used for configure the device and channnels for data and control paths.
Signed-off-by Amireddy Mallikarjuna reddy <[email protected]>...
Quoted 14 lines
drivers/dma/lgm/lgm-dma.c new file +14
-0+static int ldma_chan_cfg (struct ldma_chan *c) +{ +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +u32 reg; + + reg = c->pden ?DMA_CCTRL_PDEN :0 ; + reg |= c->onoff ?DMA_CCTRL_ON :0 ; + reg |= c->rst ?DMA_CCTRL_RST :0 ; + +ldma_chan_cctrl_cfg (c, reg); +ldma_chan_irq_init (c); + +if (d->ver >DMA_VER22 ) { +ldma_chan_set_class (c, c->nr);
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 942
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ldma_chan_byte_offset_cfg (c, c->boff_len); +ldma_chan_data_endian_cfg (c, c->data_endian_en, c->data_endian); +ldma_chan_desc_endian_cfg (c, c->desc_endian_en, c->desc_endian); +ldma_chan_hdr_mode_cfg (c, c->hdrm_len, c->hdrm_csum); +ldma_chan_rxwr_np_cfg (c, c->desc_rx_np); +ldma_chan_abc_cfg (c, c->abc_en);Each of these functions will lock and unlock the same lock, would it make sense to restructur things to have less activity with the spinlock?
Ok. Instead of lock & unlock at each function i will try to lock & unlock only once from here.
Quoted 10 lines
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ +if (ldma_chan_is_hw_desc (c)) +ldma_chan_desc_hw_cfg (c, c->desc_phys, c->desc_cnt); + } + +return 0 ; +}...
Quoted 9 lines
drivers/dma/lgm/lgm-dma.c line 1226
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +8
-0+static void dma_free_desc_resource (struct virt_dma_desc *vdesc) +{ +struct dw2_desc_sw *ds =to_lgm_dma_desc (vdesc); +struct ldma_chan *c = ds->chan; + +dma_pool_free (c->desc_pool, ds->desc_hw, ds->desc_phys); +kfree (ds); + c->ds =NULL ;Is there a chance that
c->ds!= ds?
No, from the code i don't see any such scenario, let me know if you find any corner case.
Quoted 59 lines
Quoted 59 lines
drivers/dma/lgm/lgm-dma.c new file +58
-0+} + +static struct dw2_desc_sw * +dma_alloc_desc_resource (int num,struct ldma_chan *c) +{ +struct device *dev = c->vchan.chan.device->dev; +struct dw2_desc_sw *ds; + +if (num > c->desc_num) { +dev_err (dev,"sg num %d exceed max %d\n" , num, c->desc_num); +return NULL ; + } + + ds =kzalloc (sizeof (*ds),GFP_NOWAIT ); +if (!ds) +return NULL ; + + ds->chan = c; + + ds->desc_hw =dma_pool_zalloc (c->desc_pool,GFP_ATOMIC , + &ds->desc_phys); +if (!ds->desc_hw) { +dev_dbg (dev,"out of memory for link descriptor\n" ); +kfree (ds); +return NULL ; + } + ds->desc_cnt = num; + +return ds; +} + +static void ldma_chan_irq_en (struct ldma_chan *c) +{ +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +unsigned long flags; + +spin_lock_irqsave (&d->dev_lock, flags); +writel (c->nr, d->base +DMA_CS ); +writel (DMA_CI_EOP , d->base +DMA_CIE ); +writel (BIT (c->nr), d->base +DMA_IRNEN ); +spin_unlock_irqrestore (&d->dev_lock, flags); +} + +static void dma_issue_pending (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +unsigned long flags; + +if (d->ver ==DMA_VER22 ) { +spin_lock_irqsave (&c->vchan.lock, flags); +if (vchan_issue_pending (&c->vchan)) { +struct virt_dma_desc *vdesc; + +/* Get the next descriptor */ + vdesc =vchan_next_desc (&c->vchan); +if (!vdesc) { + c->ds =NULL ;
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1288
Quoted 4 lines
drivers/dma/lgm/lgm-dma.c new file +4
-0+return ; + } +list_del (&vdesc->node); + c->ds =to_lgm_dma_desc (vdesc);you have set
c->dsindma_prep_slave_sgand the only way I can see that you will not leak memory is that the client mustterminate_sync()after each transfer so that the synchronize callback is invoked between each prep_sg/issue_pending/competion.
Yes, client must call dmaengine_synchronize after each transfer to make sure free the memory assoicated with previously issued descriptors if any. and also from the driver we are freeing up the descriptor from work queue atfer each transfer.(addressed below comments **)
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c line 1292
Quoted 5 lines
drivers/dma/lgm/lgm-dma.c new file +4
-0+spin_unlock_irqrestore (&c->vchan.lock, flags); +ldma_chan_desc_hw_cfg (c, c->ds->desc_phys, c->ds->desc_cnt); +ldma_chan_irq_en (c); + }If there is nothing peding, you will leave the spinlock wide open...
Seems i misplaced the lock. i will fix it in next version.
Quoted 127 lines
Quoted 127 lines
drivers/dma/lgm/lgm-dma.c new file +126
-0+ } +ldma_chan_on (c); +} + +static void dma_synchronize (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +/* +* clear any pending work if any. In that +* case the resource needs to be free here. +*/ +cancel_work_sync (&c->work); +vchan_synchronize (&c->vchan); +if (c->ds) +dma_free_desc_resource (&c->ds->vdesc); +} + +static int dma_terminate_all (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +unsigned long flags; +LIST_HEAD (head); + +spin_lock_irqsave (&c->vchan.lock, flags); +vchan_get_all_descriptors (&c->vchan, &head); +spin_unlock_irqrestore (&c->vchan.lock, flags); +vchan_dma_desc_free_list (&c->vchan, &head); + +return ldma_chan_reset (c); +} + +static int dma_resume_chan (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +ldma_chan_on (c); + +return 0 ; +} + +static int dma_pause_chan (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); + +return ldma_chan_off (c); +} + +static enum dma_status +dma_tx_status (struct dma_chan *chan,dma_cookie_t cookie, +struct dma_tx_state *txstate) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +enum dma_status status =DMA_COMPLETE ; + +if (d->ver ==DMA_VER22 ) + status =dma_cookie_status (chan, cookie, txstate); + +return status; +} + +static void dma_chan_irq (int irq,void *data) +{ +struct ldma_chan *c = data; +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +u32 stat; + +/* Disable channel interrupts */ +writel (c->nr, d->base +DMA_CS ); + stat =readl (d->base +DMA_CIS ); +if (!stat) +return ; + +writel (readl (d->base +DMA_CIE ) & ~DMA_CI_ALL , d->base +DMA_CIE ); +writel (stat, d->base +DMA_CIS ); +queue_work (d->wq, &c->work); +} + +static irqreturn_t dma_interrupt (int irq,void *dev_id) +{ +struct ldma_dev *d = dev_id; +struct ldma_chan *c; +unsigned long irncr; +u32 cid; + + irncr =readl (d->base +DMA_IRNCR ); +if (!irncr) { +dev_err (d->dev,"dummy interrupt\n" ); +return IRQ_NONE ; + } + +for_each_set_bit (cid, &irncr, d->chan_nrs) { +/* Mask */ +writel (readl (d->base +DMA_IRNEN ) & ~BIT (cid), d->base +DMA_IRNEN ); +/* Ack */ +writel (readl (d->base +DMA_IRNCR ) |BIT (cid), d->base +DMA_IRNCR ); + + c = &d->chans[cid]; +dma_chan_irq (irq, c); + } + +return IRQ_HANDLED ; +} + +static struct dma_async_tx_descriptor * +dma_prep_slave_sg (struct dma_chan *chan,struct scatterlist *sgl, +unsigned int sglen,enum dma_transfer_direction dir, +unsigned long flags,void *context) +{ +struct ldma_chan *c =to_ldma_chan (chan); +size_t len, avail, total =0 ; +struct dw2_desc *hw_ds; +struct dw2_desc_sw *ds; +struct scatterlist *sg; +int num = sglen, i; +dma_addr_t addr; + +if (!sgl) +return NULL ; + +for_each_sg (sgl, sg, sglen, i) { + avail =sg_dma_len (sg); +if (avail >DMA_MAX_SIZE ) + num +=DIV_ROUND_UP (avail,DMA_MAX_SIZE ) -1 ; + }
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1424
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ + ds =dma_alloc_desc_resource (num, c); +if (!ds) +return NULL ; + + c->ds = ds;If you still have a transfer running then you are going to get lost that dscriptor?
No, please let me know if you find any such corner case.
Quoted 60 lines
Quoted 60 lines
drivers/dma/lgm/lgm-dma.c new file +59
-0+ + num =0 ; +/* sop and eop has to be handled nicely */ +for_each_sg (sgl, sg, sglen, i) { + addr =sg_dma_address (sg); + avail =sg_dma_len (sg); + total += avail; + +do { + len =min_t (size_t, avail,DMA_MAX_SIZE ); + + hw_ds = &ds->desc_hw[num]; +switch (sglen) { +case 1 : + hw_ds->status.field.sop =1 ; + hw_ds->status.field.eop =1 ; +break ; +default : +if (num ==0 ) { + hw_ds->status.field.sop =1 ; + hw_ds->status.field.eop =0 ; + }else if (num == (sglen -1 )) { + hw_ds->status.field.sop =0 ; + hw_ds->status.field.eop =1 ; + }else { + hw_ds->status.field.sop =0 ; + hw_ds->status.field.eop =0 ; + } +break ; + } + +/* Only 32 bit address supported */ + hw_ds->addr = (u32 )addr; + hw_ds->status.field.len = len; + hw_ds->status.field.c =0 ; + hw_ds->status.field.bofs = addr &0x3 ; +/* Ensure data ready before ownership change */ +wmb (); + hw_ds->status.field.own =DMA_OWN ; +/* Ensure ownership changed before moving forward */ +wmb (); + num++; + addr += len; + avail -= len; + }while (avail); + } + + ds->size = total; + +return vchan_tx_prep (&c->vchan, &ds->vdesc,DMA_CTRL_ACK ); +} + +static int +dma_slave_config (struct dma_chan *chan,struct dma_slave_config *cfg) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +struct ldma_port *p = c->port; +unsigned long flags;
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1489
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+u32 bl; + + if ((cfg->direction == DMA_DEV_TO_MEM && + cfg->src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) || + (cfg->direction == DMA_MEM_TO_DEV && + cfg->dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||According to the probe function these width restrictions are only valid for
DMA_VER22?
YES
Quoted 9 lines
drivers/dma/lgm/lgm-dma.c line 1495
Quoted 7 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ !is_slave_direction(cfg->direction)) +return -EINVAL ; + +/* Default setting will be used */ +if (!cfg->src_maxburst && !cfg->dst_maxburst) +return 0 ;maxburst == 0 is identical to maxburst == 1, it is just not set explicitly. Iow 1 word per DMA request.
This is not clear to me. Can you elaborate?
Quoted 23 lines
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ +/* Must be the same */ +if (cfg->src_maxburst && cfg->dst_maxburst && + cfg->src_maxburst != cfg->dst_maxburst) +return -EINVAL ; + +if (cfg->dst_maxburst)drivers/dma/lgm/lgm-dma.c line 1512
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ cfg->src_maxburst = cfg->dst_maxburst; + + bl =ilog2 (cfg->src_maxburst); + +spin_lock_irqsave (&d->dev_lock, flags); +writel (p->portid, d->base +DMA_PS ); +ldma_update_bits (d,DMA_PCTRL_RXBL |DMA_PCTRL_TXBL , +FIELD_PREP (DMA_PCTRL_RXBL , bl) | +FIELD_PREP (DMA_PCTRL_TXBL , bl),DMA_PCTRL ); +spin_unlock_irqrestore (&d->dev_lock, flags);What drivers usually do is to save the cfg and inprepare time take it into account when setting up the transfer.
Write the change to the HW before the trasnfer is started (if it has changed from previous settings)
Quoted 3 lines
Client drivers usually set the slave config ones, in most cases during probe, so the slave config rarely changes runtime, but there are cases for that.
Ok, got it. i will update in the next version.
Quoted 49 lines
Quoted 49 lines
drivers/dma/lgm/lgm-dma.c new file +48
-0+ +return 0 ; +} + +static int dma_alloc_chan_resources (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); +struct device *dev = c->vchan.chan.device->dev; +size_t desc_sz; + +if (d->ver >DMA_VER22 ) { + c->flags |=CHAN_IN_USE ; +return 0 ; + } + +if (c->desc_pool) +return c->desc_num; + + desc_sz = c->desc_num *sizeof (struct dw2_desc ); + c->desc_pool =dma_pool_create (c->name, dev, desc_sz, + __alignof__(struct dw2_desc ),0 ); + +if (!c->desc_pool) { +dev_err (dev,"unable to allocate descriptor pool\n" ); +return -ENOMEM ; + } + +return c->desc_num; +} + +static void dma_free_chan_resources (struct dma_chan *chan) +{ +struct ldma_chan *c =to_ldma_chan (chan); +struct ldma_dev *d =to_ldma_dev (c->vchan.chan.device); + +if (d->ver ==DMA_VER22 ) { +dma_pool_destroy (c->desc_pool); + c->desc_pool =NULL ; +vchan_free_chan_resources (to_virt_chan (chan)); +ldma_chan_reset (c); + }else { + c->flags &= ~CHAN_IN_USE ; + } +} + +static void dma_work (struct work_struct *work) +{
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1567
Quoted 7 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ struct ldma_chan *c = container_of(work, struct ldma_chan, work); +struct dma_async_tx_descriptor *tx = &c->ds->vdesc.tx; +struct dmaengine_desc_callback cb; + +dmaengine_desc_get_callback (tx, &cb); +dma_cookie_complete (tx); +dmaengine_desc_callback_invoke (&cb,NULL );When you are going to free up the descriptor?
**
Seems i missed free up the descriptor here. i will fix and update in the next version.
Quoted 311 lines
Quoted 311 lines
drivers/dma/lgm/lgm-dma.c new file +310
-0+} + +int update_client_configs (struct of_dma *ofdma,struct of_phandle_args *spec) +{ +struct ldma_dev *d = ofdma->of_dma_data; +struct ldma_port *p; +struct ldma_chan *c; +u32 chan_id = spec->args[0 ]; +u32 port_id = spec->args[1 ]; + +if (chan_id >= d->chan_nrs || port_id >= d->port_nrs) +return 0 ; + + p = &d->ports[port_id]; + c = &d->chans[chan_id]; + +if (d->ver ==DMA_VER22 ) { +u32 burst = spec->args[2 ]; + +if (burst !=2 && burst !=4 && burst !=8 ) +return 0 ; + +/* TX and RX has the same burst length */ + p->txbl =ilog2 (burst); + p->rxbl = p->txbl; + +ldma_port_cfg (p); + }else { +if (spec->args[2 ] >0 && spec->args[2 ] <=DMA_ENDIAN_TYPE3 ) { + c->data_endian = spec->args[2 ]; + c->data_endian_en = true; + } + +if (spec->args[3 ] >0 && spec->args[3 ] <=DMA_ENDIAN_TYPE3 ) { + c->desc_endian = spec->args[3 ]; + c->desc_endian_en = true; + } + +if (spec->args[4 ] >0 && spec->args[4 ] <128 ) + c->boff_len = spec->args[4 ]; + +if (spec->args[5 ]) + c->desc_rx_np = true; + +/* +* If channel packet drop enabled, port packet drop should +* be enabled +*/ +if (spec->args[6 ]) { + c->pden = true; + p->pkt_drop =DMA_PKT_DROP_EN ; + } +ldma_port_cfg (p); +ldma_chan_cfg (c); + } + +return 1 ; +} + +static struct dma_chan *ldma_xlate (struct of_phandle_args *spec, +struct of_dma *ofdma) +{ +struct ldma_dev *d = ofdma->of_dma_data; +u32 chan_id = spec->args[0 ]; +int ret; + +if (!spec->args_count) +return NULL ; + +/* if args_count is 1 use driver default config settings */ +if (spec->args_count >1 ) { + ret =update_client_configs (ofdma, spec); +if (!ret) +return NULL ; + } + +return dma_get_slave_channel (&d->chans[chan_id].vchan.chan); +} + +static void ldma_clk_disable (void *data) +{ +struct ldma_dev *d = data; + +clk_disable_unprepare (d->core_clk); +} + +static struct dma_dev_ops dma0_ops = { + .device_alloc_chan_resources = dma_alloc_chan_resources, + .device_free_chan_resources = dma_free_chan_resources, + .device_config = dma_slave_config, + .device_prep_slave_sg = dma_prep_slave_sg, + .device_tx_status = dma_tx_status, + .device_pause = dma_pause_chan, + .device_resume = dma_resume_chan, + .device_terminate_all = dma_terminate_all, + .device_synchronize = dma_synchronize, + .device_issue_pending = dma_issue_pending, +}; + +static struct dma_dev_ops hdma_ops = { + .device_alloc_chan_resources = dma_alloc_chan_resources, + .device_free_chan_resources = dma_free_chan_resources, + .device_terminate_all = dma_terminate_all, + .device_issue_pending = dma_issue_pending, + .device_tx_status = dma_tx_status, + .device_resume = dma_resume_chan, + .device_pause = dma_pause_chan, +}; + +static const struct ldma_inst_data dma0 = { + .name ="dma0" , + .ops = &dma0_ops, +}; + +static const struct ldma_inst_data dma2tx = { + .name ="dma2tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma1rx = { + .name ="dma1rx" , + .type =DMA_TYPE_RX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma1tx = { + .name ="dma1tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma0tx = { + .name ="dma0tx" , + .type =DMA_TYPE_TX , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data dma3 = { + .name ="dma3" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data toe_dma30 = { + .name ="toe_dma30" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct ldma_inst_data toe_dma31 = { + .name ="toe_dma31" , + .type =DMA_TYPE_MCPY , + .ops = &hdma_ops, +}; + +static const struct of_device_id intel_ldma_match[] = { + { .compatible ="intel,lgm-cdma" , .data = &dma0}, + { .compatible ="intel,lgm-dma2tx" , .data = &dma2tx}, + { .compatible ="intel,lgm-dma1rx" , .data = &dma1rx}, + { .compatible ="intel,lgm-dma1tx" , .data = &dma1tx}, + { .compatible ="intel,lgm-dma0tx" , .data = &dma0tx}, + { .compatible ="intel,lgm-dma3" , .data = &dma3}, + { .compatible ="intel,lgm-toe-dma30" , .data = &toe_dma30}, + { .compatible ="intel,lgm-toe-dma31" , .data = &toe_dma31}, + {} +}; + +static int intel_ldma_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct dma_device *dma_dev; +struct ldma_chan *c; +struct ldma_port *p; +struct ldma_dev *d; +u32 id, bitn =32 ; +int i, j, k, ret; + + d =devm_kzalloc (dev,sizeof (*d),GFP_KERNEL ); +if (!d) +return -ENOMEM ; + +/* Link controller to platform device */ + d->dev = &pdev->dev; + + d->inst =device_get_match_data (dev); +if (!d->inst) { +dev_err (dev,"No device match found\n" ); +return -ENODEV ; + } + + d->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (d->base)) +return PTR_ERR (d->base); + +/* Power up and reset the dma engine, some DMAs always on?? */ + d->core_clk =devm_clk_get_optional (dev,NULL ); +if (IS_ERR (d->core_clk)) +return PTR_ERR (d->core_clk); +clk_prepare_enable (d->core_clk); + + ret =devm_add_action_or_reset (dev, ldma_clk_disable, d); +if (ret) { +dev_err (dev,"Failed to devm_add_action_or_reset, %d\n" , ret); +return ret; + } + + d->rst =devm_reset_control_get_optional (dev,NULL ); +if (IS_ERR (d->rst)) +return PTR_ERR (d->rst); +reset_control_deassert (d->rst); + + id =readl (d->base +DMA_ID ); + d->chan_nrs =FIELD_GET (DMA_ID_CHNR , id); + d->port_nrs =FIELD_GET (DMA_ID_PNR , id); + d->ver =FIELD_GET (DMA_ID_REV , id); + +if (id &DMA_ID_AW_36B ) + d->flags |=DMA_ADDR_36BIT ; + +if (IS_ENABLED (CONFIG_64BIT )) { +if (id &DMA_ID_AW_36B ) + bitn =36 ; + } + +if (id &DMA_ID_DW_128B ) + d->flags |=DMA_DATA_128BIT ; + + ret =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (bitn)); +if (ret) { +dev_err (dev,"No usable DMA configuration\n" ); +return ret; + } + +if (d->ver ==DMA_VER22 ) { + d->irq =platform_get_irq (pdev,0 ); +if (d->irq <0 ) +return d->irq; + + ret =devm_request_irq (&pdev->dev, d->irq, dma_interrupt, +0 ,DRIVER_NAME , d); +if (ret) +return ret; + + d->wq =alloc_ordered_workqueue ("dma_wq" ,WQ_MEM_RECLAIM | +WQ_HIGHPRI ); +if (!d->wq) +return -ENOMEM ; + } + + dma_dev = &d->dma_dev; +dma_cap_set (DMA_SLAVE , dma_dev->cap_mask); + +/* Channel initializations */ +INIT_LIST_HEAD (&dma_dev->channels); + +/* Port Initializations */ + d->ports =devm_kcalloc (dev, d->port_nrs,sizeof (*p),GFP_KERNEL ); +if (!d->ports) +return -ENOMEM ; + +for (i =0 ; i < d->port_nrs; i++) { + p = &d->ports[i]; + p->portid = i; + p->ldev = d; + } + + ret =ldma_cfg_init (d); +if (ret) +return ret; + + dma_dev->dev = &pdev->dev; +/* +* Link channel id to channel index and link to dma channel list +* It also back points to controller and its port +*/ +for (i =0 , k =0 ; i < d->port_nrs; i++) { +if (d->ver ==DMA_VER22 ) { +u32 chan_end; + + p = &d->ports[i]; + chan_end = p->chan_start + p->chan_sz; +for (j = p->chan_start; j < chan_end; j++) { + c = &d->chans[k]; + c->port = p; + c->nr = j;/* Real channel number */ + c->rst =DMA_CHAN_RST ; +snprintf (c->name,sizeof (c->name),"chan%d" , + c->nr); +INIT_WORK (&c->work, dma_work); + c->vchan.desc_free = dma_free_desc_resource; +vchan_init (&c->vchan, dma_dev); + k++; + } + }else { + p = &d->ports[i]; +for (i =0 ; i < d->chan_nrs; i++) { + c = &d->chans[i]; + c->port = p; + c->data_endian =DMA_DFT_ENDIAN ; + c->desc_endian =DMA_DFT_ENDIAN ; + c->data_endian_en = false; + c->desc_endian_en = false; + c->desc_rx_np = false; + c->flags |=DEVICE_ALLOC_DESC ; + c->onoff =DMA_CH_OFF ; + c->rst =DMA_CHAN_RST ; + c->abc_en = true; + c->nr = i; + c->vchan.desc_free = dma_free_desc_resource;
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1884
Quoted 7 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+vchan_init (&c->vchan, dma_dev); + } + } + } + +/* Set DMA capabilities */ +dma_cap_zero (dma_dev->cap_mask);You just cleared the
DMA_SLAVEcapability you set earlier...
Yes correct. i will fix it.
Quoted 17 lines
Quoted 17 lines
drivers/dma/lgm/lgm-dma.c new file +16
-0+ + dma_dev->device_alloc_chan_resources = + d->inst->ops->device_alloc_chan_resources; + dma_dev->device_free_chan_resources = + d->inst->ops->device_free_chan_resources; + dma_dev->device_terminate_all = d->inst->ops->device_terminate_all; + dma_dev->device_issue_pending = d->inst->ops->device_issue_pending; + dma_dev->device_tx_status = d->inst->ops->device_tx_status; + dma_dev->device_resume = d->inst->ops->device_resume; + dma_dev->device_pause = d->inst->ops->device_pause; + dma_dev->device_config = d->inst->ops->device_config; + dma_dev->device_prep_slave_sg = d->inst->ops->device_prep_slave_sg; + dma_dev->device_synchronize = d->inst->ops->device_synchronize; + +if (d->ver ==DMA_VER22 ) { + dma_dev->src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES );
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1906
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ dma_dev->dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); + dma_dev->directions =BIT (DMA_MEM_TO_DEV ) | +BIT (DMA_DEV_TO_MEM ); + dma_dev->residue_granularity = +DMA_RESIDUE_GRANULARITY_DESCRIPTOR ; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?
Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here. Other instances we set only control path. data path is taken care by dma client(GSWIP).
Only thing needs to do is get the channel, set the descriptor and just on the channel.
Quoted 78 lines
Quoted 63 lines
drivers/dma/lgm/lgm-dma.c new file +38
-0+ +platform_set_drvdata (pdev, d); + +ldma_dev_init (d); + + ret =dma_async_device_register (dma_dev); +if (ret) { +dev_err (dev,"Failed to register slave DMA engine device\n" ); +return ret; + } + + ret =of_dma_controller_register (pdev->dev.of_node, ldma_xlate, d); +if (ret) { +dev_err (dev,"Failed to register of DMA controller\n" ); +dma_async_device_unregister (dma_dev); +return ret; + } + +dev_info (dev,"Init done - rev: %x, ports: %d channels: %d\n" , d->ver, + d->port_nrs, d->chan_nrs); + +return 0 ; +} + +static struct platform_driver intel_ldma_driver = { + .probe = intel_ldma_probe, + .driver = { + .name =DRIVER_NAME , + .of_match_table = intel_ldma_match, + }, +}; + +static int __init intel_ldma_init (void ) +{ +return platform_driver_register (&intel_ldma_driver); +} + +device_initcall (intel_ldma_init);include/linux/dma/lgm_dma.h new file +17
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2016 ~ 2019 Intel Corporation. +*/ +#ifndef LGM_DMA_H +#define LGM_DMA_H + +#include <linux/types.h> +#include <linux/dmaengine.h> + +/*! +* \fn int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t desc_base, +* int desc_num) +* \brief Configure low level channel descriptors +* \param[in] chan pointer to DMA channel that the client is using +* \param[in] desc_base descriptor base physical address +* \param[in] desc_num number of descriptors include/linux/dma/lgm_dma.h line 27
Quoted 10 lines
include/linux/dma/lgm_dma.h new file +10
-0+* \return 0 on success +* \return kernel bug reported on failure +* +* This function configure the low level channel descriptors. It will be +* used by CBM whose descriptor is not DDR, actually some registers. +*/ +int intel_dma_chan_desc_cfg (struct dma_chan *chan,dma_addr_t desc_base, +int desc_num); + +#endif /* LGM_DMA_H */ - Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Hi,
Quoted 11 lines · MallikarjunaX
Quoted 9 lines
drivers/dma/lgm/lgm-dma.c line 1226
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +8
-0+static void dma_free_desc_resource (struct virt_dma_desc *vdesc) +{ + struct dw2_desc_sw *ds = to_lgm_dma_desc(vdesc); + struct ldma_chan *c = ds->chan; + + dma_pool_free(c->desc_pool, ds->desc_hw, ds->desc_phys); + kfree(ds); + c->ds = NULL;Is there a chance that
c->ds!= ds?No, from the code i don't see any such scenario, let me know if you find any corner case.
The desc_free callback is used to _free_ up the memory used for the descriptor. Nothing less, nothing more.
You should not touch the c->ds in this callback, just free up the memory used for the given vdesc.
More on that a bit later.
Quoted 66 lines
Quoted 58 lines
Quoted 58 lines
drivers/dma/lgm/lgm-dma.c new file +58
-0+} + +static struct dw2_desc_sw * +dma_alloc_desc_resource (int num,struct ldma_chan *c) +{ + struct device *dev = c->vchan.chan.device->dev; + struct dw2_desc_sw *ds; + + if (num > c->desc_num) { + dev_err(dev, "sg num %d exceed max %d\n", num, c->desc_num); + return NULL; + } + + ds = kzalloc(sizeof(*ds), GFP_NOWAIT); + if (!ds) + return NULL; + + ds->chan = c; + + ds->desc_hw = dma_pool_zalloc(c->desc_pool, GFP_ATOMIC, + &ds->desc_phys); + if (!ds->desc_hw) { + dev_dbg(dev, "out of memory for link descriptor\n"); + kfree(ds); + return NULL; + } + ds->desc_cnt = num; + + return ds; +} + +static void ldma_chan_irq_en (struct ldma_chan *c) +{ + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + unsigned long flags; + + spin_lock_irqsave(&d->dev_lock, flags); + writel(c->nr, d->base + DMA_CS); + writel(DMA_CI_EOP, d->base + DMA_CIE); + writel(BIT(c->nr), d->base + DMA_IRNEN); + spin_unlock_irqrestore(&d->dev_lock, flags); +} + +static void dma_issue_pending (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + unsigned long flags; + + if (d->ver == DMA_VER22) { + spin_lock_irqsave(&c->vchan.lock, flags); + if (vchan_issue_pending(&c->vchan)) { + struct virt_dma_desc *vdesc; + + /* Get the next descriptor */ + vdesc = vchan_next_desc(&c->vchan); + if (!vdesc) { + c->ds = NULL;Quoted 8 lines
Quoted 4 lines
+ return;
+ }
+list_del(&vdesc->node);
+c->ds=to_lgm_dma_desc(vdesc);you have set
c->dsindma_prep_slave_sgand the only way I can see that you will not leak memory is that the client mustterminate_sync()after each transfer so that the synchronize callback is invoked between each prep_sg/issue_pending/competion.
Quoted 2 lines
Yes, client must call
dmaengine_synchronizeafter each transfer to make sure free the memory assoicated with previously issued descriptors if any.
No, client should not need to invoke synchronize between transfers, clients must be able to do:
dmaengine_prep_slave_single/dmaengine_prep_slave_sg dma_async_issue_pending
* handle the callback dmaengine_prep_slave_single/dmaengine_prep_slave_sg dma_async_issue_pending
* handle the callback
without any terminate_all_sync() in between.
Imagine that the client is preparing/issuing a new transfer in the completion callback for example.
Clients must be able to do also:
dmaengine_prep_slave_single/dmaengine_prep_slave_sg dmaengine_prep_slave_single/dmaengine_prep_slave_sg
...
dmaengine_prep_slave_single/dmaengine_prep_slave_sg dma_async_issue_pending
and then the DMA will complete the transfers in FIFO order and when the first is completed it will move to the next one. Client will receive callbacks for each completion (if requested).
Quoted 147 lines
and also from the driver we are freeing up the descriptor from work queue atfer each transfer.(addressed below comments **)
Quoted 7 lines
Quoted 6 lines
+
spin_unlock_irqrestore(&c->vchan.lock, flags); +ldma_chan_desc_hw_cfg(c, c->ds->desc_phys, c->ds->desc_cnt);
+ldma_chan_irq_en(c);
+ }If there is nothing peding, you will leave the spinlock wide open...
Seems i misplaced the lock. i will fix it in next version.
Quoted 129 lines
Quoted 129 lines
+ }
+ldma_chan_on(c);drivers/dma/lgm/lgm-dma.c new file +93
-0+} + +static void dma_synchronize (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + /* + * clear any pending work if any. In that + * case the resource needs to be free here. + */ + cancel_work_sync(&c->work); + vchan_synchronize(&c->vchan); + if (c->ds) + dma_free_desc_resource(&c->ds->vdesc); +} + +static int dma_terminate_all (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + unsigned long flags; + LIST_HEAD(head); + + spin_lock_irqsave(&c->vchan.lock, flags); + vchan_get_all_descriptors(&c->vchan, &head); + spin_unlock_irqrestore(&c->vchan.lock, flags); + vchan_dma_desc_free_list(&c->vchan, &head); + + return ldma_chan_reset(c); +} + +static int dma_resume_chan (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + ldma_chan_on(c); + + return 0; +} + +static int dma_pause_chan (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + return ldma_chan_off(c); +} + +static enum dma_status +dma_tx_status (struct dma_chan *chan,dma_cookie_t cookie, + struct dma_tx_state *txstate) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + enum dma_status status = DMA_COMPLETE; + + if (d->ver == DMA_VER22) + status = dma_cookie_status(chan, cookie, txstate); + + return status; +} + +static void dma_chan_irq (int irq,void *data) +{ + struct ldma_chan *c = data; + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + u32 stat; + + /* Disable channel interrupts */ + writel(c->nr, d->base + DMA_CS); + stat = readl(d->base + DMA_CIS); + if (!stat) + return; + + writel(readl(d->base + DMA_CIE) & ~DMA_CI_ALL, d->base + DMA_CIE); + writel(stat, d->base + DMA_CIS); + queue_work(d->wq, &c->work); +} + +static irqreturn_t dma_interrupt (int irq,void *dev_id) +{ + struct ldma_dev *d = dev_id; + struct ldma_chan *c; + unsigned long irncr; + u32 cid; + + irncr = readl(d->base + DMA_IRNCR); + if (!irncr) { + dev_err(d->dev, "dummy interrupt\n"); + return IRQ_NONE; + } + + for_each_set_bit(cid, &irncr, d->chan_nrs) { + /* Mask */ + writel(readl(d->base + DMA_IRNEN) & ~BIT(cid), d->base +
DMA_IRNEN);
+ /* Ack */
+writel(readl(d->base + DMA_IRNCR) | BIT(cid), d->base + DMA_IRNCR);drivers/dma/lgm/lgm-dma.c new file +29
-0+ + c = &d->chans[cid]; + dma_chan_irq(irq, c); + } + + return IRQ_HANDLED; +} + +static struct dma_async_tx_descriptor * +dma_prep_slave_sg (struct dma_chan *chan,struct scatterlist *sgl, + unsigned int sglen, enum dma_transfer_direction dir, + unsigned long flags, void *context) +{ + struct ldma_chan *c = to_ldma_chan(chan); + size_t len, avail, total = 0; + struct dw2_desc *hw_ds; + struct dw2_desc_sw *ds; + struct scatterlist *sg; + int num = sglen, i; + dma_addr_t addr; + + if (!sgl) + return NULL; + + for_each_sg(sgl, sg, sglen, i) { + avail = sg_dma_len(sg); + if (avail > DMA_MAX_SIZE) + num += DIV_ROUND_UP(avail, DMA_MAX_SIZE) - 1; + }Quoted 8 lines
drivers/dma/lgm/lgm-dma.c line 1424
Quoted 6 lines
drivers/dma/lgm/lgm-dma.c new file +6
-0+ + ds = dma_alloc_desc_resource(num, c); + if (!ds) + return NULL; + + c->ds = ds;If you still have a transfer running then you are going to get lost that dscriptor?
Quoted 1 line
No, please let me know if you find any such corner case.
This is the place when you prepare the descriptor, but it is not yet commited to the hardware. Client might never call issue_pending, client might prepare another transfer before telling the DMA driver to start the transfers.
Quoted 68 lines
Quoted 60 lines
Quoted 60 lines
drivers/dma/lgm/lgm-dma.c new file +59
-0+ + num = 0; + /* sop and eop has to be handled nicely */ + for_each_sg(sgl, sg, sglen, i) { + addr = sg_dma_address(sg); + avail = sg_dma_len(sg); + total += avail; + + do { + len = min_t(size_t, avail, DMA_MAX_SIZE); + + hw_ds = &ds->desc_hw[num]; + switch (sglen) { + case 1: + hw_ds->status.field.sop = 1; + hw_ds->status.field.eop = 1; + break; + default: + if (num == 0) { + hw_ds->status.field.sop = 1; + hw_ds->status.field.eop = 0; + } else if (num == (sglen - 1)) { + hw_ds->status.field.sop = 0; + hw_ds->status.field.eop = 1; + } else { + hw_ds->status.field.sop = 0; + hw_ds->status.field.eop = 0; + } + break; + } + + /* Only 32 bit address supported */ + hw_ds->addr = (u32)addr; + hw_ds->status.field.len = len; + hw_ds->status.field.c = 0; + hw_ds->status.field.bofs = addr & 0x3; + /* Ensure data ready before ownership change */ + wmb(); + hw_ds->status.field.own = DMA_OWN; + /* Ensure ownership changed before moving forward */ + wmb(); + num++; + addr += len; + avail -= len; + } while (avail); + } + + ds->size = total; + + return vchan_tx_prep(&c->vchan, &ds->vdesc, DMA_CTRL_ACK); +} + +static int +dma_slave_config (struct dma_chan *chan,struct dma_slave_config *cfg) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + struct ldma_port *p = c->port; + unsigned long flags;Quoted 8 lines
Quoted 6 lines
+ u32 bl;
+
+ if ((cfg->direction==DMA_DEV_TO_MEM&&
+cfg->src_addr_width!=DMA_SLAVE_BUSWIDTH_4_BYTES) || + (cfg->direction==DMA_MEM_TO_DEV&&
+cfg->dst_addr_width!=DMA_SLAVE_BUSWIDTH_4_BYTES) ||According to the probe function these width restrictions are only valid for
DMA_VER22?
Quoted 1 line
YES
Right, hdma_ops does not have device_config specified.
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
+ !is_slave_direction(cfg->direction)) + return
-EINVAL;
+
+ /* Default setting will be used */
+ if (!cfg->src_maxburst && !cfg->dst_maxburst) + return 0;maxburst == 0 is identical to maxburst == 1, it is just not set explicitly. Iow 1 word per DMA request.
This is not clear to me. Can you elaborate?
You handle the *_maxburst == 1 and *maxburst == 0 differently while they are the same thing.
Quoted 23 lines
Quoted 23 lines
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ + /* Must be the same */ + if (cfg->src_maxburst && cfg->dst_maxburst && + cfg->src_maxburst != cfg->dst_maxburst) + return -EINVAL; + + if (cfg->dst_maxburst)drivers/dma/lgm/lgm-dma.c line 1512
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ cfg->src_maxburst = cfg->dst_maxburst; + + bl = ilog2(cfg->src_maxburst); + + spin_lock_irqsave(&d->dev_lock, flags); + writel(p->portid, d->base + DMA_PS); + ldma_update_bits(d, DMA_PCTRL_RXBL | DMA_PCTRL_TXBL, + FIELD_PREP(DMA_PCTRL_RXBL, bl) | + FIELD_PREP(DMA_PCTRL_TXBL, bl), DMA_PCTRL); + spin_unlock_irqrestore(&d->dev_lock, flags);What drivers usually do is to save the cfg and inprepare time take it into account when setting up the transfer.
Write the change to the HW before the trasnfer is started (if it has changed from previous settings)
Quoted 4 lines
Quoted 3 lines
Client drivers usually set the slave config ones, in most cases during probe, so the slave config rarely changes runtime, but there are cases for that.
Ok, got it. i will update in the next version.
Thanks
Quoted 57 lines
Quoted 49 lines
Quoted 49 lines
drivers/dma/lgm/lgm-dma.c new file +48
-0+ + return 0; +} + +static int dma_alloc_chan_resources (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + struct device *dev = c->vchan.chan.device->dev; + size_t desc_sz; + + if (d->ver > DMA_VER22) { + c->flags |= CHAN_IN_USE; + return 0; + } + + if (c->desc_pool) + return c->desc_num; + + desc_sz = c->desc_num * sizeof(struct dw2_desc); + c->desc_pool = dma_pool_create(c->name, dev, desc_sz, + __alignof__(struct dw2_desc), 0); + + if (!c->desc_pool) { + dev_err(dev, "unable to allocate descriptor pool\n"); + return -ENOMEM; + } + + return c->desc_num; +} + +static void dma_free_chan_resources (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + + if (d->ver == DMA_VER22) { + dma_pool_destroy(c->desc_pool); + c->desc_pool = NULL; + vchan_free_chan_resources(to_virt_chan(chan)); + ldma_chan_reset(c); + } else { + c->flags &= ~CHAN_IN_USE; + } +} + +static void dma_work (struct work_struct *work) +{Quoted 8 lines
Quoted 7 lines
+ struct
ldma_chan*c =container_of(work, struct ldma_chan, work); + structdma_async_tx_descriptor*tx =&c->ds->vdesc.tx; + structdmaengine_desc_callbackcb;
+
+dmaengine_desc_get_callback(tx, &cb);
+dma_cookie_complete(tx);
+dmaengine_desc_callback_invoke(&cb, NULL);When you are going to free up the descriptor?
Quoted 3 lines
**
Seems i missed free up the descriptor here. i will fix and update in the next version.
This is the place when you can do c->ds = NULL and you should also look for entries in the issued list to pick up any issued but not commited transfers.
Let's say the client issued two transfers, in issue_pending you have started the first one.
Now that is completed, you let the client know about it (you can free up the descritor as well safely) and then you pick up the next one from the issued list and start that.
If there is nothing pending then c->ds would be NULL, if there were pending transfer, you will set c->ds to the next transfer. c->ds indicates that there is a transfer in progress by the HW.
Quoted 24 lines
Quoted 16 lines
Quoted 16 lines
drivers/dma/lgm/lgm-dma.c new file +16
-0+ + dma_dev->device_alloc_chan_resources = + d->inst->ops->device_alloc_chan_resources; + dma_dev->device_free_chan_resources = + d->inst->ops->device_free_chan_resources; + dma_dev->device_terminate_all = d->inst->ops->device_terminate_all; + dma_dev->device_issue_pending = d->inst->ops->device_issue_pending; + dma_dev->device_tx_status = d->inst->ops->device_tx_status; + dma_dev->device_resume = d->inst->ops->device_resume; + dma_dev->device_pause = d->inst->ops->device_pause; + dma_dev->device_config = d->inst->ops->device_config; + dma_dev->device_prep_slave_sg = d->inst->ops->device_prep_slave_sg; + dma_dev->device_synchronize = d->inst->ops->device_synchronize; + + if (d->ver == DMA_VER22) { + dma_dev->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);Quoted 8 lines
Quoted 6 lines
+
dma_dev->dst_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->directions=BIT(DMA_MEM_TO_DEV)|
+BIT(DMA_DEV_TO_MEM);
+dma_dev->residue_granularity=
+DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?
Quoted 4 lines
Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma client(GSWIP).
How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
Quoted 2 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
How do you 'on' the channel?
Quoted 79 lines
Quoted 79 lines
Quoted 75 lines
drivers/dma/lgm/lgm-dma.c new file +19
-0+ + platform_set_drvdata(pdev, d); + + ldma_dev_init(d); + + ret = dma_async_device_register(dma_dev); + if (ret) { + dev_err(dev, "Failed to register slave DMA engine device\n"); + return ret; + } + + ret = of_dma_controller_register(pdev->dev.of_node, ldma_xlate, d); + if (ret) { + dev_err(dev, "Failed to register of DMA controller\n"); + dma_async_device_unregister(dma_dev); + return ret; + } + + dev_info(dev, "Init done - rev: %x, ports: %d channels: %d\n",
d->ver,
+d->port_nrs,d->chan_nrs);drivers/dma/lgm/lgm-dma.c new file +18
-0+ + return 0; +} + +static struct platform_driver intel_ldma_driver = { + .probe = intel_ldma_probe, + .driver = { + .name = DRIVER_NAME, + .of_match_table = intel_ldma_match, + }, +}; + +static int __init intel_ldma_init (void ) +{ + return platform_driver_register(&intel_ldma_driver); +} + +device_initcall (intel_ldma_init);include/linux/dma/lgm_dma.h new file +12
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2016 ~ 2019 Intel Corporation. +*/ +#ifndef LGM_DMA_H +#define LGM_DMA_H + +#include <linux/types.h> +#include <linux/dmaengine.h> + +/*! +* \fn int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t
desc_base,
+ * intdesc_num)
+ * \brief Configure low level channel descriptors
+ * \param[in] chan pointer to DMA channel that the client is using
+ * \param[in] desc_base descriptor base physical address
+ * \param[in] desc_num number of descriptors
+ * \return 0 on success
+ * \return kernel bug reported on failure
+ *
+ * This function configure the low level channel descriptors. It will be
+ * used by CBM whose descriptor is not DDR, actually some registers.
+ */
+int intel_dma_chan_desc_cfg(structdma_chan*chan,dma_addr_tdesc_base,
+ intdesc_num);include/linux/dma/lgm_dma.h line 27
Quoted 2 lines
include/linux/dma/lgm_dma.h new file +2
-0+ +#endif /* LGM_DMA_H */ - Péter
Quoted 3 lines
Quoted 3 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Hi Peter,
Thank you very much for the review and detailed explanation, i will take the inputs and update in the next patch. My comments inline..
Quoted 13 lines · Peter Ujfalusi
Hi,
Quoted 9 lines · MallikarjunaX
Quoted 9 lines
drivers/dma/lgm/lgm-dma.c line 1226
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +8
-0+static void dma_free_desc_resource (struct virt_dma_desc *vdesc) +{ + struct dw2_desc_sw *ds = to_lgm_dma_desc(vdesc); + struct ldma_chan *c = ds->chan; + + dma_pool_free(c->desc_pool, ds->desc_hw, ds->desc_phys); + kfree(ds); + c->ds = NULL;Is there a chance that
c->ds!= ds?
Quoted 8 lines
Quoted 2 lines
No, from the code i don't see any such scenario, let me know if you find any corner case.
The
desc_freecallback is used to _free_ up the memory used for the descriptor. Nothing less, nothing more.
You should not touch thec->dsin this callback, just free up the memory used for the given vdesc.More on that a bit later.
Ok.
Quoted 89 lines
Quoted 67 lines
Quoted 59 lines
Quoted 59 lines
drivers/dma/lgm/lgm-dma.c new file +58
-0+} + +static struct dw2_desc_sw * +dma_alloc_desc_resource (int num,struct ldma_chan *c) +{ + struct device *dev = c->vchan.chan.device->dev; + struct dw2_desc_sw *ds; + + if (num > c->desc_num) { + dev_err(dev, "sg num %d exceed max %d\n", num, c->desc_num); + return NULL; + } + + ds = kzalloc(sizeof(*ds), GFP_NOWAIT); + if (!ds) + return NULL; + + ds->chan = c; + + ds->desc_hw = dma_pool_zalloc(c->desc_pool, GFP_ATOMIC, + &ds->desc_phys); + if (!ds->desc_hw) { + dev_dbg(dev, "out of memory for link descriptor\n"); + kfree(ds); + return NULL; + } + ds->desc_cnt = num; + + return ds; +} + +static void ldma_chan_irq_en (struct ldma_chan *c) +{ + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + unsigned long flags; + + spin_lock_irqsave(&d->dev_lock, flags); + writel(c->nr, d->base + DMA_CS); + writel(DMA_CI_EOP, d->base + DMA_CIE); + writel(BIT(c->nr), d->base + DMA_IRNEN); + spin_unlock_irqrestore(&d->dev_lock, flags); +} + +static void dma_issue_pending (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + unsigned long flags; + + if (d->ver == DMA_VER22) { + spin_lock_irqsave(&c->vchan.lock, flags); + if (vchan_issue_pending(&c->vchan)) { + struct virt_dma_desc *vdesc; + + /* Get the next descriptor */ + vdesc = vchan_next_desc(&c->vchan); + if (!vdesc) { + c->ds = NULL;Quoted 8 lines
Quoted 4 lines
+ return;
+ }
+list_del(&vdesc->node);
+c->ds=to_lgm_dma_desc(vdesc);you have set
c->dsindma_prep_slave_sgand the only way I can see that you will not leak memory is that the client mustterminate_sync()after each transfer so that the synchronize callback is invoked between each prep_sg/issue_pending/competion.Quoted 2 lines
Yes, client must call
dmaengine_synchronizeafter each transfer to make sure free the memory assoicated with previously issued descriptors if any.No, client should not need to invoke synchronize between transfers, clients must be able to do:
dmaengine_prep_slave_single/dmaengine_prep_slave_sgdma_async_issue_pending
* handle the callback dmaengine_prep_slave_single/dmaengine_prep_slave_sgdma_async_issue_pending
* handle the callbackwithout any
terminate_all_sync()in between.
Imagine that the client is preparing/issuing a new transfer in the completion callback for example.Clients must be able to do also:
dmaengine_prep_slave_single/dmaengine_prep_slave_sg dmaengine_prep_slave_single/dmaengine_prep_slave_sg
...
dmaengine_prep_slave_single/dmaengine_prep_slave_sgdma_async_issue_pending
Quoted 3 lines
and then the DMA will complete the transfers in FIFO order and when the first is completed it will move to the next one. Client will receive callbacks for each completion (if requested).
Thanks for the detailed explanation peter.
Quoted 146 lines
Quoted 146 lines
and also from the driver we are freeing up the descriptor from work queue atfer each transfer.(addressed below comments **)
Quoted 6 lines
Quoted 5 lines
+
spin_unlock_irqrestore(&c->vchan.lock, flags); +ldma_chan_desc_hw_cfg(c, c->ds->desc_phys, c->ds->desc_cnt);
+ldma_chan_irq_en(c);
+ }If there is nothing peding, you will leave the spinlock wide open...
Seems i misplaced the lock. i will fix it in next version.
Quoted 136 lines
Quoted 124 lines
+ }
+ldma_chan_on(c);drivers/dma/lgm/lgm-dma.c new file +93
-0+} + +static void dma_synchronize (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + /* + * clear any pending work if any. In that + * case the resource needs to be free here. + */ + cancel_work_sync(&c->work); + vchan_synchronize(&c->vchan); + if (c->ds) + dma_free_desc_resource(&c->ds->vdesc); +} + +static int dma_terminate_all (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + unsigned long flags; + LIST_HEAD(head); + + spin_lock_irqsave(&c->vchan.lock, flags); + vchan_get_all_descriptors(&c->vchan, &head); + spin_unlock_irqrestore(&c->vchan.lock, flags); + vchan_dma_desc_free_list(&c->vchan, &head); + + return ldma_chan_reset(c); +} + +static int dma_resume_chan (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + ldma_chan_on(c); + + return 0; +} + +static int dma_pause_chan (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + + return ldma_chan_off(c); +} + +static enum dma_status +dma_tx_status (struct dma_chan *chan,dma_cookie_t cookie, + struct dma_tx_state *txstate) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + enum dma_status status = DMA_COMPLETE; + + if (d->ver == DMA_VER22) + status = dma_cookie_status(chan, cookie, txstate); + + return status; +} + +static void dma_chan_irq (int irq,void *data) +{ + struct ldma_chan *c = data; + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + u32 stat; + + /* Disable channel interrupts */ + writel(c->nr, d->base + DMA_CS); + stat = readl(d->base + DMA_CIS); + if (!stat) + return; + + writel(readl(d->base + DMA_CIE) & ~DMA_CI_ALL, d->base + DMA_CIE); + writel(stat, d->base + DMA_CIS); + queue_work(d->wq, &c->work); +} + +static irqreturn_t dma_interrupt (int irq,void *dev_id) +{ + struct ldma_dev *d = dev_id; + struct ldma_chan *c; + unsigned long irncr; + u32 cid; + + irncr = readl(d->base + DMA_IRNCR); + if (!irncr) { + dev_err(d->dev, "dummy interrupt\n"); + return IRQ_NONE; + } + + for_each_set_bit(cid, &irncr, d->chan_nrs) { + /* Mask */ + writel(readl(d->base + DMA_IRNEN) & ~BIT(cid), d->base +
DMA_IRNEN);
+ /* Ack */
+writel(readl(d->base + DMA_IRNCR) | BIT(cid), d->base + DMA_IRNCR);drivers/dma/lgm/lgm-dma.c new file +25
-0+ + c = &d->chans[cid]; + dma_chan_irq(irq, c); + } + + return IRQ_HANDLED; +} + +static struct dma_async_tx_descriptor * +dma_prep_slave_sg (struct dma_chan *chan,struct scatterlist *sgl, + unsigned int sglen, enum dma_transfer_direction dir, + unsigned long flags, void *context) +{ + struct ldma_chan *c = to_ldma_chan(chan); + size_t len, avail, total = 0; + struct dw2_desc *hw_ds; + struct dw2_desc_sw *ds; + struct scatterlist *sg; + int num = sglen, i; + dma_addr_t addr; + + if (!sgl) + return NULL; + + for_each_sg(sgl, sg, sglen, i) {drivers/dma/lgm/lgm-dma.c line 1424
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ avail = sg_dma_len(sg); + if (avail > DMA_MAX_SIZE) + num += DIV_ROUND_UP(avail, DMA_MAX_SIZE) - 1; + } + + ds = dma_alloc_desc_resource(num, c); + if (!ds) + return NULL; + + c->ds = ds;If you still have a transfer running then you are going to get lost that dscriptor?
Quoted 5 lines
Quoted 1 line
No, please let me know if you find any such corner case.
This is the place when you prepare the descriptor, but it is not yet commited to the hardware. Client might never call
issue_pending, client might prepare another transfer before telling the DMA driver to start the transfers.
ok
Quoted 77 lines
Quoted 68 lines
Quoted 60 lines
Quoted 60 lines
drivers/dma/lgm/lgm-dma.c new file +59
-0+ + num = 0; + /* sop and eop has to be handled nicely */ + for_each_sg(sgl, sg, sglen, i) { + addr = sg_dma_address(sg); + avail = sg_dma_len(sg); + total += avail; + + do { + len = min_t(size_t, avail, DMA_MAX_SIZE); + + hw_ds = &ds->desc_hw[num]; + switch (sglen) { + case 1: + hw_ds->status.field.sop = 1; + hw_ds->status.field.eop = 1; + break; + default: + if (num == 0) { + hw_ds->status.field.sop = 1; + hw_ds->status.field.eop = 0; + } else if (num == (sglen - 1)) { + hw_ds->status.field.sop = 0; + hw_ds->status.field.eop = 1; + } else { + hw_ds->status.field.sop = 0; + hw_ds->status.field.eop = 0; + } + break; + } + + /* Only 32 bit address supported */ + hw_ds->addr = (u32)addr; + hw_ds->status.field.len = len; + hw_ds->status.field.c = 0; + hw_ds->status.field.bofs = addr & 0x3; + /* Ensure data ready before ownership change */ + wmb(); + hw_ds->status.field.own = DMA_OWN; + /* Ensure ownership changed before moving forward */ + wmb(); + num++; + addr += len; + avail -= len; + } while (avail); + } + + ds->size = total; + + return vchan_tx_prep(&c->vchan, &ds->vdesc, DMA_CTRL_ACK); +} + +static int +dma_slave_config (struct dma_chan *chan,struct dma_slave_config *cfg) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + struct ldma_port *p = c->port; + unsigned long flags;Quoted 8 lines
Quoted 6 lines
+ u32 bl;
+
+ if ((cfg->direction==DMA_DEV_TO_MEM&&
+cfg->src_addr_width!=DMA_SLAVE_BUSWIDTH_4_BYTES) || + (cfg->direction==DMA_MEM_TO_DEV&&
+cfg->dst_addr_width!=DMA_SLAVE_BUSWIDTH_4_BYTES) ||According to the probe function these width restrictions are only valid for
DMA_VER22?Quoted 1 line
YES
Right,
hdma_opsdoes not havedevice_configspecified.Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
+ !is_slave_direction(cfg->direction)) + return
-EINVAL;
+
+ /* Default setting will be used */
+ if (!cfg->src_maxburst && !cfg->dst_maxburst) + return 0;
Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
maxburst == 0 is identical to maxburst == 1, it is just not set explicitly. Iow 1 word per DMA request.
This is not clear to me. Can you elaborate?
You handle the
*_maxburst== 1 and *maxburst == 0 differently while they are the same thing.
ok, got it. i will fix it in next version.
Quoted 92 lines
Quoted 23 lines
Quoted 23 lines
Quoted 8 lines
drivers/dma/lgm/lgm-dma.c new file +7
-0+ + /* Must be the same */ + if (cfg->src_maxburst && cfg->dst_maxburst && + cfg->src_maxburst != cfg->dst_maxburst) + return -EINVAL; + + if (cfg->dst_maxburst)drivers/dma/lgm/lgm-dma.c line 1512
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ cfg->src_maxburst = cfg->dst_maxburst; + + bl = ilog2(cfg->src_maxburst); + + spin_lock_irqsave(&d->dev_lock, flags); + writel(p->portid, d->base + DMA_PS); + ldma_update_bits(d, DMA_PCTRL_RXBL | DMA_PCTRL_TXBL, + FIELD_PREP(DMA_PCTRL_RXBL, bl) | + FIELD_PREP(DMA_PCTRL_TXBL, bl), DMA_PCTRL); + spin_unlock_irqrestore(&d->dev_lock, flags);What drivers usually do is to save the cfg and inprepare time take it into account when setting up the transfer.
Write the change to the HW before the trasnfer is started (if it has changed from previous settings)Quoted 4 lines
Quoted 3 lines
Client drivers usually set the slave config ones, in most cases during probe, so the slave config rarely changes runtime, but there are cases for that.
Ok, got it. i will update in the next version.
Thanks
Quoted 56 lines
Quoted 48 lines
Quoted 48 lines
drivers/dma/lgm/lgm-dma.c new file +48
-0+ + return 0; +} + +static int dma_alloc_chan_resources (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + struct device *dev = c->vchan.chan.device->dev; + size_t desc_sz; + + if (d->ver > DMA_VER22) { + c->flags |= CHAN_IN_USE; + return 0; + } + + if (c->desc_pool) + return c->desc_num; + + desc_sz = c->desc_num * sizeof(struct dw2_desc); + c->desc_pool = dma_pool_create(c->name, dev, desc_sz, + __alignof__(struct dw2_desc), 0); + + if (!c->desc_pool) { + dev_err(dev, "unable to allocate descriptor pool\n"); + return -ENOMEM; + } + + return c->desc_num; +} + +static void dma_free_chan_resources (struct dma_chan *chan) +{ + struct ldma_chan *c = to_ldma_chan(chan); + struct ldma_dev *d = to_ldma_dev(c->vchan.chan.device); + + if (d->ver == DMA_VER22) { + dma_pool_destroy(c->desc_pool); + c->desc_pool = NULL; + vchan_free_chan_resources(to_virt_chan(chan)); + ldma_chan_reset(c); + } else { + c->flags &= ~CHAN_IN_USE; + } +} + +static void dma_work (struct work_struct *work) +{Quoted 8 lines
Quoted 7 lines
+ struct
ldma_chan*c =container_of(work, struct ldma_chan, work); + structdma_async_tx_descriptor*tx =&c->ds->vdesc.tx; + structdmaengine_desc_callbackcb;
+
+dmaengine_desc_get_callback(tx, &cb);
+dma_cookie_complete(tx);
+dmaengine_desc_callback_invoke(&cb, NULL);When you are going to free up the descriptor?
Quoted 3 lines
**
Seems i missed free up the descriptor here. i will fix and update in the next version.This is the place when you can do
c->ds= NULL and you should also look for entries in the issued list to pick up any issued but not commited transfers.
Quoted 8 lines
Let's say the client issued two transfers, in
issue_pendingyou have started the first one.
Now that is completed, you let the client know about it (you can free up the descritor as well safely) and then you pick up the next one from the issued list and start that.
If there is nothing pending thenc->dswould be NULL, if there were pending transfer, you will setc->dsto the next transfer.c->dsindicates that there is a transfer in progress by the HW.
Thanks peter. I will take your inputs and address the not committed transfers in the next patch.
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 13 lines
drivers/dma/lgm/lgm-dma.c new file +12
-0+ + dma_dev->device_alloc_chan_resources = + d->inst->ops->device_alloc_chan_resources; + dma_dev->device_free_chan_resources = + d->inst->ops->device_free_chan_resources; + dma_dev->device_terminate_all = d->inst->ops->device_terminate_all; + dma_dev->device_issue_pending = d->inst->ops->device_issue_pending; + dma_dev->device_tx_status = d->inst->ops->device_tx_status; + dma_dev->device_resume = d->inst->ops->device_resume; + dma_dev->device_pause = d->inst->ops->device_pause; + dma_dev->device_config = d->inst->ops->device_config; + dma_dev->device_prep_slave_sg = d->inst->ops->device_prep_slave_sg;drivers/dma/lgm/lgm-dma.c line 1906
Quoted 10 lines
drivers/dma/lgm/lgm-dma.c new file +10
-0+ dma_dev->device_synchronize = d->inst->ops->device_synchronize; + + if (d->ver == DMA_VER22) { + dma_dev->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + dma_dev->dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + dma_dev->directions = BIT(DMA_MEM_TO_DEV) | + BIT(DMA_DEV_TO_MEM); + dma_dev->residue_granularity = + DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?
Quoted 7 lines
Quoted 4 lines
Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma client(GSWIP).How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
client request channel by name, dma_request_slave_channel(dev, name);
Quoted 4 lines
Quoted 3 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
How do you 'on' the channel?
we on the channel in issue_pending.
Quoted 87 lines
Quoted 79 lines
Quoted 79 lines
Quoted 75 lines
drivers/dma/lgm/lgm-dma.c new file +19
-0+ + platform_set_drvdata(pdev, d); + + ldma_dev_init(d); + + ret = dma_async_device_register(dma_dev); + if (ret) { + dev_err(dev, "Failed to register slave DMA engine device\n"); + return ret; + } + + ret = of_dma_controller_register(pdev->dev.of_node, ldma_xlate, d); + if (ret) { + dev_err(dev, "Failed to register of DMA controller\n"); + dma_async_device_unregister(dma_dev); + return ret; + } + + dev_info(dev, "Init done - rev: %x, ports: %d channels: %d\n",
d->ver,
+d->port_nrs,d->chan_nrs);drivers/dma/lgm/lgm-dma.c new file +18
-0+ + return 0; +} + +static struct platform_driver intel_ldma_driver = { + .probe = intel_ldma_probe, + .driver = { + .name = DRIVER_NAME, + .of_match_table = intel_ldma_match, + }, +}; + +static int __init intel_ldma_init (void ) +{ + return platform_driver_register(&intel_ldma_driver); +} + +device_initcall (intel_ldma_init);include/linux/dma/lgm_dma.h new file +12
-0@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2016 ~ 2019 Intel Corporation. +*/ +#ifndef LGM_DMA_H +#define LGM_DMA_H + +#include <linux/types.h> +#include <linux/dmaengine.h> + +/*! +* \fn int intel_dma_chan_desc_cfg(struct dma_chan *chan, dma_addr_t
desc_base,
+ * intdesc_num)
+ * \brief Configure low level channel descriptors
+ * \param[in] chan pointer to DMA channel that the client is using
+ * \param[in] desc_base descriptor base physical address
+ * \param[in] desc_num number of descriptors
+ * \return 0 on success
+ * \return kernel bug reported on failure
+ *
+ * This function configure the low level channel descriptors. It will be
+ * used by CBM whose descriptor is not DDR, actually some registers.
+ */
+int intel_dma_chan_desc_cfg(structdma_chan*chan,dma_addr_tdesc_base,
+ intdesc_num);include/linux/dma/lgm_dma.h line 27
Quoted 2 lines
include/linux/dma/lgm_dma.h new file +2
-0+ +#endif /* LGM_DMA_H */ - Péter
Quoted 3 lines
Quoted 3 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Hi,
Quoted 27 lines · MallikarjunaX
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 17 lines
+
+dma_dev->device_alloc_chan_resources=
+d->inst->ops->device_alloc_chan_resources;
+dma_dev->device_free_chan_resources=
+d->inst->ops->device_free_chan_resources;
+dma_dev->device_terminate_all=d->inst->ops->device_terminate_all;
+dma_dev->device_issue_pending=d->inst->ops->device_issue_pending;
+dma_dev->device_tx_status=d->inst->ops->device_tx_status; +dma_dev->device_resume=d->inst->ops->device_resume; +dma_dev->device_pause=d->inst->ops->device_pause; +dma_dev->device_config=d->inst->ops->device_config; +dma_dev->device_prep_slave_sg=d->inst->ops->device_prep_slave_sg;
+dma_dev->device_synchronize=d->inst->ops->device_synchronize; +Quoted 8 lines
+ if (
d->ver==DMA_VER22) {
+dma_dev->src_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->dst_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->directions=BIT(DMA_MEM_TO_DEV)|
+BIT(DMA_DEV_TO_MEM);
+dma_dev->residue_granularity=
+DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma client(GSWIP).How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
client request channel by name,
dma_request_slave_channel(dev, name);
clients should use dma_request_chan(dev, name);
If the channel can be requested via DT or ACPI then we don't check the capabilities at all, so yes, that could work.
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
How do you 'on' the channel?
we on the channel in
issue_pending.
Right.
Basically you only prep_slave_sg/single for the DMA_VER22? Or do you that for the others w/o direction support?
For the intel,lgm-* DMAs you only call issue_pending() and probably terminate_all?
Interesting setup ;)
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Quoted 43 lines · Peter Ujfalusi
Hi,
Quoted 27 lines · MallikarjunaX
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 17 lines
+
+dma_dev->device_alloc_chan_resources=
+d->inst->ops->device_alloc_chan_resources;
+dma_dev->device_free_chan_resources=
+d->inst->ops->device_free_chan_resources;
+dma_dev->device_terminate_all=d->inst->ops->device_terminate_all;
+dma_dev->device_issue_pending=d->inst->ops->device_issue_pending;
+dma_dev->device_tx_status=d->inst->ops->device_tx_status; +dma_dev->device_resume=d->inst->ops->device_resume; +dma_dev->device_pause=d->inst->ops->device_pause; +dma_dev->device_config=d->inst->ops->device_config; +dma_dev->device_prep_slave_sg=d->inst->ops->device_prep_slave_sg;
+dma_dev->device_synchronize=d->inst->ops->device_synchronize; +Quoted 8 lines
+ if (
d->ver==DMA_VER22) {
+dma_dev->src_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->dst_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->directions=BIT(DMA_MEM_TO_DEV)|
+BIT(DMA_DEV_TO_MEM);
+dma_dev->residue_granularity=
+DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma client(GSWIP).How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
client request channel by name,
dma_request_slave_channel(dev, name);clients should use
dma_request_chan(dev, name);If the channel can be requested via DT or ACPI then we don't check the capabilities at all, so yes, that could work.
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
How do you 'on' the channel?
we on the channel in
issue_pending.Right.
Basically you only prep_slave_sg/single for theDMA_VER22? Or do you that for the others w/o direction support?
Yes. prep_slave_sg/single only for the DMA_VER22.
Quoted 3 lines
For the intel,lgm-* DMAs you only call
issue_pending()and probablyterminate_all?
Yes, correct.
Quoted 8 lines
Interesting setup ;)
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Quoted 48 lines · MallikarjunaX
Quoted 46 lines · Peter Ujfalusi
Hi,
Quoted 32 lines · MallikarjunaX
Quoted 32 lines
Quoted 32 lines
Quoted 19 lines
Quoted 19 lines
+
+dma_dev->device_alloc_chan_resources=
+d->inst->ops->device_alloc_chan_resources;
+dma_dev->device_free_chan_resources=
+d->inst->ops->device_free_chan_resources;
+dma_dev->device_terminate_all=d->inst->ops->device_terminate_all;
+dma_dev->device_issue_pending=d->inst->ops->device_issue_pending;
+dma_dev->device_tx_status=d->inst->ops->device_tx_status; +dma_dev->device_resume=d->inst->ops->device_resume; +dma_dev->device_pause=d->inst->ops->device_pause; +dma_dev->device_config=d->inst->ops->device_config; +dma_dev->device_prep_slave_sg=d->inst->ops->device_prep_slave_sg;
+dma_dev->device_synchronize=d->inst->ops->device_synchronize; +
+ if (d->ver==DMA_VER22) {
+dma_dev->src_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);Quoted 8 lines
Quoted 6 lines
+
dma_dev->dst_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->directions=BIT(DMA_MEM_TO_DEV)|
+BIT(DMA_DEV_TO_MEM);
+dma_dev->residue_granularity=
+DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma
client(GSWIP).Quoted 4 lines
Quoted 3 lines
How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
client request channel by name,
dma_request_slave_channel(dev, name);clients should use
dma_request_chan(dev, name);If the channel can be requested via DT or ACPI then we don't check the capabilities at all, so yes, that could work.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Quoted 1 line
How do you 'on' the channel?
we on the channel in
issue_pending.Right.
Basically you only prep_slave_sg/single for theDMA_VER22? Or do you that for the others w/o direction support?Yes. prep_slave_sg/single only for the
DMA_VER22.
So, you place the transfers to DMA_VER22's channel
Quoted 4 lines
Quoted 3 lines
For the intel,lgm-* DMAs you only call
issue_pending()and probablyterminate_all?Yes, correct.
and issue_pending on a channel which does not have anything pending? How client knows which of the 'only need to be ON' channel to enable when it placed a transfer to another channel?
How would the client driver (and the IP) would be integrated with different system DMA which have standard channel management?
If DMA_VER22 knows which intel,lgm-* it should place the transfer then with virt-dma you can handle that just fine?
Do you have public documentation for the DMA? It sounds a bit like TI's EDMA which is in essence is a two part setup:
CC: Channel Controller - to submit transfers (like your DMA_VER22)
TC: Transfer Controller - it executes the transfers submitted by the CC
One CC can be backed by multiple TCs. I don't have direct control over the TC (can not start/stop), it is controlled by the CC.
Documentation/devicetree/bindings/dma/ti-edma.txt
Or is it a different setup?
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v5 2/2] Add Intel LGM soc DMA support.
Hi Peter,
Thanks for the review, please see my comment inline..
Quoted 64 lines · Peter Ujfalusi
Quoted 45 lines · MallikarjunaX
Quoted 44 lines · Peter Ujfalusi
Hi,
Quoted 32 lines · MallikarjunaX
Quoted 32 lines
Quoted 32 lines
Quoted 19 lines
Quoted 19 lines
+
+dma_dev->device_alloc_chan_resources=
+d->inst->ops->device_alloc_chan_resources;
+dma_dev->device_free_chan_resources=
+d->inst->ops->device_free_chan_resources;
+dma_dev->device_terminate_all=d->inst->ops->device_terminate_all;
+dma_dev->device_issue_pending=d->inst->ops->device_issue_pending;
+dma_dev->device_tx_status=d->inst->ops->device_tx_status; +dma_dev->device_resume=d->inst->ops->device_resume; +dma_dev->device_pause=d->inst->ops->device_pause; +dma_dev->device_config=d->inst->ops->device_config; +dma_dev->device_prep_slave_sg=d->inst->ops->device_prep_slave_sg;
+dma_dev->device_synchronize=d->inst->ops->device_synchronize; +
+ if (d->ver==DMA_VER22) {
+dma_dev->src_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);Quoted 8 lines
Quoted 6 lines
+
dma_dev->dst_addr_widths=BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); +dma_dev->directions=BIT(DMA_MEM_TO_DEV)|
+BIT(DMA_DEV_TO_MEM);
+dma_dev->residue_granularity=
+DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + }So, if version is !=
DMA_VER22, then you don't support any direction? Why register the DMA device if it can not do any transfer?Only dma0 instance (intel,lgm-cdma) is used as a general purpose slave DMA. we set both control and datapath here.
Other instances we set only control path. data path is taken care by dma
client(GSWIP).Quoted 4 lines
Quoted 3 lines
How the client (GSWIP) can request a channel from intel,lgm-* ? Don't you need some capabilities for the DMA device so core can sort out the request?
client request channel by name,
dma_request_slave_channel(dev, name);clients should use
dma_request_chan(dev, name);If the channel can be requested via DT or ACPI then we don't check the capabilities at all, so yes, that could work.
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Only thing needs to do is get the channel, set the descriptor and just on the channel.
How do you 'on' the channel?
we on the channel in
issue_pending.Right.
Basically you only prep_slave_sg/single for theDMA_VER22? Or do you that for the others w/o direction support?Yes. prep_slave_sg/single only for the
DMA_VER22.So, you place the transfers to DMA_VER22's channel
Quoted 3 lines
Quoted 2 lines
For the intel,lgm-* DMAs you only call
issue_pending()and probablyterminate_all?Yes, correct.
and
issue_pendingon a channel which does not have anything pending? How client knows which of the 'only need to be ON' channel to enable when it placed a transfer to another channel?
Quoted 5 lines
How would the client driver (and the IP) would be integrated with different system DMA which have standard channel management?
If
DMA_VER22knows which intel,lgm-* it should place the transfer then with virt-dma you can handle that just fine?
In the version point of view, "intel,lgm-cdma" dma instance support DMA_VER22. and other "intel,lgm-*" dma instances support > DMA_VER22 .
The channels registered to kernel from "intel,lgm-cdma" dma instance used as a general purpose dma. The clients are SPI, ebu_nand etc.. It uses standard dmaengine calls dma_request_chan(), dmaengine_slave_config(), dmaengine_prep_slave_sg() & dma_async_issue_pending()..
and other dma instances the clients are GSWIP & CQM (Central Queue manager) which uses the DMA in their packet processing. Each dma dma2tx, dma1rx, dma1tx, dma0tx and dma3 had channels 16, 8, 16,16 and 16 respectively and these channels are used by GSWIP & CQM as part of ingress(IGP) and egress(EGP) ports. and each of the dma port uses a dma channel. This is one to one mapping.
The GSWIP & CQM talk to the dma controller driver via dmaengine to get the dma channels using dma_request_slave_channel().
Configures the descriptor base address using intel_dma_chan_desc_cfg() which is EXPORT API from dma driver(this desc base address is the register address(descriptor) of the IGP/EGP), and ON the channel using dma_async_issue_pending.
GSWIP & CQM is highly low level register configurable/programmable take care about the the packet processing through the register configurations.
Quoted 2 lines
Do you have public documentation for the DMA?
Unfortunately we dont have public documentation for this DMA IP.
Quoted 11 lines
It sounds a bit like TI's
EDMA which is in essence is a two part setup:
CC: Channel Controller - to submit transfers (like yourDMA_VER22)
TC: Transfer Controller - it executes the transfers submitted by the CCOne CC can be backed by multiple TCs. I don't have direct control over the TC (can not start/stop), it is controlled by the CC.
Documentation/devicetree/bindings/dma/ti-edma.txtOr is it a different setup?
This is different setup. Explain above. Transfer control is directly controlled by client.
Quoted 6 lines
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki