* [PATCH v12 0/3] riscv: sophgo: add dmamux support for Sophgo CV1800/SG2000 SoCs
@ 2024-08-27 6:48 Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 1/3] dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series SoC Inochi Amaoto
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-27 6:48 UTC (permalink / raw)
To: Vinod Koul, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Chen Wang, Inochi Amaoto, Paul Walmsley, Palmer Dabbelt,
Albert Ou
Cc: dmaengine, devicetree, linux-kernel, linux-riscv
Add dma multiplexer support for the Sophgo CV1800/SG2000 SoCs.
As the syscon device of CV1800 have a usb phy subdevices. The
binding of the syscon can not be complete without the usb phy
is finished. As a result, the binding of syscon is removed
and will be evolved in its original series after the usb phy
binding is fully explored.
Changed from v11:
1. init all the field of the driver data.
Changed from v10:
1. binding: fixed binding id.
Changed from v9:
1. binding: rename to cv1800b-dmamux.
2. binding: remove the unused formatting.
Changed from v8:
1. change compatible name from cv1800-dmamux to cv1800b-dmamux
2. use guard to simpify spinlock process.
Changed from v7:
1. remove unused variable
Changed from v6:
1. fix copyright time.
2. driver only output mapping info in when debugging.
3. remove dma-master check in the driver init since the binding
always require it.
Changed from v5:
1. remove dead binding header.
2. make "reg" required so the syscon binding can have the same
example node of the dmamux binding.
Changed from v4:
1. remove the syscon binding since it can not be complete (still
lack some subdevices)
2. add reg description for the binding,
3. remove the fixed channel assign for dmamux binding
3. driver adopt to the binding change. Now the driver allocates all the
channel when initing and maps the request chan to the channel dynamicly.
Changed from v3:
1. fix dt-binding address issue.
Changed from v2:
1. add reg property of dmamux node in the binding of patch 2
Changed from v1:
1. fix wrong title of patch 2.
Inochi Amaoto (3):
dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series
SoC
soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
dmaengine: add driver for Sophgo CV18XX/SG200X dmamux
.../bindings/dma/sophgo,cv1800b-dmamux.yaml | 51 ++++
drivers/dma/Kconfig | 9 +
drivers/dma/Makefile | 1 +
drivers/dma/cv1800-dmamux.c | 257 ++++++++++++++++++
include/soc/sophgo/cv1800-sysctl.h | 30 ++
5 files changed, 348 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml
create mode 100644 drivers/dma/cv1800-dmamux.c
create mode 100644 include/soc/sophgo/cv1800-sysctl.h
--
2.46.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v12 1/3] dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series SoC
2024-08-27 6:48 [PATCH v12 0/3] riscv: sophgo: add dmamux support for Sophgo CV1800/SG2000 SoCs Inochi Amaoto
@ 2024-08-27 6:49 ` Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux Inochi Amaoto
2 siblings, 0 replies; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-27 6:49 UTC (permalink / raw)
To: Vinod Koul, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Chen Wang, Inochi Amaoto, Paul Walmsley, Palmer Dabbelt,
Albert Ou
Cc: dmaengine, devicetree, linux-kernel, linux-riscv, Conor Dooley
The DMA IP of Sophgo CV18XX/SG200X is based on a DW AXI CORE, with
an additional channel remap register located in the top system control
area. The DMA channel is exclusive to each core.
In addition, the DMA multiplexer is a subdevice of system controller,
so this binding only contains necessary properties for the multiplexer
itself.
Add the dmamux binding for CV18XX/SG200X series SoC.
Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
---
.../bindings/dma/sophgo,cv1800b-dmamux.yaml | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml
diff --git a/Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml b/Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml
new file mode 100644
index 000000000000..e444ac2cc9a2
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml
@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/dma/sophgo,cv1800b-dmamux.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Sophgo CV1800/SG200 Series DMA multiplexer
+
+maintainers:
+ - Inochi Amaoto <inochiama@outlook.com>
+
+description:
+ The DMA multiplexer of CV1800 is a subdevice of the system
+ controller. It support mapping 8 channels, but each channel
+ can be mapped only once.
+
+allOf:
+ - $ref: dma-router.yaml#
+
+properties:
+ compatible:
+ const: sophgo,cv1800b-dmamux
+
+ reg:
+ items:
+ - description: DMA channal remapping register
+ - description: DMA channel interrupt mapping register
+
+ '#dma-cells':
+ const: 2
+ description:
+ The first cells is device id. The second one is the cpu id.
+
+ dma-masters:
+ maxItems: 1
+
+required:
+ - reg
+ - '#dma-cells'
+ - dma-masters
+
+additionalProperties: false
+
+examples:
+ - |
+ dma-router@154 {
+ compatible = "sophgo,cv1800b-dmamux";
+ reg = <0x154 0x8>, <0x298 0x4>;
+ #dma-cells = <2>;
+ dma-masters = <&dmac>;
+ };
--
2.46.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
2024-08-27 6:48 [PATCH v12 0/3] riscv: sophgo: add dmamux support for Sophgo CV1800/SG2000 SoCs Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 1/3] dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series SoC Inochi Amaoto
@ 2024-08-27 6:49 ` Inochi Amaoto
2024-08-28 17:54 ` Vinod Koul
2024-08-27 6:49 ` [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux Inochi Amaoto
2 siblings, 1 reply; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-27 6:49 UTC (permalink / raw)
To: Vinod Koul, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Chen Wang, Inochi Amaoto, Paul Walmsley, Palmer Dabbelt,
Albert Ou
Cc: dmaengine, devicetree, linux-kernel, linux-riscv
The "top" system controller of CV18XX/SG200X exposes control
register access for various devices. Add soc header file to
describe it.
Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
---
include/soc/sophgo/cv1800-sysctl.h | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 include/soc/sophgo/cv1800-sysctl.h
diff --git a/include/soc/sophgo/cv1800-sysctl.h b/include/soc/sophgo/cv1800-sysctl.h
new file mode 100644
index 000000000000..b9396d33e240
--- /dev/null
+++ b/include/soc/sophgo/cv1800-sysctl.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2023 Inochi Amaoto <inochiama@outlook.com>
+ */
+
+#ifndef CV1800_SYSCTL_H
+#define CV1800_SYSCTL_H
+
+/*
+ * SOPHGO CV1800/SG2000 SoC top system controller registers offsets.
+ */
+
+#define CV1800_CONF_INFO 0x004
+#define CV1800_SYS_CTRL_REG 0x008
+#define CV1800_USB_PHY_CTRL_REG 0x048
+#define CV1800_SDMA_DMA_CHANNEL_REMAP0 0x154
+#define CV1800_SDMA_DMA_CHANNEL_REMAP1 0x158
+#define CV1800_TOP_TIMER_CLK_SEL 0x1a0
+#define CV1800_TOP_WDT_CTRL 0x1a8
+#define CV1800_DDR_AXI_URGENT_OW 0x1b8
+#define CV1800_DDR_AXI_URGENT 0x1bc
+#define CV1800_DDR_AXI_QOS_0 0x1d8
+#define CV1800_DDR_AXI_QOS_1 0x1dc
+#define CV1800_SD_PWRSW_CTRL 0x1f4
+#define CV1800_SD_PWRSW_TIME 0x1f8
+#define CV1800_DDR_AXI_QOS_OW 0x23c
+#define CV1800_SD_CTRL_OPT 0x294
+#define CV1800_SDMA_DMA_INT_MUX 0x298
+
+#endif // CV1800_SYSCTL_H
--
2.46.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux
2024-08-27 6:48 [PATCH v12 0/3] riscv: sophgo: add dmamux support for Sophgo CV1800/SG2000 SoCs Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 1/3] dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series SoC Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X Inochi Amaoto
@ 2024-08-27 6:49 ` Inochi Amaoto
2024-08-28 17:56 ` Vinod Koul
2 siblings, 1 reply; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-27 6:49 UTC (permalink / raw)
To: Vinod Koul, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Chen Wang, Inochi Amaoto, Paul Walmsley, Palmer Dabbelt,
Albert Ou
Cc: dmaengine, devicetree, linux-kernel, linux-riscv
Sophgo CV18XX/SG200X use DW AXI CORE with a multiplexer for remapping
its request lines. The multiplexer supports at most 8 request lines.
Add driver for Sophgo CV18XX/SG200X DMA multiplexer.
Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
---
drivers/dma/Kconfig | 9 ++
drivers/dma/Makefile | 1 +
drivers/dma/cv1800-dmamux.c | 257 ++++++++++++++++++++++++++++++++++++
3 files changed, 267 insertions(+)
create mode 100644 drivers/dma/cv1800-dmamux.c
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index cc0a62c34861..df010ee1de46 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -546,6 +546,15 @@ config PLX_DMA
These are exposed via extra functions on the switch's
upstream port. Each function exposes one DMA channel.
+config SOPHGO_CV1800_DMAMUX
+ tristate "Sophgo CV1800/SG2000 series SoC DMA multiplexer support"
+ depends on MFD_SYSCON
+ depends on ARCH_SOPHGO
+ help
+ Support for the DMA multiplexer on Sophgo CV1800/SG2000
+ series SoCs.
+ Say Y here if your board have this soc.
+
config STE_DMA40
bool "ST-Ericsson DMA40 support"
depends on ARCH_U8500
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 374ea98faf43..60d05b305082 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
obj-$(CONFIG_PXA_DMA) += pxa_dma.o
obj-$(CONFIG_RENESAS_DMA) += sh/
obj-$(CONFIG_SF_PDMA) += sf-pdma/
+obj-$(CONFIG_SOPHGO_CV1800_DMAMUX) += cv1800-dmamux.o
obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
diff --git a/drivers/dma/cv1800-dmamux.c b/drivers/dma/cv1800-dmamux.c
new file mode 100644
index 000000000000..a907c72325c7
--- /dev/null
+++ b/drivers/dma/cv1800-dmamux.c
@@ -0,0 +1,257 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2024 Inochi Amaoto <inochiama@outlook.com>
+ */
+
+#include <linux/bitops.h>
+#include <linux/cleanup.h>
+#include <linux/module.h>
+#include <linux/of_dma.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/llist.h>
+#include <linux/regmap.h>
+#include <linux/spinlock.h>
+#include <linux/mfd/syscon.h>
+
+#include <soc/sophgo/cv1800-sysctl.h>
+
+#define DMAMUX_NCELLS 2
+#define MAX_DMA_MAPPING_ID 42
+#define MAX_DMA_CPU_ID 2
+#define MAX_DMA_CH_ID 7
+
+#define DMAMUX_INTMUX_REGISTER_LEN 4
+#define DMAMUX_NR_CH_PER_REGISTER 4
+#define DMAMUX_BIT_PER_CH 8
+#define DMAMUX_CH_MASk GENMASK(5, 0)
+#define DMAMUX_INT_BIT_PER_CPU 10
+#define DMAMUX_CH_UPDATE_BIT BIT(31)
+
+#define DMAMUX_CH_REGPOS(chid) \
+ ((chid) / DMAMUX_NR_CH_PER_REGISTER)
+#define DMAMUX_CH_REGOFF(chid) \
+ ((chid) % DMAMUX_NR_CH_PER_REGISTER)
+#define DMAMUX_CH_REG(chid) \
+ ((DMAMUX_CH_REGPOS(chid) * sizeof(u32)) + \
+ CV1800_SDMA_DMA_CHANNEL_REMAP0)
+#define DMAMUX_CH_SET(chid, val) \
+ (((val) << (DMAMUX_CH_REGOFF(chid) * DMAMUX_BIT_PER_CH)) | \
+ DMAMUX_CH_UPDATE_BIT)
+#define DMAMUX_CH_MASK(chid) \
+ DMAMUX_CH_SET(chid, DMAMUX_CH_MASk)
+
+#define DMAMUX_INT_BIT(chid, cpuid) \
+ BIT((cpuid) * DMAMUX_INT_BIT_PER_CPU + (chid))
+#define DMAMUX_INTEN_BIT(cpuid) \
+ DMAMUX_INT_BIT(8, cpuid)
+#define DMAMUX_INT_CH_BIT(chid, cpuid) \
+ (DMAMUX_INT_BIT(chid, cpuid) | DMAMUX_INTEN_BIT(cpuid))
+#define DMAMUX_INT_MASK(chid) \
+ (DMAMUX_INT_BIT(chid, 0) | \
+ DMAMUX_INT_BIT(chid, 1) | \
+ DMAMUX_INT_BIT(chid, 2))
+#define DMAMUX_INT_CH_MASK(chid, cpuid) \
+ (DMAMUX_INT_MASK(chid) | DMAMUX_INTEN_BIT(cpuid))
+
+struct cv1800_dmamux_data {
+ struct dma_router dmarouter;
+ struct regmap *regmap;
+ spinlock_t lock;
+ struct llist_head free_maps;
+ struct llist_head reserve_maps;
+ DECLARE_BITMAP(mapped_peripherals, MAX_DMA_MAPPING_ID);
+};
+
+struct cv1800_dmamux_map {
+ struct llist_node node;
+ unsigned int channel;
+ unsigned int peripheral;
+ unsigned int cpu;
+};
+
+static void cv1800_dmamux_free(struct device *dev, void *route_data)
+{
+ struct cv1800_dmamux_data *dmamux = dev_get_drvdata(dev);
+ struct cv1800_dmamux_map *map = route_data;
+
+ guard(spinlock_irqsave)(&dmamux->lock);
+
+ regmap_update_bits(dmamux->regmap,
+ DMAMUX_CH_REG(map->channel),
+ DMAMUX_CH_MASK(map->channel),
+ DMAMUX_CH_UPDATE_BIT);
+
+ regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
+ DMAMUX_INT_CH_MASK(map->channel, map->cpu),
+ DMAMUX_INTEN_BIT(map->cpu));
+
+ dev_dbg(dev, "free channel %u for req %u (cpu %u)\n",
+ map->channel, map->peripheral, map->cpu);
+}
+
+static void *cv1800_dmamux_route_allocate(struct of_phandle_args *dma_spec,
+ struct of_dma *ofdma)
+{
+ struct platform_device *pdev = of_find_device_by_node(ofdma->of_node);
+ struct cv1800_dmamux_data *dmamux = platform_get_drvdata(pdev);
+ struct cv1800_dmamux_map *map;
+ struct llist_node *node;
+ unsigned long flags;
+ unsigned int chid, devid, cpuid;
+ int ret;
+
+ if (dma_spec->args_count != DMAMUX_NCELLS) {
+ dev_err(&pdev->dev, "invalid number of dma mux args\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ devid = dma_spec->args[0];
+ cpuid = dma_spec->args[1];
+ dma_spec->args_count = 1;
+
+ if (devid > MAX_DMA_MAPPING_ID) {
+ dev_err(&pdev->dev, "invalid device id: %u\n", devid);
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (cpuid > MAX_DMA_CPU_ID) {
+ dev_err(&pdev->dev, "invalid cpu id: %u\n", cpuid);
+ return ERR_PTR(-EINVAL);
+ }
+
+ dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0);
+ if (!dma_spec->np) {
+ dev_err(&pdev->dev, "can't get dma master\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ spin_lock_irqsave(&dmamux->lock, flags);
+
+ if (test_bit(devid, dmamux->mapped_peripherals)) {
+ llist_for_each_entry(map, dmamux->reserve_maps.first, node) {
+ if (map->peripheral == devid && map->cpu == cpuid)
+ goto found;
+ }
+
+ ret = -EINVAL;
+ goto failed;
+ } else {
+ node = llist_del_first(&dmamux->free_maps);
+ if (!node) {
+ ret = -ENODEV;
+ goto failed;
+ }
+
+ map = llist_entry(node, struct cv1800_dmamux_map, node);
+ llist_add(&map->node, &dmamux->reserve_maps);
+ set_bit(devid, dmamux->mapped_peripherals);
+ }
+
+found:
+ chid = map->channel;
+ map->peripheral = devid;
+ map->cpu = cpuid;
+
+ regmap_set_bits(dmamux->regmap,
+ DMAMUX_CH_REG(chid),
+ DMAMUX_CH_SET(chid, devid));
+
+ regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
+ DMAMUX_INT_CH_MASK(chid, cpuid),
+ DMAMUX_INT_CH_BIT(chid, cpuid));
+
+ spin_unlock_irqrestore(&dmamux->lock, flags);
+
+ dma_spec->args[0] = chid;
+
+ dev_dbg(&pdev->dev, "register channel %u for req %u (cpu %u)\n",
+ chid, devid, cpuid);
+
+ return map;
+
+failed:
+ spin_unlock_irqrestore(&dmamux->lock, flags);
+ of_node_put(dma_spec->np);
+ dev_err(&pdev->dev, "errno %d\n", ret);
+ return ERR_PTR(ret);
+}
+
+static int cv1800_dmamux_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *mux_node = dev->of_node;
+ struct cv1800_dmamux_data *data;
+ struct cv1800_dmamux_map *tmp;
+ struct device *parent = dev->parent;
+ struct regmap *regmap = NULL;
+ unsigned int i;
+
+ if (!parent)
+ return -ENODEV;
+
+ regmap = device_node_to_regmap(parent->of_node);
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
+
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ spin_lock_init(&data->lock);
+ init_llist_head(&data->free_maps);
+ init_llist_head(&data->reserve_maps);
+
+ for (i = 0; i <= MAX_DMA_CH_ID; i++) {
+ tmp = devm_kmalloc(dev, sizeof(*tmp), GFP_KERNEL);
+ if (!tmp) {
+ /* It is OK for not allocating all channel */
+ dev_warn(dev, "can not allocate channel %u\n", i);
+ continue;
+ }
+
+ init_llist_node(&tmp->node);
+ tmp->channel = i;
+ llist_add(&tmp->node, &data->free_maps);
+ }
+
+ /* if no channel is allocated, the probe must fail */
+ if (llist_empty(&data->free_maps))
+ return -ENOMEM;
+
+ data->regmap = regmap;
+ data->dmarouter.dev = dev;
+ data->dmarouter.route_free = cv1800_dmamux_free;
+
+ platform_set_drvdata(pdev, data);
+
+ return of_dma_router_register(mux_node,
+ cv1800_dmamux_route_allocate,
+ &data->dmarouter);
+}
+
+static void cv1800_dmamux_remove(struct platform_device *pdev)
+{
+ of_dma_controller_free(pdev->dev.of_node);
+}
+
+static const struct of_device_id cv1800_dmamux_ids[] = {
+ { .compatible = "sophgo,cv1800b-dmamux", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, cv1800_dmamux_ids);
+
+static struct platform_driver cv1800_dmamux_driver = {
+ .driver = {
+ .name = "cv1800-dmamux",
+ .of_match_table = cv1800_dmamux_ids,
+ },
+ .probe = cv1800_dmamux_probe,
+ .remove_new = cv1800_dmamux_remove,
+};
+module_platform_driver(cv1800_dmamux_driver);
+
+MODULE_AUTHOR("Inochi Amaoto <inochiama@outlook.com>");
+MODULE_DESCRIPTION("Sophgo CV1800/SG2000 Series SoC DMAMUX driver");
+MODULE_LICENSE("GPL");
--
2.46.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
2024-08-27 6:49 ` [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X Inochi Amaoto
@ 2024-08-28 17:54 ` Vinod Koul
2024-08-29 1:38 ` Inochi Amaoto
0 siblings, 1 reply; 10+ messages in thread
From: Vinod Koul @ 2024-08-28 17:54 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On 27-08-24, 14:49, Inochi Amaoto wrote:
> The "top" system controller of CV18XX/SG200X exposes control
> register access for various devices. Add soc header file to
> describe it.
I dont think I am full onboard this idea, but still need someone to ack
it
>
> Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
> ---
> include/soc/sophgo/cv1800-sysctl.h | 30 ++++++++++++++++++++++++++++++
is soc/sophgo/ right path? why not include/soc/sifive/... (sorry dont
know much about this here...)
--
~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux
2024-08-27 6:49 ` [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux Inochi Amaoto
@ 2024-08-28 17:56 ` Vinod Koul
2024-08-29 1:23 ` Inochi Amaoto
0 siblings, 1 reply; 10+ messages in thread
From: Vinod Koul @ 2024-08-28 17:56 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On 27-08-24, 14:49, Inochi Amaoto wrote:
> Sophgo CV18XX/SG200X use DW AXI CORE with a multiplexer for remapping
> its request lines. The multiplexer supports at most 8 request lines.
>
> Add driver for Sophgo CV18XX/SG200X DMA multiplexer.
>
> Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
> ---
> drivers/dma/Kconfig | 9 ++
> drivers/dma/Makefile | 1 +
> drivers/dma/cv1800-dmamux.c | 257 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 267 insertions(+)
> create mode 100644 drivers/dma/cv1800-dmamux.c
>
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index cc0a62c34861..df010ee1de46 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -546,6 +546,15 @@ config PLX_DMA
> These are exposed via extra functions on the switch's
> upstream port. Each function exposes one DMA channel.
>
> +config SOPHGO_CV1800_DMAMUX
> + tristate "Sophgo CV1800/SG2000 series SoC DMA multiplexer support"
> + depends on MFD_SYSCON
> + depends on ARCH_SOPHGO
this lgtm, maybe add || COMPILE_TEST for wider compile test coverage?
> + help
> + Support for the DMA multiplexer on Sophgo CV1800/SG2000
> + series SoCs.
> + Say Y here if your board have this soc.
> +
> config STE_DMA40
> bool "ST-Ericsson DMA40 support"
> depends on ARCH_U8500
> diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
> index 374ea98faf43..60d05b305082 100644
> --- a/drivers/dma/Makefile
> +++ b/drivers/dma/Makefile
> @@ -69,6 +69,7 @@ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
> obj-$(CONFIG_PXA_DMA) += pxa_dma.o
> obj-$(CONFIG_RENESAS_DMA) += sh/
> obj-$(CONFIG_SF_PDMA) += sf-pdma/
> +obj-$(CONFIG_SOPHGO_CV1800_DMAMUX) += cv1800-dmamux.o
> obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
> obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
> obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
> diff --git a/drivers/dma/cv1800-dmamux.c b/drivers/dma/cv1800-dmamux.c
> new file mode 100644
> index 000000000000..a907c72325c7
> --- /dev/null
> +++ b/drivers/dma/cv1800-dmamux.c
> @@ -0,0 +1,257 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2024 Inochi Amaoto <inochiama@outlook.com>
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/cleanup.h>
> +#include <linux/module.h>
> +#include <linux/of_dma.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/llist.h>
> +#include <linux/regmap.h>
> +#include <linux/spinlock.h>
> +#include <linux/mfd/syscon.h>
> +
> +#include <soc/sophgo/cv1800-sysctl.h>
> +
> +#define DMAMUX_NCELLS 2
> +#define MAX_DMA_MAPPING_ID 42
> +#define MAX_DMA_CPU_ID 2
> +#define MAX_DMA_CH_ID 7
> +
> +#define DMAMUX_INTMUX_REGISTER_LEN 4
> +#define DMAMUX_NR_CH_PER_REGISTER 4
> +#define DMAMUX_BIT_PER_CH 8
> +#define DMAMUX_CH_MASk GENMASK(5, 0)
> +#define DMAMUX_INT_BIT_PER_CPU 10
> +#define DMAMUX_CH_UPDATE_BIT BIT(31)
> +
> +#define DMAMUX_CH_REGPOS(chid) \
> + ((chid) / DMAMUX_NR_CH_PER_REGISTER)
> +#define DMAMUX_CH_REGOFF(chid) \
> + ((chid) % DMAMUX_NR_CH_PER_REGISTER)
> +#define DMAMUX_CH_REG(chid) \
> + ((DMAMUX_CH_REGPOS(chid) * sizeof(u32)) + \
> + CV1800_SDMA_DMA_CHANNEL_REMAP0)
> +#define DMAMUX_CH_SET(chid, val) \
> + (((val) << (DMAMUX_CH_REGOFF(chid) * DMAMUX_BIT_PER_CH)) | \
> + DMAMUX_CH_UPDATE_BIT)
> +#define DMAMUX_CH_MASK(chid) \
> + DMAMUX_CH_SET(chid, DMAMUX_CH_MASk)
> +
> +#define DMAMUX_INT_BIT(chid, cpuid) \
> + BIT((cpuid) * DMAMUX_INT_BIT_PER_CPU + (chid))
> +#define DMAMUX_INTEN_BIT(cpuid) \
> + DMAMUX_INT_BIT(8, cpuid)
> +#define DMAMUX_INT_CH_BIT(chid, cpuid) \
> + (DMAMUX_INT_BIT(chid, cpuid) | DMAMUX_INTEN_BIT(cpuid))
> +#define DMAMUX_INT_MASK(chid) \
> + (DMAMUX_INT_BIT(chid, 0) | \
> + DMAMUX_INT_BIT(chid, 1) | \
> + DMAMUX_INT_BIT(chid, 2))
> +#define DMAMUX_INT_CH_MASK(chid, cpuid) \
> + (DMAMUX_INT_MASK(chid) | DMAMUX_INTEN_BIT(cpuid))
> +
> +struct cv1800_dmamux_data {
> + struct dma_router dmarouter;
> + struct regmap *regmap;
> + spinlock_t lock;
> + struct llist_head free_maps;
> + struct llist_head reserve_maps;
> + DECLARE_BITMAP(mapped_peripherals, MAX_DMA_MAPPING_ID);
> +};
> +
> +struct cv1800_dmamux_map {
> + struct llist_node node;
> + unsigned int channel;
> + unsigned int peripheral;
> + unsigned int cpu;
> +};
> +
> +static void cv1800_dmamux_free(struct device *dev, void *route_data)
> +{
> + struct cv1800_dmamux_data *dmamux = dev_get_drvdata(dev);
> + struct cv1800_dmamux_map *map = route_data;
> +
> + guard(spinlock_irqsave)(&dmamux->lock);
> +
> + regmap_update_bits(dmamux->regmap,
> + DMAMUX_CH_REG(map->channel),
> + DMAMUX_CH_MASK(map->channel),
> + DMAMUX_CH_UPDATE_BIT);
> +
> + regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
> + DMAMUX_INT_CH_MASK(map->channel, map->cpu),
> + DMAMUX_INTEN_BIT(map->cpu));
> +
> + dev_dbg(dev, "free channel %u for req %u (cpu %u)\n",
> + map->channel, map->peripheral, map->cpu);
> +}
> +
> +static void *cv1800_dmamux_route_allocate(struct of_phandle_args *dma_spec,
> + struct of_dma *ofdma)
> +{
> + struct platform_device *pdev = of_find_device_by_node(ofdma->of_node);
> + struct cv1800_dmamux_data *dmamux = platform_get_drvdata(pdev);
> + struct cv1800_dmamux_map *map;
> + struct llist_node *node;
> + unsigned long flags;
> + unsigned int chid, devid, cpuid;
> + int ret;
> +
> + if (dma_spec->args_count != DMAMUX_NCELLS) {
> + dev_err(&pdev->dev, "invalid number of dma mux args\n");
> + return ERR_PTR(-EINVAL);
> + }
> +
> + devid = dma_spec->args[0];
> + cpuid = dma_spec->args[1];
> + dma_spec->args_count = 1;
> +
> + if (devid > MAX_DMA_MAPPING_ID) {
> + dev_err(&pdev->dev, "invalid device id: %u\n", devid);
> + return ERR_PTR(-EINVAL);
> + }
> +
> + if (cpuid > MAX_DMA_CPU_ID) {
> + dev_err(&pdev->dev, "invalid cpu id: %u\n", cpuid);
> + return ERR_PTR(-EINVAL);
> + }
> +
> + dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0);
> + if (!dma_spec->np) {
> + dev_err(&pdev->dev, "can't get dma master\n");
> + return ERR_PTR(-EINVAL);
> + }
> +
> + spin_lock_irqsave(&dmamux->lock, flags);
> +
> + if (test_bit(devid, dmamux->mapped_peripherals)) {
> + llist_for_each_entry(map, dmamux->reserve_maps.first, node) {
> + if (map->peripheral == devid && map->cpu == cpuid)
> + goto found;
> + }
> +
> + ret = -EINVAL;
> + goto failed;
> + } else {
> + node = llist_del_first(&dmamux->free_maps);
> + if (!node) {
> + ret = -ENODEV;
> + goto failed;
> + }
> +
> + map = llist_entry(node, struct cv1800_dmamux_map, node);
> + llist_add(&map->node, &dmamux->reserve_maps);
> + set_bit(devid, dmamux->mapped_peripherals);
> + }
> +
> +found:
> + chid = map->channel;
> + map->peripheral = devid;
> + map->cpu = cpuid;
> +
> + regmap_set_bits(dmamux->regmap,
> + DMAMUX_CH_REG(chid),
> + DMAMUX_CH_SET(chid, devid));
> +
> + regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
> + DMAMUX_INT_CH_MASK(chid, cpuid),
> + DMAMUX_INT_CH_BIT(chid, cpuid));
> +
> + spin_unlock_irqrestore(&dmamux->lock, flags);
> +
> + dma_spec->args[0] = chid;
> +
> + dev_dbg(&pdev->dev, "register channel %u for req %u (cpu %u)\n",
> + chid, devid, cpuid);
> +
> + return map;
> +
> +failed:
> + spin_unlock_irqrestore(&dmamux->lock, flags);
> + of_node_put(dma_spec->np);
> + dev_err(&pdev->dev, "errno %d\n", ret);
> + return ERR_PTR(ret);
> +}
> +
> +static int cv1800_dmamux_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *mux_node = dev->of_node;
> + struct cv1800_dmamux_data *data;
> + struct cv1800_dmamux_map *tmp;
> + struct device *parent = dev->parent;
> + struct regmap *regmap = NULL;
> + unsigned int i;
> +
> + if (!parent)
> + return -ENODEV;
> +
> + regmap = device_node_to_regmap(parent->of_node);
> + if (IS_ERR(regmap))
> + return PTR_ERR(regmap);
> +
> + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + spin_lock_init(&data->lock);
> + init_llist_head(&data->free_maps);
> + init_llist_head(&data->reserve_maps);
> +
> + for (i = 0; i <= MAX_DMA_CH_ID; i++) {
> + tmp = devm_kmalloc(dev, sizeof(*tmp), GFP_KERNEL);
> + if (!tmp) {
> + /* It is OK for not allocating all channel */
> + dev_warn(dev, "can not allocate channel %u\n", i);
> + continue;
> + }
> +
> + init_llist_node(&tmp->node);
> + tmp->channel = i;
> + llist_add(&tmp->node, &data->free_maps);
> + }
> +
> + /* if no channel is allocated, the probe must fail */
> + if (llist_empty(&data->free_maps))
> + return -ENOMEM;
> +
> + data->regmap = regmap;
> + data->dmarouter.dev = dev;
> + data->dmarouter.route_free = cv1800_dmamux_free;
> +
> + platform_set_drvdata(pdev, data);
> +
> + return of_dma_router_register(mux_node,
> + cv1800_dmamux_route_allocate,
> + &data->dmarouter);
> +}
> +
> +static void cv1800_dmamux_remove(struct platform_device *pdev)
> +{
> + of_dma_controller_free(pdev->dev.of_node);
> +}
> +
> +static const struct of_device_id cv1800_dmamux_ids[] = {
> + { .compatible = "sophgo,cv1800b-dmamux", },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, cv1800_dmamux_ids);
> +
> +static struct platform_driver cv1800_dmamux_driver = {
> + .driver = {
> + .name = "cv1800-dmamux",
> + .of_match_table = cv1800_dmamux_ids,
> + },
> + .probe = cv1800_dmamux_probe,
> + .remove_new = cv1800_dmamux_remove,
> +};
> +module_platform_driver(cv1800_dmamux_driver);
> +
> +MODULE_AUTHOR("Inochi Amaoto <inochiama@outlook.com>");
> +MODULE_DESCRIPTION("Sophgo CV1800/SG2000 Series SoC DMAMUX driver");
> +MODULE_LICENSE("GPL");
> --
> 2.46.0
--
~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux
2024-08-28 17:56 ` Vinod Koul
@ 2024-08-29 1:23 ` Inochi Amaoto
0 siblings, 0 replies; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-29 1:23 UTC (permalink / raw)
To: Vinod Koul, Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, Aug 28, 2024 at 11:26:08PM GMT, Vinod Koul wrote:
> On 27-08-24, 14:49, Inochi Amaoto wrote:
> > Sophgo CV18XX/SG200X use DW AXI CORE with a multiplexer for remapping
> > its request lines. The multiplexer supports at most 8 request lines.
> >
> > Add driver for Sophgo CV18XX/SG200X DMA multiplexer.
> >
> > Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
> > ---
> > drivers/dma/Kconfig | 9 ++
> > drivers/dma/Makefile | 1 +
> > drivers/dma/cv1800-dmamux.c | 257 ++++++++++++++++++++++++++++++++++++
> > 3 files changed, 267 insertions(+)
> > create mode 100644 drivers/dma/cv1800-dmamux.c
> >
> > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> > index cc0a62c34861..df010ee1de46 100644
> > --- a/drivers/dma/Kconfig
> > +++ b/drivers/dma/Kconfig
> > @@ -546,6 +546,15 @@ config PLX_DMA
> > These are exposed via extra functions on the switch's
> > upstream port. Each function exposes one DMA channel.
> >
> > +config SOPHGO_CV1800_DMAMUX
> > + tristate "Sophgo CV1800/SG2000 series SoC DMA multiplexer support"
> > + depends on MFD_SYSCON
> > + depends on ARCH_SOPHGO
>
> this lgtm, maybe add || COMPILE_TEST for wider compile test coverage?
>
Good. I will add it.
> > + help
> > + Support for the DMA multiplexer on Sophgo CV1800/SG2000
> > + series SoCs.
> > + Say Y here if your board have this soc.
> > +
> > config STE_DMA40
> > bool "ST-Ericsson DMA40 support"
> > depends on ARCH_U8500
> > diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
> > index 374ea98faf43..60d05b305082 100644
> > --- a/drivers/dma/Makefile
> > +++ b/drivers/dma/Makefile
> > @@ -69,6 +69,7 @@ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
> > obj-$(CONFIG_PXA_DMA) += pxa_dma.o
> > obj-$(CONFIG_RENESAS_DMA) += sh/
> > obj-$(CONFIG_SF_PDMA) += sf-pdma/
> > +obj-$(CONFIG_SOPHGO_CV1800_DMAMUX) += cv1800-dmamux.o
> > obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
> > obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
> > obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
> > diff --git a/drivers/dma/cv1800-dmamux.c b/drivers/dma/cv1800-dmamux.c
> > new file mode 100644
> > index 000000000000..a907c72325c7
> > --- /dev/null
> > +++ b/drivers/dma/cv1800-dmamux.c
> > @@ -0,0 +1,257 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2024 Inochi Amaoto <inochiama@outlook.com>
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/cleanup.h>
> > +#include <linux/module.h>
> > +#include <linux/of_dma.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/llist.h>
> > +#include <linux/regmap.h>
> > +#include <linux/spinlock.h>
> > +#include <linux/mfd/syscon.h>
> > +
> > +#include <soc/sophgo/cv1800-sysctl.h>
> > +
> > +#define DMAMUX_NCELLS 2
> > +#define MAX_DMA_MAPPING_ID 42
> > +#define MAX_DMA_CPU_ID 2
> > +#define MAX_DMA_CH_ID 7
> > +
> > +#define DMAMUX_INTMUX_REGISTER_LEN 4
> > +#define DMAMUX_NR_CH_PER_REGISTER 4
> > +#define DMAMUX_BIT_PER_CH 8
> > +#define DMAMUX_CH_MASk GENMASK(5, 0)
> > +#define DMAMUX_INT_BIT_PER_CPU 10
> > +#define DMAMUX_CH_UPDATE_BIT BIT(31)
> > +
> > +#define DMAMUX_CH_REGPOS(chid) \
> > + ((chid) / DMAMUX_NR_CH_PER_REGISTER)
> > +#define DMAMUX_CH_REGOFF(chid) \
> > + ((chid) % DMAMUX_NR_CH_PER_REGISTER)
> > +#define DMAMUX_CH_REG(chid) \
> > + ((DMAMUX_CH_REGPOS(chid) * sizeof(u32)) + \
> > + CV1800_SDMA_DMA_CHANNEL_REMAP0)
> > +#define DMAMUX_CH_SET(chid, val) \
> > + (((val) << (DMAMUX_CH_REGOFF(chid) * DMAMUX_BIT_PER_CH)) | \
> > + DMAMUX_CH_UPDATE_BIT)
> > +#define DMAMUX_CH_MASK(chid) \
> > + DMAMUX_CH_SET(chid, DMAMUX_CH_MASk)
> > +
> > +#define DMAMUX_INT_BIT(chid, cpuid) \
> > + BIT((cpuid) * DMAMUX_INT_BIT_PER_CPU + (chid))
> > +#define DMAMUX_INTEN_BIT(cpuid) \
> > + DMAMUX_INT_BIT(8, cpuid)
> > +#define DMAMUX_INT_CH_BIT(chid, cpuid) \
> > + (DMAMUX_INT_BIT(chid, cpuid) | DMAMUX_INTEN_BIT(cpuid))
> > +#define DMAMUX_INT_MASK(chid) \
> > + (DMAMUX_INT_BIT(chid, 0) | \
> > + DMAMUX_INT_BIT(chid, 1) | \
> > + DMAMUX_INT_BIT(chid, 2))
> > +#define DMAMUX_INT_CH_MASK(chid, cpuid) \
> > + (DMAMUX_INT_MASK(chid) | DMAMUX_INTEN_BIT(cpuid))
> > +
> > +struct cv1800_dmamux_data {
> > + struct dma_router dmarouter;
> > + struct regmap *regmap;
> > + spinlock_t lock;
> > + struct llist_head free_maps;
> > + struct llist_head reserve_maps;
> > + DECLARE_BITMAP(mapped_peripherals, MAX_DMA_MAPPING_ID);
> > +};
> > +
> > +struct cv1800_dmamux_map {
> > + struct llist_node node;
> > + unsigned int channel;
> > + unsigned int peripheral;
> > + unsigned int cpu;
> > +};
> > +
> > +static void cv1800_dmamux_free(struct device *dev, void *route_data)
> > +{
> > + struct cv1800_dmamux_data *dmamux = dev_get_drvdata(dev);
> > + struct cv1800_dmamux_map *map = route_data;
> > +
> > + guard(spinlock_irqsave)(&dmamux->lock);
> > +
> > + regmap_update_bits(dmamux->regmap,
> > + DMAMUX_CH_REG(map->channel),
> > + DMAMUX_CH_MASK(map->channel),
> > + DMAMUX_CH_UPDATE_BIT);
> > +
> > + regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
> > + DMAMUX_INT_CH_MASK(map->channel, map->cpu),
> > + DMAMUX_INTEN_BIT(map->cpu));
> > +
> > + dev_dbg(dev, "free channel %u for req %u (cpu %u)\n",
> > + map->channel, map->peripheral, map->cpu);
> > +}
> > +
> > +static void *cv1800_dmamux_route_allocate(struct of_phandle_args *dma_spec,
> > + struct of_dma *ofdma)
> > +{
> > + struct platform_device *pdev = of_find_device_by_node(ofdma->of_node);
> > + struct cv1800_dmamux_data *dmamux = platform_get_drvdata(pdev);
> > + struct cv1800_dmamux_map *map;
> > + struct llist_node *node;
> > + unsigned long flags;
> > + unsigned int chid, devid, cpuid;
> > + int ret;
> > +
> > + if (dma_spec->args_count != DMAMUX_NCELLS) {
> > + dev_err(&pdev->dev, "invalid number of dma mux args\n");
> > + return ERR_PTR(-EINVAL);
> > + }
> > +
> > + devid = dma_spec->args[0];
> > + cpuid = dma_spec->args[1];
> > + dma_spec->args_count = 1;
> > +
> > + if (devid > MAX_DMA_MAPPING_ID) {
> > + dev_err(&pdev->dev, "invalid device id: %u\n", devid);
> > + return ERR_PTR(-EINVAL);
> > + }
> > +
> > + if (cpuid > MAX_DMA_CPU_ID) {
> > + dev_err(&pdev->dev, "invalid cpu id: %u\n", cpuid);
> > + return ERR_PTR(-EINVAL);
> > + }
> > +
> > + dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0);
> > + if (!dma_spec->np) {
> > + dev_err(&pdev->dev, "can't get dma master\n");
> > + return ERR_PTR(-EINVAL);
> > + }
> > +
> > + spin_lock_irqsave(&dmamux->lock, flags);
> > +
> > + if (test_bit(devid, dmamux->mapped_peripherals)) {
> > + llist_for_each_entry(map, dmamux->reserve_maps.first, node) {
> > + if (map->peripheral == devid && map->cpu == cpuid)
> > + goto found;
> > + }
> > +
> > + ret = -EINVAL;
> > + goto failed;
> > + } else {
> > + node = llist_del_first(&dmamux->free_maps);
> > + if (!node) {
> > + ret = -ENODEV;
> > + goto failed;
> > + }
> > +
> > + map = llist_entry(node, struct cv1800_dmamux_map, node);
> > + llist_add(&map->node, &dmamux->reserve_maps);
> > + set_bit(devid, dmamux->mapped_peripherals);
> > + }
> > +
> > +found:
> > + chid = map->channel;
> > + map->peripheral = devid;
> > + map->cpu = cpuid;
> > +
> > + regmap_set_bits(dmamux->regmap,
> > + DMAMUX_CH_REG(chid),
> > + DMAMUX_CH_SET(chid, devid));
> > +
> > + regmap_update_bits(dmamux->regmap, CV1800_SDMA_DMA_INT_MUX,
> > + DMAMUX_INT_CH_MASK(chid, cpuid),
> > + DMAMUX_INT_CH_BIT(chid, cpuid));
> > +
> > + spin_unlock_irqrestore(&dmamux->lock, flags);
> > +
> > + dma_spec->args[0] = chid;
> > +
> > + dev_dbg(&pdev->dev, "register channel %u for req %u (cpu %u)\n",
> > + chid, devid, cpuid);
> > +
> > + return map;
> > +
> > +failed:
> > + spin_unlock_irqrestore(&dmamux->lock, flags);
> > + of_node_put(dma_spec->np);
> > + dev_err(&pdev->dev, "errno %d\n", ret);
> > + return ERR_PTR(ret);
> > +}
> > +
> > +static int cv1800_dmamux_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct device_node *mux_node = dev->of_node;
> > + struct cv1800_dmamux_data *data;
> > + struct cv1800_dmamux_map *tmp;
> > + struct device *parent = dev->parent;
> > + struct regmap *regmap = NULL;
> > + unsigned int i;
> > +
> > + if (!parent)
> > + return -ENODEV;
> > +
> > + regmap = device_node_to_regmap(parent->of_node);
> > + if (IS_ERR(regmap))
> > + return PTR_ERR(regmap);
> > +
> > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
> > + if (!data)
> > + return -ENOMEM;
> > +
> > + spin_lock_init(&data->lock);
> > + init_llist_head(&data->free_maps);
> > + init_llist_head(&data->reserve_maps);
> > +
> > + for (i = 0; i <= MAX_DMA_CH_ID; i++) {
> > + tmp = devm_kmalloc(dev, sizeof(*tmp), GFP_KERNEL);
> > + if (!tmp) {
> > + /* It is OK for not allocating all channel */
> > + dev_warn(dev, "can not allocate channel %u\n", i);
> > + continue;
> > + }
> > +
> > + init_llist_node(&tmp->node);
> > + tmp->channel = i;
> > + llist_add(&tmp->node, &data->free_maps);
> > + }
> > +
> > + /* if no channel is allocated, the probe must fail */
> > + if (llist_empty(&data->free_maps))
> > + return -ENOMEM;
> > +
> > + data->regmap = regmap;
> > + data->dmarouter.dev = dev;
> > + data->dmarouter.route_free = cv1800_dmamux_free;
> > +
> > + platform_set_drvdata(pdev, data);
> > +
> > + return of_dma_router_register(mux_node,
> > + cv1800_dmamux_route_allocate,
> > + &data->dmarouter);
> > +}
> > +
> > +static void cv1800_dmamux_remove(struct platform_device *pdev)
> > +{
> > + of_dma_controller_free(pdev->dev.of_node);
> > +}
> > +
> > +static const struct of_device_id cv1800_dmamux_ids[] = {
> > + { .compatible = "sophgo,cv1800b-dmamux", },
> > + { }
> > +};
> > +MODULE_DEVICE_TABLE(of, cv1800_dmamux_ids);
> > +
> > +static struct platform_driver cv1800_dmamux_driver = {
> > + .driver = {
> > + .name = "cv1800-dmamux",
> > + .of_match_table = cv1800_dmamux_ids,
> > + },
> > + .probe = cv1800_dmamux_probe,
> > + .remove_new = cv1800_dmamux_remove,
> > +};
> > +module_platform_driver(cv1800_dmamux_driver);
> > +
> > +MODULE_AUTHOR("Inochi Amaoto <inochiama@outlook.com>");
> > +MODULE_DESCRIPTION("Sophgo CV1800/SG2000 Series SoC DMAMUX driver");
> > +MODULE_LICENSE("GPL");
> > --
> > 2.46.0
>
> --
> ~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
2024-08-28 17:54 ` Vinod Koul
@ 2024-08-29 1:38 ` Inochi Amaoto
2024-08-29 17:03 ` Vinod Koul
0 siblings, 1 reply; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-29 1:38 UTC (permalink / raw)
To: Vinod Koul, Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, Aug 28, 2024 at 11:24:24PM GMT, Vinod Koul wrote:
> On 27-08-24, 14:49, Inochi Amaoto wrote:
> > The "top" system controller of CV18XX/SG200X exposes control
> > register access for various devices. Add soc header file to
> > describe it.
>
> I dont think I am full onboard this idea,
Feel free to share your idea. I just added this file for
convenience to access the offset of the syscon device.
In fact, I am not sure whether it is better to use reg
offset. Using reg adds some unncessary complexity, but
can avoid use this offset file. If you prefer this way,
it is OK for me to change.
> but still need someone to ack it
I am not sure there will be someone to ack it. If this patch
is kept.
> >
> > Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
> > ---
> > include/soc/sophgo/cv1800-sysctl.h | 30 ++++++++++++++++++++++++++++++
>
> is soc/sophgo/ right path? why not include/soc/sifive/... (sorry dont
> know much about this here...)
>
CV1800 is a SoC from Sophgo, it is not from SiFive.
Regards,
Inochi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
2024-08-29 1:38 ` Inochi Amaoto
@ 2024-08-29 17:03 ` Vinod Koul
2024-08-30 1:30 ` Inochi Amaoto
0 siblings, 1 reply; 10+ messages in thread
From: Vinod Koul @ 2024-08-29 17:03 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On 29-08-24, 09:38, Inochi Amaoto wrote:
> On Wed, Aug 28, 2024 at 11:24:24PM GMT, Vinod Koul wrote:
> > On 27-08-24, 14:49, Inochi Amaoto wrote:
> > > The "top" system controller of CV18XX/SG200X exposes control
> > > register access for various devices. Add soc header file to
> > > describe it.
> >
> > I dont think I am full onboard this idea,
>
> Feel free to share your idea. I just added this file for
> convenience to access the offset of the syscon device.
> In fact, I am not sure whether it is better to use reg
> offset. Using reg adds some unncessary complexity, but
> can avoid use this offset file. If you prefer this way,
> it is OK for me to change.
I would just add the offsets that I need in local driver header and move
on...
>
> > but still need someone to ack it
>
> I am not sure there will be someone to ack it. If this patch
> is kept.
>
> > >
> > > Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
> > > ---
> > > include/soc/sophgo/cv1800-sysctl.h | 30 ++++++++++++++++++++++++++++++
> >
> > is soc/sophgo/ right path? why not include/soc/sifive/... (sorry dont
> > know much about this here...)
> >
>
> CV1800 is a SoC from Sophgo, it is not from SiFive.
As I said I am not sure, someone who is from this world should ack this
header
--
~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X
2024-08-29 17:03 ` Vinod Koul
@ 2024-08-30 1:30 ` Inochi Amaoto
0 siblings, 0 replies; 10+ messages in thread
From: Inochi Amaoto @ 2024-08-30 1:30 UTC (permalink / raw)
To: Vinod Koul, Inochi Amaoto
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen Wang,
Paul Walmsley, Palmer Dabbelt, Albert Ou, dmaengine, devicetree,
linux-kernel, linux-riscv
On Thu, Aug 29, 2024 at 10:33:27PM GMT, Vinod Koul wrote:
> On 29-08-24, 09:38, Inochi Amaoto wrote:
> > On Wed, Aug 28, 2024 at 11:24:24PM GMT, Vinod Koul wrote:
> > > On 27-08-24, 14:49, Inochi Amaoto wrote:
> > > > The "top" system controller of CV18XX/SG200X exposes control
> > > > register access for various devices. Add soc header file to
> > > > describe it.
> > >
> > > I dont think I am full onboard this idea,
> >
> > Feel free to share your idea. I just added this file for
> > convenience to access the offset of the syscon device.
> > In fact, I am not sure whether it is better to use reg
> > offset. Using reg adds some unncessary complexity, but
> > can avoid use this offset file. If you prefer this way,
> > it is OK for me to change.
>
> I would just add the offsets that I need in local driver header and move
> on...
>
Yeah, this is a solution. I think I should take it.
After rechecking the headers in the include/soc/.
I think I may make a mistake.
Regards,
Inochi
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-30 1:31 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-27 6:48 [PATCH v12 0/3] riscv: sophgo: add dmamux support for Sophgo CV1800/SG2000 SoCs Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 1/3] dt-bindings: dmaengine: Add dma multiplexer for CV18XX/SG200X series SoC Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 2/3] soc/sophgo: add top sysctrl layout file for CV18XX/SG200X Inochi Amaoto
2024-08-28 17:54 ` Vinod Koul
2024-08-29 1:38 ` Inochi Amaoto
2024-08-29 17:03 ` Vinod Koul
2024-08-30 1:30 ` Inochi Amaoto
2024-08-27 6:49 ` [PATCH v12 3/3] dmaengine: add driver for Sophgo CV18XX/SG200X dmamux Inochi Amaoto
2024-08-28 17:56 ` Vinod Koul
2024-08-29 1:23 ` Inochi Amaoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox