Skip to contentSkip to conversation

dmaengine: Add support for AM62A SoC DMAs

PATCH Applied Vignesh Raghavendra 4 participants 9 messages Dec 13, 2022 – Dec 28, 2022

Subsystems (3)
lore
Share & tools
lore

Vignesh Raghavendra

author maintainer
#0 lore raw

v3 cover dmaengine: Add support for AM62A SoC DMAs

This series introduces support for various DMAs on TI's AM62A SoC under K3 family of devices.

Apart from usual BCDMA and PKTDMA thats present on K3 family, AM62A has a dedicated BCDMA for camera (CSI) with only RX DMA Channels.

Patch 1 adds bindings for this new DMA instance Patch 2 fixes a bug that gets exposed due to RX only DMA Patch 3 and 4 add base support for AM62A DMA Patch 5 does BCDMA CSI RX specific enhancements.

v3:
Fix yaml bindings to constraint regs and reg-names per compatible

v2:
Fix k3-bcdma.yaml as per Krzysztof 's comments
Address's Peter's comment on 2/5
https://lore.kernel.org/r/[email protected]

v1:
https://lore.kernel.org/dmaengine/[email protected]/

Jai Luthra (1):
dmaengine: ti: k3-psil-am62a: Add AM62Ax PSIL and PDMA data

Vignesh Raghavendra (4):
dt-bindings: dma: ti: k3-bcdma: Add bindings for BCDMA CSI RX
dmaengine: ti: k3-udma: Fix BCDMA for case w/o BCHAN
dmaengine: ti: k3-udma: Add support for DMAs on AM62A SoC
dmaengine: ti: k3-udma: Add support for BCDMA CSI RX

 .../devicetree/bindings/dma/ti/k3-bcdma.yaml  |  77 +++++--
 drivers/dma/ti/Makefile                       |   3 +-
 drivers/dma/ti/k3-psil-am62a.c                | 196 ++++++++++++++++++
 drivers/dma/ti/k3-psil-priv.h                 |   1 +
 drivers/dma/ti/k3-psil.c                      |   1 +
 drivers/dma/ti/k3-udma.c                      |  41 +++-
 6 files changed, 295 insertions(+), 24 deletions(-)
 create mode 100644 drivers/dma/ti/k3-psil-am62a.c
Signature · 1 line
2.38.1
author maintainer
#1 lore raw

PATCH v3 1/5 dt-bindings: dma: ti: k3-bcdma: Add bindings for BCDMA CSI RX

AM62A SoC has a dedicated BCDMA that serves Camera Serial Interface (CSI) IP. Add new compatible for the same. Unlike system BCDMA, this instance only has RX DMA channels and lack TX or block copy channel. Thus make those properties optional. Additionally CSI RX has independent power domain, add the binding for the same.

---
v3:
Add min/max constraints for reg-names and reg on per compatible basis

v2:
reorder compatibles alphabetically
Fix reg defintion to min 3 and max 5
Keep top level constraints as is and further restrict variants within "if-else" blocks

 .../devicetree/bindings/dma/ti/k3-bcdma.yaml  | 77 ++++++++++++++-----
 1 file changed, 59 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml +59 -18
index 08627d91e607..2bc48dfd3396 100644
@@ -28,13 +28,19 @@ description: |
   PDMAs can be configured via BCDMA split channel's peer registers to match with
   the configuration of the legacy peripheral.
 
-allOf:
-  - $ref: /schemas/dma/dma-controller.yaml#
-  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
-
 properties:
   compatible:
-    const: ti,am64-dmss-bcdma
+    enum:
+      - ti,am62a-dmss-bcdma-csirx
+      - ti,am64-dmss-bcdma
+
+  reg:
+    minItems: 3
+    maxItems: 5
+
+  reg-names:
+    minItems: 3
+    maxItems: 5
 
   "#dma-cells":
     const: 3
@@ -65,19 +71,13 @@ properties:
 
       cell 3: ASEL value for the channel
 
