]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dma: ti: Add static PSIL endpoint information
authorVignesh Raghavendra <vigneshr@ti.com>
Tue, 7 Jul 2020 08:13:33 +0000 (13:43 +0530)
committerLokesh Vutla <lokeshvutla@ti.com>
Mon, 13 Jul 2020 15:28:34 +0000 (20:58 +0530)
Much of PSIL endpoint configuration for a given SoC can be known at
compile time, therefore pass them for platform specific data instead of
DT.

Add per SoC's specific PSIL endpoint data. This is to bring driver in
sync with upstream DT.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
drivers/dma/ti/Kconfig
drivers/dma/ti/Makefile
drivers/dma/ti/k3-psil-am654.c [new file with mode: 0644]
drivers/dma/ti/k3-psil-j721e.c [new file with mode: 0644]
drivers/dma/ti/k3-psil-priv.h [new file with mode: 0644]
drivers/dma/ti/k3-psil.c [new file with mode: 0644]
drivers/dma/ti/k3-psil.h [new file with mode: 0644]

index 3d5498326c42247e259947d920a3795b76949c15..9d7a1efb2bdffca86c182114b007d5c0220ec701 100644 (file)
@@ -12,3 +12,6 @@ config TI_K3_NAVSS_UDMA
         help
           Support for UDMA used in K3 devices.
 endif
