* [PATCH v2 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
2025-12-14 22:45 [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller Inochi Amaoto
@ 2025-12-14 22:45 ` Inochi Amaoto
2025-12-16 16:38 ` Conor Dooley
2025-12-14 22:45 ` [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA Inochi Amaoto
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Inochi Amaoto @ 2025-12-14 22:45 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Inochi Amaoto, Alexander Sverdlin,
Longbin Li, Ze Huang
Cc: Anton D . Stavinskii, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
The DMA controller on CV1800B needs to use the DMA phandle args
as the channel number instead of hardware handshake number, so
add a new compatible for the DMA controller on CV1800B.
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
---
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
index a393a33c8908..0b5c8314e25e 100644
--- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
+++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
@@ -20,6 +20,7 @@ properties:
enum:
- snps,axi-dma-1.01a
- intel,kmb-axi-dma
+ - sophgo,cv1800b-axi-dma
- starfive,jh7110-axi-dma
- starfive,jh8100-axi-dma
--
2.52.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v2 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
2025-12-14 22:45 ` [PATCH v2 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible Inochi Amaoto
@ 2025-12-16 16:38 ` Conor Dooley
0 siblings, 0 replies; 13+ messages in thread
From: Conor Dooley @ 2025-12-16 16:38 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, Anton D . Stavinskii, dmaengine, devicetree,
linux-kernel, linux-riscv, sophgo, Yixun Lan
[-- Attachment #1: Type: text/plain, Size: 75 bytes --]
Acked-by: Conor Dooley <conor.dooley@microchip.com>
pw-bot: not-applicable
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA
2025-12-14 22:45 [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller Inochi Amaoto
2025-12-14 22:45 ` [PATCH v2 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible Inochi Amaoto
@ 2025-12-14 22:45 ` Inochi Amaoto
2026-01-16 15:45 ` Frank Li
2025-12-14 22:46 ` [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller Inochi Amaoto
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Inochi Amaoto @ 2025-12-14 22:45 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Inochi Amaoto, Alexander Sverdlin,
Longbin Li, Ze Huang
Cc: Anton D . Stavinskii, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
As the DMA controller on Sophgo CV1800 series SoC only has 8 channels,
the SoC provides a dma multiplexer to reuse the DMA channel. However,
the dma multiplexer also controls the DMA interrupt multiplexer, which
means that the dma multiplexer needs to know the channel number.
Allow the driver to use DMA phandle args as the channel number, so the
DMA multiplexer can route the DMA interrupt correctly.
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
---
.../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 ++++++++++++++++---
drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 +
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index b23536645ff7..829aa6c05b5c 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -7,6 +7,7 @@
* Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
*/
+#include "linux/stddef.h"
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/device.h>
@@ -50,6 +51,7 @@
#define AXI_DMA_FLAG_HAS_APB_REGS BIT(0)
#define AXI_DMA_FLAG_HAS_RESETS BIT(1)
#define AXI_DMA_FLAG_USE_CFG2 BIT(2)
+#define AXI_DMA_FLAG_HANDSHAKE_AS_CHAN BIT(3)
static inline void
axi_dma_iowrite32(struct axi_dma_chip *chip, u32 reg, u32 val)
@@ -1360,16 +1362,27 @@ static int __maybe_unused axi_dma_runtime_resume(struct device *dev)
static struct dma_chan *dw_axi_dma_of_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma)
{
+ unsigned int handshake = dma_spec->args[0];
struct dw_axi_dma *dw = ofdma->of_dma_data;
- struct axi_dma_chan *chan;
+ struct axi_dma_chan *chan = NULL;
struct dma_chan *dchan;
- dchan = dma_get_any_slave_channel(&dw->dma);
+ if (dw->hdata->use_handshake_as_channel_number) {
+ if (handshake >= dw->hdata->nr_channels)
+ return NULL;
+
+ chan = &dw->chan[handshake];
+ dchan = dma_get_slave_channel(&chan->vc.chan);
+ } else {
+ dchan = dma_get_any_slave_channel(&dw->dma);
+ }
+
if (!dchan)
return NULL;
- chan = dchan_to_axi_dma_chan(dchan);
- chan->hw_handshake_num = dma_spec->args[0];
+ if (!chan)
+ chan = dchan_to_axi_dma_chan(dchan);
+ chan->hw_handshake_num = handshake;
return dchan;
}
@@ -1508,6 +1521,8 @@ static int dw_probe(struct platform_device *pdev)
return ret;
}
+ chip->dw->hdata->use_handshake_as_channel_number = !!(flags & AXI_DMA_FLAG_HANDSHAKE_AS_CHAN);
+
chip->dw->hdata->use_cfg2 = !!(flags & AXI_DMA_FLAG_USE_CFG2);
chip->core_clk = devm_clk_get(chip->dev, "core-clk");
@@ -1663,6 +1678,9 @@ static const struct of_device_id dw_dma_of_id_table[] = {
}, {
.compatible = "intel,kmb-axi-dma",
.data = (void *)AXI_DMA_FLAG_HAS_APB_REGS,
+ }, {
+ .compatible = "sophgo,cv1800b-axi-dma",
+ .data = (void *)AXI_DMA_FLAG_HANDSHAKE_AS_CHAN,
}, {
.compatible = "starfive,jh7110-axi-dma",
.data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2),
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
index b842e6a8d90d..67cc199e24d1 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
@@ -34,6 +34,7 @@ struct dw_axi_dma_hcfg {
bool reg_map_8_channels;
bool restrict_axi_burst_len;
bool use_cfg2;
+ bool use_handshake_as_channel_number;
};
struct axi_dma_chan {
--
2.52.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA
2025-12-14 22:45 ` [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA Inochi Amaoto
@ 2026-01-16 15:45 ` Frank Li
2026-01-17 0:30 ` Inochi Amaoto
0 siblings, 1 reply; 13+ messages in thread
From: Frank Li @ 2026-01-16 15:45 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, Anton D . Stavinskii, dmaengine, devicetree,
linux-kernel, linux-riscv, sophgo, Yixun Lan
On Mon, Dec 15, 2025 at 06:45:59AM +0800, Inochi Amaoto wrote:
> As the DMA controller on Sophgo CV1800 series SoC only has 8 channels,
> the SoC provides a dma multiplexer to reuse the DMA channel. However,
> the dma multiplexer also controls the DMA interrupt multiplexer, which
> means that the dma multiplexer needs to know the channel number.
>
> Allow the driver to use DMA phandle args as the channel number, so the
> DMA multiplexer can route the DMA interrupt correctly.
>
> Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
> ---
> .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 ++++++++++++++++---
> drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 +
> 2 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> index b23536645ff7..829aa6c05b5c 100644
> --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> @@ -7,6 +7,7 @@
> * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> */
>
> +#include "linux/stddef.h"
> #include <linux/bitops.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> @@ -50,6 +51,7 @@
> #define AXI_DMA_FLAG_HAS_APB_REGS BIT(0)
> #define AXI_DMA_FLAG_HAS_RESETS BIT(1)
> #define AXI_DMA_FLAG_USE_CFG2 BIT(2)
> +#define AXI_DMA_FLAG_HANDSHAKE_AS_CHAN BIT(3)
Look like ARG0_AS_CHAN is easy understand
Frank
>
> static inline void
> axi_dma_iowrite32(struct axi_dma_chip *chip, u32 reg, u32 val)
> @@ -1360,16 +1362,27 @@ static int __maybe_unused axi_dma_runtime_resume(struct device *dev)
> static struct dma_chan *dw_axi_dma_of_xlate(struct of_phandle_args *dma_spec,
> struct of_dma *ofdma)
> {
> + unsigned int handshake = dma_spec->args[0];
> struct dw_axi_dma *dw = ofdma->of_dma_data;
> - struct axi_dma_chan *chan;
> + struct axi_dma_chan *chan = NULL;
> struct dma_chan *dchan;
>
> - dchan = dma_get_any_slave_channel(&dw->dma);
> + if (dw->hdata->use_handshake_as_channel_number) {
> + if (handshake >= dw->hdata->nr_channels)
> + return NULL;
> +
> + chan = &dw->chan[handshake];
> + dchan = dma_get_slave_channel(&chan->vc.chan);
> + } else {
> + dchan = dma_get_any_slave_channel(&dw->dma);
> + }
> +
> if (!dchan)
> return NULL;
>
> - chan = dchan_to_axi_dma_chan(dchan);
> - chan->hw_handshake_num = dma_spec->args[0];
> + if (!chan)
> + chan = dchan_to_axi_dma_chan(dchan);
> + chan->hw_handshake_num = handshake;
> return dchan;
> }
>
> @@ -1508,6 +1521,8 @@ static int dw_probe(struct platform_device *pdev)
> return ret;
> }
>
> + chip->dw->hdata->use_handshake_as_channel_number = !!(flags & AXI_DMA_FLAG_HANDSHAKE_AS_CHAN);
> +
> chip->dw->hdata->use_cfg2 = !!(flags & AXI_DMA_FLAG_USE_CFG2);
>
> chip->core_clk = devm_clk_get(chip->dev, "core-clk");
> @@ -1663,6 +1678,9 @@ static const struct of_device_id dw_dma_of_id_table[] = {
> }, {
> .compatible = "intel,kmb-axi-dma",
> .data = (void *)AXI_DMA_FLAG_HAS_APB_REGS,
> + }, {
> + .compatible = "sophgo,cv1800b-axi-dma",
> + .data = (void *)AXI_DMA_FLAG_HANDSHAKE_AS_CHAN,
> }, {
> .compatible = "starfive,jh7110-axi-dma",
> .data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2),
> diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> index b842e6a8d90d..67cc199e24d1 100644
> --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> @@ -34,6 +34,7 @@ struct dw_axi_dma_hcfg {
> bool reg_map_8_channels;
> bool restrict_axi_burst_len;
> bool use_cfg2;
> + bool use_handshake_as_channel_number;
> };
>
> struct axi_dma_chan {
> --
> 2.52.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA
2026-01-16 15:45 ` Frank Li
@ 2026-01-17 0:30 ` Inochi Amaoto
0 siblings, 0 replies; 13+ messages in thread
From: Inochi Amaoto @ 2026-01-17 0:30 UTC (permalink / raw)
To: Frank Li, Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, Anton D . Stavinskii, dmaengine, devicetree,
linux-kernel, linux-riscv, sophgo, Yixun Lan
On Fri, Jan 16, 2026 at 10:45:20AM -0500, Frank Li wrote:
> On Mon, Dec 15, 2025 at 06:45:59AM +0800, Inochi Amaoto wrote:
> > As the DMA controller on Sophgo CV1800 series SoC only has 8 channels,
> > the SoC provides a dma multiplexer to reuse the DMA channel. However,
> > the dma multiplexer also controls the DMA interrupt multiplexer, which
> > means that the dma multiplexer needs to know the channel number.
> >
> > Allow the driver to use DMA phandle args as the channel number, so the
> > DMA multiplexer can route the DMA interrupt correctly.
> >
> > Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
> > ---
> > .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 ++++++++++++++++---
> > drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 +
> > 2 files changed, 23 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > index b23536645ff7..829aa6c05b5c 100644
> > --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > @@ -7,6 +7,7 @@
> > * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> > */
> >
> > +#include "linux/stddef.h"
> > #include <linux/bitops.h>
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > @@ -50,6 +51,7 @@
> > #define AXI_DMA_FLAG_HAS_APB_REGS BIT(0)
> > #define AXI_DMA_FLAG_HAS_RESETS BIT(1)
> > #define AXI_DMA_FLAG_USE_CFG2 BIT(2)
> > +#define AXI_DMA_FLAG_HANDSHAKE_AS_CHAN BIT(3)
>
> Look like ARG0_AS_CHAN is easy understand
>
Good name!
> Frank
> >
> > static inline void
> > axi_dma_iowrite32(struct axi_dma_chip *chip, u32 reg, u32 val)
> > @@ -1360,16 +1362,27 @@ static int __maybe_unused axi_dma_runtime_resume(struct device *dev)
> > static struct dma_chan *dw_axi_dma_of_xlate(struct of_phandle_args *dma_spec,
> > struct of_dma *ofdma)
> > {
> > + unsigned int handshake = dma_spec->args[0];
> > struct dw_axi_dma *dw = ofdma->of_dma_data;
> > - struct axi_dma_chan *chan;
> > + struct axi_dma_chan *chan = NULL;
> > struct dma_chan *dchan;
> >
> > - dchan = dma_get_any_slave_channel(&dw->dma);
> > + if (dw->hdata->use_handshake_as_channel_number) {
> > + if (handshake >= dw->hdata->nr_channels)
> > + return NULL;
> > +
> > + chan = &dw->chan[handshake];
> > + dchan = dma_get_slave_channel(&chan->vc.chan);
> > + } else {
> > + dchan = dma_get_any_slave_channel(&dw->dma);
> > + }
> > +
> > if (!dchan)
> > return NULL;
> >
> > - chan = dchan_to_axi_dma_chan(dchan);
> > - chan->hw_handshake_num = dma_spec->args[0];
> > + if (!chan)
> > + chan = dchan_to_axi_dma_chan(dchan);
> > + chan->hw_handshake_num = handshake;
> > return dchan;
> > }
> >
> > @@ -1508,6 +1521,8 @@ static int dw_probe(struct platform_device *pdev)
> > return ret;
> > }
> >
> > + chip->dw->hdata->use_handshake_as_channel_number = !!(flags & AXI_DMA_FLAG_HANDSHAKE_AS_CHAN);
> > +
> > chip->dw->hdata->use_cfg2 = !!(flags & AXI_DMA_FLAG_USE_CFG2);
> >
> > chip->core_clk = devm_clk_get(chip->dev, "core-clk");
> > @@ -1663,6 +1678,9 @@ static const struct of_device_id dw_dma_of_id_table[] = {
> > }, {
> > .compatible = "intel,kmb-axi-dma",
> > .data = (void *)AXI_DMA_FLAG_HAS_APB_REGS,
> > + }, {
> > + .compatible = "sophgo,cv1800b-axi-dma",
> > + .data = (void *)AXI_DMA_FLAG_HANDSHAKE_AS_CHAN,
> > }, {
> > .compatible = "starfive,jh7110-axi-dma",
> > .data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2),
> > diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> > index b842e6a8d90d..67cc199e24d1 100644
> > --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> > +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
> > @@ -34,6 +34,7 @@ struct dw_axi_dma_hcfg {
> > bool reg_map_8_channels;
> > bool restrict_axi_burst_len;
> > bool use_cfg2;
> > + bool use_handshake_as_channel_number;
> > };
> >
> > struct axi_dma_chan {
> > --
> > 2.52.0
> >
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller
2025-12-14 22:45 [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller Inochi Amaoto
2025-12-14 22:45 ` [PATCH v2 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible Inochi Amaoto
2025-12-14 22:45 ` [PATCH v2 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA Inochi Amaoto
@ 2025-12-14 22:46 ` Inochi Amaoto
2026-01-16 15:42 ` Frank Li
2025-12-16 11:09 ` [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer " Inochi Amaoto
2026-01-15 23:28 ` Inochi Amaoto
4 siblings, 1 reply; 13+ messages in thread
From: Inochi Amaoto @ 2025-12-14 22:46 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Inochi Amaoto, Alexander Sverdlin,
Longbin Li, Ze Huang
Cc: Anton D . Stavinskii, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
Change the DMA controller compatible to the sophgo,cv1800b-axi-dma,
which supports setting DMA channel number in DMA phandle args.
Fixes: 514951a81a5e ("riscv: dts: sophgo: cv18xx: add DMA controller")
Reported-by: Anton D. Stavinskii <stavinsky@gmail.com>
Closes: https://github.com/sophgo/linux/issues/9
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
---
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sophgo/cv180x.dtsi b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
index 1b2b1969a648..e1b515b46466 100644
--- a/arch/riscv/boot/dts/sophgo/cv180x.dtsi
+++ b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
@@ -417,7 +417,7 @@ sdhci1: mmc@4320000 {
};
dmac: dma-controller@4330000 {
- compatible = "snps,axi-dma-1.01a";
+ compatible = "sophgo,cv1800b-axi-dma";
reg = <0x04330000 0x1000>;
interrupts = <SOC_PERIPHERAL_IRQ(13) IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk CLK_SDMA_AXI>, <&clk CLK_SDMA_AXI>;
--
2.52.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller
2025-12-14 22:46 ` [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller Inochi Amaoto
@ 2026-01-16 15:42 ` Frank Li
2026-01-17 0:32 ` Inochi Amaoto
0 siblings, 1 reply; 13+ messages in thread
From: Frank Li @ 2026-01-16 15:42 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, Anton D . Stavinskii, dmaengine, devicetree,
linux-kernel, linux-riscv, sophgo, Yixun Lan
On Mon, Dec 15, 2025 at 06:46:00AM +0800, Inochi Amaoto wrote:
> Change the DMA controller compatible to the sophgo,cv1800b-axi-dma,
> which supports setting DMA channel number in DMA phandle args.
Does it need update DMA comsumer?
Frank
>
> Fixes: 514951a81a5e ("riscv: dts: sophgo: cv18xx: add DMA controller")
> Reported-by: Anton D. Stavinskii <stavinsky@gmail.com>
> Closes: https://github.com/sophgo/linux/issues/9
> Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
> ---
> arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/dts/sophgo/cv180x.dtsi b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> index 1b2b1969a648..e1b515b46466 100644
> --- a/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> +++ b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> @@ -417,7 +417,7 @@ sdhci1: mmc@4320000 {
> };
>
> dmac: dma-controller@4330000 {
> - compatible = "snps,axi-dma-1.01a";
> + compatible = "sophgo,cv1800b-axi-dma";
> reg = <0x04330000 0x1000>;
> interrupts = <SOC_PERIPHERAL_IRQ(13) IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clk CLK_SDMA_AXI>, <&clk CLK_SDMA_AXI>;
> --
> 2.52.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller
2026-01-16 15:42 ` Frank Li
@ 2026-01-17 0:32 ` Inochi Amaoto
0 siblings, 0 replies; 13+ messages in thread
From: Inochi Amaoto @ 2026-01-17 0:32 UTC (permalink / raw)
To: Frank Li, Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, Anton D . Stavinskii, dmaengine, devicetree,
linux-kernel, linux-riscv, sophgo, Yixun Lan
On Fri, Jan 16, 2026 at 10:42:54AM -0500, Frank Li wrote:
> On Mon, Dec 15, 2025 at 06:46:00AM +0800, Inochi Amaoto wrote:
> > Change the DMA controller compatible to the sophgo,cv1800b-axi-dma,
> > which supports setting DMA channel number in DMA phandle args.
>
>
> Does it need update DMA comsumer?
>
> Frank
Not needed, this is handle by the dmamux driver, it is allocate and
configure the DMA channel dynamicly.
Regards,
Inochi
> >
> > Fixes: 514951a81a5e ("riscv: dts: sophgo: cv18xx: add DMA controller")
> > Reported-by: Anton D. Stavinskii <stavinsky@gmail.com>
> > Closes: https://github.com/sophgo/linux/issues/9
> > Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
> > ---
> > arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/boot/dts/sophgo/cv180x.dtsi b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> > index 1b2b1969a648..e1b515b46466 100644
> > --- a/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> > +++ b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
> > @@ -417,7 +417,7 @@ sdhci1: mmc@4320000 {
> > };
> >
> > dmac: dma-controller@4330000 {
> > - compatible = "snps,axi-dma-1.01a";
> > + compatible = "sophgo,cv1800b-axi-dma";
> > reg = <0x04330000 0x1000>;
> > interrupts = <SOC_PERIPHERAL_IRQ(13) IRQ_TYPE_LEVEL_HIGH>;
> > clocks = <&clk CLK_SDMA_AXI>, <&clk CLK_SDMA_AXI>;
> > --
> > 2.52.0
> >
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
2025-12-14 22:45 [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller Inochi Amaoto
` (2 preceding siblings ...)
2025-12-14 22:46 ` [PATCH v2 3/3] riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller Inochi Amaoto
@ 2025-12-16 11:09 ` Inochi Amaoto
2025-12-16 15:25 ` Anton D. Stavinskii
2026-01-15 23:28 ` Inochi Amaoto
4 siblings, 1 reply; 13+ messages in thread
From: Inochi Amaoto @ 2025-12-16 11:09 UTC (permalink / raw)
To: Anton D . Stavinskii
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Inochi Amaoto, Alexander Sverdlin,
Longbin Li, Ze Huang, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
On Mon, Dec 15, 2025 at 06:45:57AM +0800, Inochi Amaoto wrote:
> As the DMA controller on Sophgo CV1800 series SoC only has 8 channels,
> the SoC provides a dma multiplexer to reuse the DMA channel. However,
> the dma multiplexer also controlls the DMA interrupt multiplexer, which
> means that the dma multiplexer needs to know the channel number.
>
> Change the DMA phandle args parsing logic so it can use handshake
> number as channel number if necessary.
>
> Change from v1:
> 1. rebase to v6.19-rc1
> 2. patch 1: remove a comment placed in wrong place.
> 3. patch 2: fix typo in comments.
> 4. patch 2: initialize chan as NULL in dw_axi_dma_of_xlate.
>
> Inochi Amaoto (3):
> dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
> dmaengine: dw-axi-dmac: Add support for CV1800B DMA
> riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel
> number for DMA controller
>
> .../bindings/dma/snps,dw-axi-dmac.yaml | 1 +
> arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +-
> .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 ++++++++++++++++---
> drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 +
> 4 files changed, 25 insertions(+), 5 deletions(-)
>
> --
> 2.52.0
>
Hi Anton,
Since you have tested this patch before, could you give a Tested-by?
Regards,
Inochi
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
2025-12-16 11:09 ` [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer " Inochi Amaoto
@ 2025-12-16 15:25 ` Anton D. Stavinskii
2025-12-16 22:44 ` Inochi Amaoto
0 siblings, 1 reply; 13+ messages in thread
From: Anton D. Stavinskii @ 2025-12-16 15:25 UTC (permalink / raw)
To: Inochi Amaoto
Cc: Eugeniy Paltsev, Vinod Koul, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Chen Wang, Alexander Sverdlin, Longbin Li,
Ze Huang, dmaengine, devicetree, linux-kernel, linux-riscv,
sophgo, Yixun Lan
On Tue, Dec 16, 2025 at 07:09:16PM +0400, Inochi Amaoto wrote:
> Hi Anton,
>
> Since you have tested this patch before, could you give a Tested-by?
>
Done. V2 works fine with Milk Duo 256M with 2 channels RX and TX working
simultaneously.
Tested-by: Anton D. Stavinskii <stavinsky@gmail.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
2025-12-16 15:25 ` Anton D. Stavinskii
@ 2025-12-16 22:44 ` Inochi Amaoto
0 siblings, 0 replies; 13+ messages in thread
From: Inochi Amaoto @ 2025-12-16 22:44 UTC (permalink / raw)
To: Inochi Amaoto, Eugeniy Paltsev, Vinod Koul, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Alexandre Ghiti, Chen Wang, Alexander Sverdlin,
Longbin Li, Ze Huang, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
On Tue, Dec 16, 2025 at 07:25:06PM +0400, Anton D. Stavinskii wrote:
> On Tue, Dec 16, 2025 at 07:09:16PM +0400, Inochi Amaoto wrote:
>
> > Hi Anton,
> >
> > Since you have tested this patch before, could you give a Tested-by?
> >
> Done. V2 works fine with Milk Duo 256M with 2 channels RX and TX working
> simultaneously.
>
>
> Tested-by: Anton D. Stavinskii <stavinsky@gmail.com>
Thanks
Regards,
Inochi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
2025-12-14 22:45 [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller Inochi Amaoto
` (3 preceding siblings ...)
2025-12-16 11:09 ` [PATCH v2 0/3] riscv: sophgo: allow DMA multiplexer " Inochi Amaoto
@ 2026-01-15 23:28 ` Inochi Amaoto
4 siblings, 0 replies; 13+ messages in thread
From: Inochi Amaoto @ 2026-01-15 23:28 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Chen Wang,
Inochi Amaoto, Alexander Sverdlin, Longbin Li, Ze Huang,
Anton D . Stavinskii, dmaengine, devicetree, linux-kernel,
linux-riscv, sophgo, Yixun Lan
On Mon, Dec 15, 2025 at 06:45:57AM +0800, Inochi Amaoto wrote:
> As the DMA controller on Sophgo CV1800 series SoC only has 8 channels,
> the SoC provides a dma multiplexer to reuse the DMA channel. However,
> the dma multiplexer also controlls the DMA interrupt multiplexer, which
> means that the dma multiplexer needs to know the channel number.
>
> Change the DMA phandle args parsing logic so it can use handshake
> number as channel number if necessary.
>
> Change from v1:
> 1. rebase to v6.19-rc1
> 2. patch 1: remove a comment placed in wrong place.
> 3. patch 2: fix typo in comments.
> 4. patch 2: initialize chan as NULL in dw_axi_dma_of_xlate.
>
> Inochi Amaoto (3):
> dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
> dmaengine: dw-axi-dmac: Add support for CV1800B DMA
> riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel
> number for DMA controller
>
> .../bindings/dma/snps,dw-axi-dmac.yaml | 1 +
> arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +-
> .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 26 ++++++++++++++++---
> drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 +
> 4 files changed, 25 insertions(+), 5 deletions(-)
>
> --
> 2.52.0
>
Hi, Vinod
Would you have any suggestion on this patch? Or this is OK to merge?
Regards,
Inochi
^ permalink raw reply [flat|nested] 13+ messages in thread