-  reg:
-    maxItems: 5
-
-  reg-names:
-    items:
-      - const: gcfg
-      - const: bchanrt
-      - const: rchanrt
-      - const: tchanrt
-      - const: ringrt
-
   msi-parent: true
 
+  power-domains:
+    description:
+      Power domain if available
+    maxItems: 1
+
   ti,asel:
     $ref: /schemas/types.yaml#/definitions/uint32
     description: ASEL value for non slave channels
@@ -123,10 +123,51 @@ required:
   - msi-parent
   - ti,sci
   - ti,sci-dev-id
-  - ti,sci-rm-range-bchan
-  - ti,sci-rm-range-tchan
   - ti,sci-rm-range-rchan
 
+allOf:
+  - $ref: /schemas/dma/dma-controller.yaml#
+  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: ti,am62a-dmss-bcdma-csirx
+    then:
+      properties:
+        ti,sci-rm-range-bchan: false
+        ti,sci-rm-range-tchan: false
+
+        reg:
+          maxItems: 3
+
+        reg-names:
+          items:
+            - const: gcfg
+            - const: rchanrt
+            - const: ringrt
+
+      required:
+        - power-domains
+
+    else:
+      properties:
+        reg:
+          minItems: 5
+
+        reg-names:
+          items:
+            - const: gcfg
+            - const: bchanrt
+            - const: rchanrt
+            - const: tchanrt
+            - const: ringrt
+
+      required:
+        - ti,sci-rm-range-bchan
+        - ti,sci-rm-range-tchan
+
 unevaluatedProperties: false
 
 examples:
Signature · 1 line
2.38.1
Reviewed-by on v3 1/5
#2 lore raw

Re: [PATCH v3 1/5] dt-bindings: dma: ti: k3-bcdma: Add bindings for BCDMA CSI RX

Quoted 11 lines · Vignesh Raghavendra

AM62A SoC has a dedicated BCDMA that serves Camera Serial Interface (CSI) IP. Add new compatible for the same. Unlike system BCDMA, this instance only has RX DMA channels and lack TX or block copy channel. Thus make those properties optional. Additionally CSI RX has independent power domain, add the binding for the same.

---
v3:
Add min/max constraints for reg-names and reg on per compatible basis

Best regards,
Krzysztof

author maintainer
#3 lore raw

PATCH v3 2/5 dmaengine: ti: k3-udma: Fix BCDMA for case w/o BCHAN

In reply to Vignesh Raghavendra

Reusing loop iterator fails if BCHAN is not present as iterator is uninitialized

---
 drivers/dma/ti/k3-udma.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/dma/ti/k3-udma.c +3 -0
index ce8b80bb34d7..aa50d46fa856 100644
@@ -4774,7 +4774,10 @@ static int bcdma_setup_resources(struct udma_dev *ud)
 				irq_res.desc[i].num = rm_res->desc[i].num;
 			}
 		}
+	} else {
+		i = 0;
 	}