+
+config TI_K3_PSIL
+       bool
index de2f9ac91a464157af7189213915e184324befa1..4ea9c626ccd571b8f19bbe703a257622a34e3884 100644 (file)
@@ -1,3 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 obj-$(CONFIG_TI_K3_NAVSS_UDMA) += k3-udma.o
+obj-$(CONFIG_TI_K3_PSIL) += k3-psil-data.o
+k3-psil-data-y += k3-psil.o
+k3-psil-data-$(CONFIG_SOC_K3_AM6) += k3-psil-am654.o
+k3-psil-data-$(CONFIG_SOC_K3_J721E) += k3-psil-j721e.o
diff --git a/drivers/dma/ti/k3-psil-am654.c b/drivers/dma/ti/k3-psil-am654.c
new file mode 100644 (file)
index 0000000..f95d99c
--- /dev/null
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *  Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ */
+
+#include <linux/kernel.h>
+
+#include "k3-psil-priv.h"
+
+#define PSIL_ETHERNET(x)                               \
+       {                                               \
+               .thread_id = x,                         \
+               .ep_config = {                          \
+                       .ep_type = PSIL_EP_NATIVE,      \
+                       .pkt_mode = 1,                  \
+                       .needs_epib = 1,                \
+                       .psd_size = 16,                 \
+               },                                      \
+       }
+
+/* PSI-L source thread IDs, used for RX (DMA_DEV_TO_MEM) */
+static struct psil_ep am654_src_ep_map[] = {
+       /* PRU_ICSSG0 */
+       PSIL_ETHERNET(0x4100),
+       PSIL_ETHERNET(0x4101),
+       PSIL_ETHERNET(0x4102),
+       PSIL_ETHERNET(0x4103),
+       /* PRU_ICSSG1 */
+       PSIL_ETHERNET(0x4200),
+       PSIL_ETHERNET(0x4201),
+       PSIL_ETHERNET(0x4202),
+       PSIL_ETHERNET(0x4203),
+       /* PRU_ICSSG2 */
+       PSIL_ETHERNET(0x4300),
+       PSIL_ETHERNET(0x4301),
+       PSIL_ETHERNET(0x4302),
+       PSIL_ETHERNET(0x4303),
+       /* CPSW0 */
+       PSIL_ETHERNET(0x7000),
+};
+
+/* PSI-L destination thread IDs, used for TX (DMA_MEM_TO_DEV) */
+static struct psil_ep am654_dst_ep_map[] = {
+       /* PRU_ICSSG0 */
+       PSIL_ETHERNET(0xc100),
+       PSIL_ETHERNET(0xc101),
+       PSIL_ETHERNET(0xc102),
+       PSIL_ETHERNET(0xc103),
+       PSIL_ETHERNET(0xc104),
+       PSIL_ETHERNET(0xc105),
+       PSIL_ETHERNET(0xc106),
+       PSIL_ETHERNET(0xc107),
+       /* PRU_ICSSG1 */
+       PSIL_ETHERNET(0xc200),
+       PSIL_ETHERNET(0xc201),
+       PSIL_ETHERNET(0xc202),
+       PSIL_ETHERNET(0xc203),
+       PSIL_ETHERNET(0xc204),
+       PSIL_ETHERNET(0xc205),
+       PSIL_ETHERNET(0xc206),
+       PSIL_ETHERNET(0xc207),
+       /* PRU_ICSSG2 */
+       PSIL_ETHERNET(0xc300),
+       PSIL_ETHERNET(0xc301),
+       PSIL_ETHERNET(0xc302),
+       PSIL_ETHERNET(0xc303),
+       PSIL_ETHERNET(0xc304),
+       PSIL_ETHERNET(0xc305),
+       PSIL_ETHERNET(0xc306),
+       PSIL_ETHERNET(0xc307),
+       /* CPSW0 */
+       PSIL_ETHERNET(0xf000),
+       PSIL_ETHERNET(0xf001),
+       PSIL_ETHERNET(0xf002),
+       PSIL_ETHERNET(0xf003),
+       PSIL_ETHERNET(0xf004),
+       PSIL_ETHERNET(0xf005),
+       PSIL_ETHERNET(0xf006),
+       PSIL_ETHERNET(0xf007),
+};
+
+struct psil_ep_map am654_ep_map = {
+       .name = "am654",
+       .src = am654_src_ep_map,
+       .src_count = ARRAY_SIZE(am654_src_ep_map),
+       .dst = am654_dst_ep_map,
+       .dst_count = ARRAY_SIZE(am654_dst_ep_map),
+};
diff --git a/drivers/dma/ti/k3-psil-j721e.c b/drivers/dma/ti/k3-psil-j721e.c
new file mode 100644 (file)
index 0000000..105ffd9
--- /dev/null
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *  Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ */
+
+#include <linux/kernel.h>
+
+#include "k3-psil-priv.h"
+
+#define PSIL_ETHERNET(x)                               \
+       {                                               \
+               .thread_id = x,                         \
+               .ep_config = {                          \
+                       .ep_type = PSIL_EP_NATIVE,      \
+                       .pkt_mode = 1,                  \
+                       .needs_epib = 1,                \
+                       .psd_size = 16,                 \
+               },                                      \
+       }
+
+/* PSI-L source thread IDs, used for RX (DMA_DEV_TO_MEM) */
+static struct psil_ep j721e_src_ep_map[] = {
+       /* CPSW0 */
+       PSIL_ETHERNET(0x7000),
+};
+
+/* PSI-L destination thread IDs, used for TX (DMA_MEM_TO_DEV) */
+static struct psil_ep j721e_dst_ep_map[] = {
+       /* CPSW0 */
+       PSIL_ETHERNET(0xf000),
+       PSIL_ETHERNET(0xf001),
+       PSIL_ETHERNET(0xf002),
+       PSIL_ETHERNET(0xf003),
+       PSIL_ETHERNET(0xf004),
+       PSIL_ETHERNET(0xf005),
+       PSIL_ETHERNET(0xf006),
+       PSIL_ETHERNET(0xf007),
+};
+
+struct psil_ep_map j721e_ep_map = {
+       .name = "j721e",
+       .src = j721e_src_ep_map,
+       .src_count = ARRAY_SIZE(j721e_src_ep_map),
+       .dst = j721e_dst_ep_map,
+       .dst_count = ARRAY_SIZE(j721e_dst_ep_map),
+};
diff --git a/drivers/dma/ti/k3-psil-priv.h b/drivers/dma/ti/k3-psil-priv.h
new file mode 100644 (file)
index 0000000..d3a3832
--- /dev/null
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ *  Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ */
+
+#ifndef K3_PSIL_PRIV_H_
+#define K3_PSIL_PRIV_H_
+
+#include "k3-psil.h"
+
+struct psil_ep {
+       u32 thread_id;
+       struct psil_endpoint_config ep_config;
+};
+
+/**
+ * struct psil_ep_map - PSI-L thread ID configuration maps
+ * @name:      Name of the map, set it to the name of the SoC
+ * @src:       Array of source PSI-L thread configurations
+ * @src_count: Number of entries in the src array
+ * @dst:       Array of destination PSI-L thread configurations
+ * @dst_count: Number of entries in the dst array
+ *
+ * In case of symmetric configuration for a matching src/dst thread (for example
+ * 0x4400 and 0xc400) only the src configuration can be present. If no dst
+ * configuration found the code will look for (dst_thread_id & ~0x8000) to find
+ * the symmetric match.
+ */
+struct psil_ep_map {
+       char *name;
+       struct psil_ep  *src;
+       int src_count;
+       struct psil_ep  *dst;
+       int dst_count;
+};
+
+struct psil_endpoint_config *psil_get_ep_config(u32 thread_id);
+
+/* SoC PSI-L endpoint maps */
+extern struct psil_ep_map am654_ep_map;
+extern struct psil_ep_map j721e_ep_map;
+
+#endif /* K3_PSIL_PRIV_H_ */
diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c
new file mode 100644 (file)
index 0000000..b5c92b2
--- /dev/null
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *  Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+
+#include "k3-psil-priv.h"
+
+static const struct psil_ep_map *soc_ep_map;
+
+struct psil_endpoint_config *psil_get_ep_config(u32 thread_id)
+{
+       int i;
+
+       if (!soc_ep_map) {
+               if (IS_ENABLED(CONFIG_SOC_K3_AM6))
+                       soc_ep_map = &am654_ep_map;
+               else if (IS_ENABLED(CONFIG_SOC_K3_J721E))
+                       soc_ep_map = &j721e_ep_map;
+       }
+
+       if (thread_id & K3_PSIL_DST_THREAD_ID_OFFSET && soc_ep_map->dst) {
+               /* check in destination thread map */
+               for (i = 0; i < soc_ep_map->dst_count; i++) {
+                       if (soc_ep_map->dst[i].thread_id == thread_id)
+                               return &soc_ep_map->dst[i].ep_config;
+               }
+       }
+
+       thread_id &= ~K3_PSIL_DST_THREAD_ID_OFFSET;
+       if (soc_ep_map->src) {
+               for (i = 0; i < soc_ep_map->src_count; i++) {
+                       if (soc_ep_map->src[i].thread_id == thread_id)
+                               return &soc_ep_map->src[i].ep_config;
+               }
+       }
+
+       return ERR_PTR(-ENOENT);
+}
diff --git a/drivers/dma/ti/k3-psil.h b/drivers/dma/ti/k3-psil.h
new file mode 100644 (file)
index 0000000..53c61b4
--- /dev/null
@@ -0,0 +1,67 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ *  Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ */
+
+#ifndef K3_PSIL_H_
+#define K3_PSIL_H_
+
+#include <linux/types.h>
+
+#define K3_PSIL_DST_THREAD_ID_OFFSET 0x8000
+
+struct device;
+
+/**
+ * enum udma_tp_level - Channel Throughput Levels
+ * @UDMA_TP_NORMAL:    Normal channel
+ * @UDMA_TP_HIGH:      High Throughput channel
+ * @UDMA_TP_ULTRAHIGH: Ultra High Throughput channel
+ */
+enum udma_tp_level {
+       UDMA_TP_NORMAL = 0,
+       UDMA_TP_HIGH,
+       UDMA_TP_ULTRAHIGH,
+       UDMA_TP_LAST,
+};
+
+/**
+ * enum psil_endpoint_type - PSI-L Endpoint type
+ * @PSIL_EP_NATIVE:    Normal channel
+ * @PSIL_EP_PDMA_XY:   XY mode PDMA
+ * @PSIL_EP_PDMA_MCAN: MCAN mode PDMA
+ * @PSIL_EP_PDMA_AASRC: AASRC mode PDMA
+ */
+enum psil_endpoint_type {
+       PSIL_EP_NATIVE = 0,
+       PSIL_EP_PDMA_XY,
+       PSIL_EP_PDMA_MCAN,
+       PSIL_EP_PDMA_AASRC,
+};
+
+/**
+ * struct psil_endpoint_config - PSI-L Endpoint configuration
+ * @ep_type:           PSI-L endpoint type
+ * @pkt_mode:          If set, the channel must be in Packet mode, otherwise in
+ *                     TR mode
+ * @notdpkt:           TDCM must be suppressed on the TX channel
+ * @needs_epib:                Endpoint needs EPIB
+ * @psd_size:          If set, PSdata is used by the endpoint
+ * @channel_tpl:       Desired throughput level for the channel
+ * @pdma_acc32:                ACC32 must be enabled on the PDMA side
+ * @pdma_burst:                BURST must be enabled on the PDMA side
+ */
+struct psil_endpoint_config {
+       enum psil_endpoint_type ep_type;
+
+       unsigned pkt_mode:1;
+       unsigned notdpkt:1;
+       unsigned needs_epib:1;
+       u32 psd_size;
+       enum udma_tp_level channel_tpl;
+
+       /* PDMA properties, valid for PSIL_EP_PDMA_* */
+       unsigned pdma_acc32:1;
+       unsigned pdma_burst:1;
+};
+#endif /* K3_PSIL_H_ */