riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
Subsystems (5)
Inochi Amaoto
maintainerv3 cover riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
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 v2:
- https://lore.kernel.org/all/[email protected]/
1. patch 2: rename "AXI_DMA_FLAG_HANDSHAKE_AS_CHAN" to "ARG0_AS_CHAN"
Change from v1:
- https://lore.kernel.org/all/[email protected]/
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 | 25 ++++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 4 files changed, 24 insertions(+), 5 deletions(-)
--
2.52.0
Inochi Amaoto
maintainerPATCH v3 1/3 dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
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.
--- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +1 -0
@@ -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
Signature · 1 line
2.52.0
Re: [PATCH v3 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
pw-bot: not-applicable
Vinod Koul
maintainerRe: [PATCH v3 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
In reply to Inochi AmaotoQuoted 3 lines · Inochi Amaoto
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.
Applied this manually, please check if that is okay after push
Quoted 20 lines
Signed-off-by Inochi Amaoto <[email protected]>--- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +1
-0@@ -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-dmaSignature · 1 line
2.52.0
Signature · 1 line
~Vinod
Inochi Amaoto
maintainerRe: [PATCH v3 1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
Quoted 7 lines · Vinod Koul
Quoted 3 lines · Inochi Amaoto
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.
Applied this manually, please check if that is okay after push
Hi Vinod,
I have send a new version for v7.0-rc1.
https://lore.kernel.org/all/[email protected]
Can you try it?
Regards,
Inochi
Quoted 23 lines
Quoted 20 lines
Signed-off-by Inochi Amaoto <[email protected]>--- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +1
-0@@ -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-dmaSignature · 1 line
2.52.0Signature · 1 line
~Vinod
Inochi Amaoto
maintainerPATCH v3 2/3 dmaengine: dw-axi-dmac: Add support for CV1800B DMA
In reply to Inochi AmaotoAs 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.
--- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 25 ++++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 22 insertions(+), 4 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +21 -4
@@ -50,6 +50,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_ARG0_AS_CHAN BIT(3)static inline void axi_dma_iowrite32 (struct axi_dma_chip *chip,u32 reg,u32 val)
@@ -1360,16 +1361,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 +1520,8 @@ static int dw_probe(struct platform_device *pdev)return ret; } + chip->dw->hdata->use_handshake_as_channel_number = !!(flags &AXI_DMA_FLAG_ARG0_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 +1677,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_ARG0_AS_CHAN, }, { .compatible = "starfive,jh7110-axi-dma", .data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2),
drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1 -0
@@ -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 {
Signature · 1 line
2.52.0
Re: [PATCH v3 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA
Quoted 10 lines · Inochi Amaoto
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 <[email protected]>---
Quoted 82 lines
.../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 25 ++++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 22 insertions(+), 4 deletions(-)drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +21
-4@@ -50,6 +50,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_ARG0_AS_CHAN BIT(3)static inline void axi_dma_iowrite32 (struct axi_dma_chip *chip,u32 reg,u32 val)@@ -1360,16 +1361,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 +1520,8 @@ static int dw_probe(struct platform_device *pdev)return ret; } + chip->dw->hdata->use_handshake_as_channel_number = !!(flags &AXI_DMA_FLAG_ARG0_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 +1677,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_ARG0_AS_CHAN, }, { .compatible = "starfive,jh7110-axi-dma", .data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2),drivers/dma/dw-axi-dmac/dw-axi-dmac.h +1
-1@@ -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
Inochi Amaoto
maintainerPATCH v3 3/3 riscv: dts: sophgo: cv180x: Allow the DMA multiplexer to set channel number for DMA controller
In reply to Inochi AmaotoChange the DMA controller compatible to the sophgo,cv1800b-axi-dma, which supports setting DMA channel number in DMA phandle args.
--- arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/sophgo/cv180x.dtsi +1 -1
@@ -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>;
Signature · 1 line
2.52.0
Re: (subset) [PATCH v3 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
In reply to Inochi AmaotoQuoted 9 lines · Inochi Amaoto
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.
[...]
Applied, thanks!
[1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
commit: 5eda5f42d2fee87127b568206a9fcc07a2f6eab6
[2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA
commit: 02a380ea7ed2d737a42693d7957ec8c33a92d9fdBest regards,
Signature · 1 line
~Vinod
Inochi Amaoto
maintainerRe: (subset) [PATCH v3 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
Quoted 12 lines · Vinod Koul
Quoted 9 lines · Inochi Amaoto
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.
[...]
Quoted 12 lines
Applied, thanks!
[1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
commit: 5eda5f42d2fee87127b568206a9fcc07a2f6eab6 [2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA commit: 02a380ea7ed2d737a42693d7957ec8c33a92d9fdBest regards,
Signature · 1 line
~Vinod
Hi, Vinod
I guess you applied the version 4, but replied to the version 3?
Regards,
Inochi
Vinod Koul
maintainerRe: (subset) [PATCH v3 0/3] riscv: sophgo: allow DMA multiplexer set channel number for DMA controller
Quoted 26 lines · Inochi Amaoto
Quoted 12 lines · Vinod Koul
Quoted 9 lines · Inochi Amaoto
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.
[...]
Quoted 12 lines
Applied, thanks!
[1/3] dt-bindings: dma: snps,dw-axi-dmac: Add CV1800B compatible
commit: 5eda5f42d2fee87127b568206a9fcc07a2f6eab6 [2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA commit: 02a380ea7ed2d737a42693d7957ec8c33a92d9fdBest regards,
Signature · 1 line
~Vinod
Quoted 3 lines
Hi, Vinod
I guess you applied the version 4, but replied to the version 3?
Nope, I had already picked 3. so reply went on that.
Signature · 1 line
~Vinod