+
 	if (ud->tchan_cnt) {
 		rm_res = tisci_rm->rm_ranges[RM_RANGE_TCHAN];
 		if (IS_ERR(rm_res)) {
Signature · 1 line
2.38.1
author maintainer
#4 lore raw

PATCH v3 3/5 dmaengine: ti: k3-psil-am62a: Add AM62Ax PSIL and PDMA data

In reply to Vignesh Raghavendra

From: Jai Luthra <[email protected]>

Add PSIL and PDMA data for AM62Ax SoC.

---
 drivers/dma/ti/Makefile        |   3 +-
 drivers/dma/ti/k3-psil-am62a.c | 196 +++++++++++++++++++++++++++++++++
 drivers/dma/ti/k3-psil-priv.h  |   1 +
 drivers/dma/ti/k3-psil.c       |   1 +
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 drivers/dma/ti/k3-psil-am62a.c
drivers/dma/ti/Makefile +2 -1
index b53d05b11ca5..bd1e07fda559 100644
@@ -10,6 +10,7 @@ k3-psil-lib-objs := k3-psil.o \
 		    k3-psil-j7200.o \
 		    k3-psil-am64.o \
 		    k3-psil-j721s2.o \
-		    k3-psil-am62.o
+		    k3-psil-am62.o \
+		    k3-psil-am62a.o
 obj-$(CONFIG_TI_K3_PSIL) += k3-psil-lib.o
 obj-$(CONFIG_TI_DMA_CROSSBAR) += dma-crossbar.o
drivers/dma/ti/k3-psil-am62a.c new file +196 -0

196 lines not on this page · raw message

drivers/dma/ti/k3-psil-priv.h +1 -0
index 74fa9ec02968..abd650bb7600 100644
@@ -43,5 +43,6 @@ extern struct psil_ep_map j7200_ep_map;
 extern struct psil_ep_map am64_ep_map;
 extern struct psil_ep_map j721s2_ep_map;
 extern struct psil_ep_map am62_ep_map;
+extern struct psil_ep_map am62a_ep_map;
 
 #endif /* K3_PSIL_PRIV_H_ */
drivers/dma/ti/k3-psil.c +1 -0
index 8b6533a1eeeb..2da6988a0e7b 100644
@@ -24,6 +24,7 @@ static const struct soc_device_attribute k3_soc_devices[] = {
 	{ .family = "AM64X", .data = &am64_ep_map },
 	{ .family = "J721S2", .data = &j721s2_ep_map },
 	{ .family = "AM62X", .data = &am62_ep_map },
+	{ .family = "AM62AX", .data = &am62a_ep_map },
 	{ /* sentinel */ }
 };
 
Signature · 1 line
2.38.1
author maintainer
#5 lore raw

PATCH v3 4/5 dmaengine: ti: k3-udma: Add support for DMAs on AM62A SoC

In reply to Vignesh Raghavendra

AM62A SoC has a BCDMA and PKTDMA as systems DMAs for service various peripherals similar to AM64 SoC. Add support for the same.

---
 drivers/dma/ti/k3-udma.c | 1 +
 1 file changed, 1 insertion(+)
drivers/dma/ti/k3-udma.c +1 -0
index aa50d46fa856..c1005d17b42e 100644
@@ -4386,6 +4386,7 @@ static const struct soc_device_attribute k3_soc_devices[] = {
 	{ .family = "AM64X", .data = &am64_soc_data },
 	{ .family = "J721S2", .data = &j721e_soc_data},
 	{ .family = "AM62X", .data = &am64_soc_data },
+	{ .family = "AM62AX", .data = &am64_soc_data },
 	{ /* sentinel */ }
 };
 
Signature · 1 line
2.38.1
author maintainer
#6 lore raw

PATCH v3 5/5 dmaengine: ti: k3-udma: Add support for BCDMA CSI RX

In reply to Vignesh Raghavendra

BCDMA CSI RX present on AM62Ax SoC is a dedicated DMA for servicing Camera Serial Interface (CSI) IP. Add support for the same.

---
 drivers/dma/ti/k3-udma.c | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)
drivers/dma/ti/k3-udma.c +32 -5
index c1005d17b42e..1d3d1b387b96 100644
@@ -135,6 +135,7 @@ struct udma_match_data {
 	u32 flags;
 	u32 statictr_z_mask;
 	u8 burst_size[3];
+	struct udma_soc_data *soc_data;
 };
 
 struct udma_soc_data {
@@ -4295,6 +4296,25 @@ static struct udma_match_data j721e_mcu_data = {
 	},
 };
 
+static struct udma_soc_data am62a_dmss_csi_soc_data = {
+	.oes = {
+		.bcdma_rchan_data = 0xe00,
+		.bcdma_rchan_ring = 0x1000,
+	},
+};
+
+static struct udma_match_data am62a_bcdma_csirx_data = {
+	.type = DMA_TYPE_BCDMA,
+	.psil_base = 0x3100,
+	.enable_memcpy_support = false,
+	.burst_size = {
+		TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+		0, /* No H Channels */
+		0, /* No UH Channels */
+	},
+	.soc_data = &am62a_dmss_csi_soc_data,
+};
+
 static struct udma_match_data am64_bcdma_data = {
 	.type = DMA_TYPE_BCDMA,
 	.psil_base = 0x2000, /* for tchan and rchan, not applicable to bchan */
@@ -4344,6 +4364,10 @@ static const struct of_device_id udma_of_match[] = {
 		.compatible = "ti,am64-dmss-pktdma",
 		.data = &am64_pktdma_data,
 	},
+	{
+		.compatible = "ti,am62a-dmss-bcdma-csirx",
+		.data = &am62a_bcdma_csirx_data,
+	},
 	{ /* Sentinel */ },
 };
 
@@ -5274,12 +5298,15 @@ static int udma_probe(struct platform_device *pdev)
 	}
 	ud->match_data = match->data;
 
-	soc = soc_device_match(k3_soc_devices);
-	if (!soc) {
-		dev_err(dev, "No compatible SoC found\n");
-		return -ENODEV;
+	ud->soc_data = ud->match_data->soc_data;
+	if (!ud->soc_data) {
+		soc = soc_device_match(k3_soc_devices);
+		if (!soc) {
+			dev_err(dev, "No compatible SoC found\n");
+			return -ENODEV;
+		}
+		ud->soc_data = soc->data;
 	}
-	ud->soc_data = soc->data;
 
 	ret = udma_get_mmrs(pdev, ud);
 	if (ret)
Signature · 1 line
2.38.1
Acked-by on the v3 series
#7 lore raw
In reply to Vignesh Raghavendra

Hi Vignesh,

Quoted 10 lines · Vignesh Raghavendra

This series introduces support for various DMAs on TI's AM62A SoC under K3 family of devices.

Apart from usual BCDMA and PKTDMA thats present on K3 family, AM62A has a dedicated BCDMA for camera (CSI) with only RX DMA Channels.

Patch 1 adds bindings for this new DMA instance Patch 2 fixes a bug that gets exposed due to RX only DMA Patch 3 and 4 add base support for AM62A DMA Patch 5 does BCDMA CSI RX specific enhancements.

Looks good, thank you,

Quoted 30 lines

v3:
Fix yaml bindings to constraint regs and reg-names per compatible

v2:
Fix k3-bcdma.yaml as per Krzysztof 's comments
Address's Peter's comment on 2/5
https://lore.kernel.org/r/[email protected]

v1:
https://lore.kernel.org/dmaengine/[email protected]/

Jai Luthra (1):
dmaengine: ti: k3-psil-am62a: Add AM62Ax PSIL and PDMA data

Vignesh Raghavendra (4):
dt-bindings: dma: ti: k3-bcdma: Add bindings for BCDMA CSI RX
dmaengine: ti: k3-udma: Fix BCDMA for case w/o BCHAN
dmaengine: ti: k3-udma: Add support for DMAs on AM62A SoC
dmaengine: ti: k3-udma: Add support for BCDMA CSI RX

  .../devicetree/bindings/dma/ti/k3-bcdma.yaml  |  77 +++++--
  drivers/dma/ti/Makefile                       |   3 +-
  drivers/dma/ti/k3-psil-am62a.c                | 196 ++++++++++++++++++
  drivers/dma/ti/k3-psil-priv.h                 |   1 +
  drivers/dma/ti/k3-psil.c                      |   1 +
  drivers/dma/ti/k3-udma.c                      |  41 +++-
  6 files changed, 295 insertions(+), 24 deletions(-)

create mode 100644 drivers/dma/ti/k3-psil-am62a.c

Signature · 1 line
Péter
maintainer Applied
#8 lore raw
In reply to Vignesh Raghavendra
Quoted 5 lines · Vignesh Raghavendra

This series introduces support for various DMAs on TI's AM62A SoC under K3 family of devices.

Apart from usual BCDMA and PKTDMA thats present on K3 family, AM62A has a dedicated BCDMA for camera (CSI) with only RX DMA Channels.

Applied, thanks

Signature · 1 line
~Vinod