* [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li
The PDMA driver currently assumes there are four channels by default, it
might cause the error if there is actually less than four channels.
Change that by getting number of channel dynamically from device tree.
For backwards-compatible, it uses the default value (i.e. 4) when there
is no 'dma-channels' information in dts.
This patch set contains the dts and dt-bindings change.
Changed in v8:
- Rebase on master
- Remove modification of microchip-mpfs.dtsi
- Rename DMA node name of fu540-c000.dtsi
Changed in v7:
- Rebase on tag v5.17-rc7
- Modify the subject of patch
Changed in v6:
- Rebase on tag v5.17-rc6
- Change sf_pdma.chans[] to a flexible array member.
Changed in v5:
- Rebase on tag v5.17-rc3
- Fix typo in dt-bindings and commit message
- Add PDMA versioning scheme for compatible
Changed in v4:
- Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
Changed in v3:
- Fix allocating wrong size
- Return error if 'dma-channels' is larger than maximum
Changed in v2:
- Rebase on tag v5.16
- Use 4 as default value of dma-channels
Zong Li (4):
dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
modify compatible
riscv: dts: Add dma-channels property and modify compatible
riscv: dts: rename the node name of dma
dmaengine: sf-pdma: Get number of channel by device tree
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
4 files changed, 38 insertions(+), 18 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li
The PDMA driver currently assumes there are four channels by default, it
might cause the error if there is actually less than four channels.
Change that by getting number of channel dynamically from device tree.
For backwards-compatible, it uses the default value (i.e. 4) when there
is no 'dma-channels' information in dts.
This patch set contains the dts and dt-bindings change.
Changed in v8:
- Rebase on master
- Remove modification of microchip-mpfs.dtsi
- Rename DMA node name of fu540-c000.dtsi
Changed in v7:
- Rebase on tag v5.17-rc7
- Modify the subject of patch
Changed in v6:
- Rebase on tag v5.17-rc6
- Change sf_pdma.chans[] to a flexible array member.
Changed in v5:
- Rebase on tag v5.17-rc3
- Fix typo in dt-bindings and commit message
- Add PDMA versioning scheme for compatible
Changed in v4:
- Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
Changed in v3:
- Fix allocating wrong size
- Return error if 'dma-channels' is larger than maximum
Changed in v2:
- Rebase on tag v5.16
- Use 4 as default value of dma-channels
Zong Li (4):
dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
modify compatible
riscv: dts: Add dma-channels property and modify compatible
riscv: dts: rename the node name of dma
dmaengine: sf-pdma: Get number of channel by device tree
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
4 files changed, 38 insertions(+), 18 deletions(-)
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v8 1/4] dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and modify compatible
2022-03-28 9:52 ` Zong Li
@ 2022-03-28 9:52 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Rob Herring, Palmer Dabbelt
Add dma-channels property, then we can determine how many channels there
by device tree, rather than statically defining it in PDMA driver.
In addition, we also modify the compatible for PDMA versioning scheme.
Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Suggested-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
index 47c46af25536..3271755787b4 100644
--- a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
+++ b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
@@ -28,7 +28,15 @@ allOf:
properties:
compatible:
items:
- - const: sifive,fu540-c000-pdma
+ - enum:
+ - sifive,fu540-c000-pdma
+ - const: sifive,pdma0
+ description:
+ Should be "sifive,<chip>-pdma" and "sifive,pdma<version>".
+ Supported compatible strings are -
+ "sifive,fu540-c000-pdma" for the SiFive PDMA v0 as integrated onto the
+ SiFive FU540 chip resp and "sifive,pdma0" for the SiFive PDMA v0 IP block
+ with no chip integration tweaks.
reg:
maxItems: 1
@@ -37,6 +45,12 @@ properties:
minItems: 1
maxItems: 8
+ dma-channels:
+ description: For backwards-compatibility, the default value is 4
+ minimum: 1
+ maximum: 4
+ default: 4
+
'#dma-cells':
const: 1
@@ -50,8 +64,9 @@ unevaluatedProperties: false
examples:
- |
dma-controller@3000000 {
- compatible = "sifive,fu540-c000-pdma";
+ compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x3000000 0x8000>;
+ dma-channels = <4>;
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>, <30>;
#dma-cells = <1>;
};
--
2.35.1
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 1/4] dt-bindings: dma-engine: sifive, fu540: Add dma-channels property and modify compatible
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Rob Herring, Palmer Dabbelt
Add dma-channels property, then we can determine how many channels there
by device tree, rather than statically defining it in PDMA driver.
In addition, we also modify the compatible for PDMA versioning scheme.
Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Suggested-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
index 47c46af25536..3271755787b4 100644
--- a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
+++ b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
@@ -28,7 +28,15 @@ allOf:
properties:
compatible:
items:
- - const: sifive,fu540-c000-pdma
+ - enum:
+ - sifive,fu540-c000-pdma
+ - const: sifive,pdma0
+ description:
+ Should be "sifive,<chip>-pdma" and "sifive,pdma<version>".
+ Supported compatible strings are -
+ "sifive,fu540-c000-pdma" for the SiFive PDMA v0 as integrated onto the
+ SiFive FU540 chip resp and "sifive,pdma0" for the SiFive PDMA v0 IP block
+ with no chip integration tweaks.
reg:
maxItems: 1
@@ -37,6 +45,12 @@ properties:
minItems: 1
maxItems: 8
+ dma-channels:
+ description: For backwards-compatibility, the default value is 4
+ minimum: 1
+ maximum: 4
+ default: 4
+
'#dma-cells':
const: 1
@@ -50,8 +64,9 @@ unevaluatedProperties: false
examples:
- |
dma-controller@3000000 {
- compatible = "sifive,fu540-c000-pdma";
+ compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x3000000 0x8000>;
+ dma-channels = <4>;
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>, <30>;
#dma-cells = <1>;
};
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 2/4] riscv: dts: Add dma-channels property and modify compatible
2022-03-28 9:52 ` Zong Li
@ 2022-03-28 9:52 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Palmer Dabbelt
Add dma-channels property, then we can determine how many channels there
by device tree, in addition, we add the pdma versioning scheme for
compatible.
Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
---
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 3eef52b1a59b..6a3011180846 100644
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -168,11 +168,12 @@ uart0: serial@10010000 {
status = "disabled";
};
dma: dma@3000000 {
- compatible = "sifive,fu540-c000-pdma";
+ compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x0 0x3000000 0x0 0x8000>;
interrupt-parent = <&plic0>;
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>,
<30>;
+ dma-channels = <4>;
#dma-cells = <1>;
};
uart1: serial@10011000 {
--
2.35.1
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 2/4] riscv: dts: Add dma-channels property and modify compatible
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Palmer Dabbelt
Add dma-channels property, then we can determine how many channels there
by device tree, in addition, we add the pdma versioning scheme for
compatible.
Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
---
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 3eef52b1a59b..6a3011180846 100644
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -168,11 +168,12 @@ uart0: serial@10010000 {
status = "disabled";
};
dma: dma@3000000 {
- compatible = "sifive,fu540-c000-pdma";
+ compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x0 0x3000000 0x0 0x8000>;
interrupt-parent = <&plic0>;
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>,
<30>;
+ dma-channels = <4>;
#dma-cells = <1>;
};
uart1: serial@10011000 {
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 3/4] riscv: dts: rename the node name of dma
2022-03-28 9:52 ` Zong Li
@ 2022-03-28 9:52 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li
Rename the node name by the generic DMA naming
Signed-off-by: Zong Li <zong.li@sifive.com>
CC: Vinod Koul <vkoul@kernel.org>
---
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 6a3011180846..6eebe34c2851 100644
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -167,7 +167,7 @@ uart0: serial@10010000 {
clocks = <&prci PRCI_CLK_TLCLK>;
status = "disabled";
};
- dma: dma@3000000 {
+ dma: dma-controller@3000000 {
compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x0 0x3000000 0x0 0x8000>;
interrupt-parent = <&plic0>;
--
2.35.1
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 3/4] riscv: dts: rename the node name of dma
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li
Rename the node name by the generic DMA naming
Signed-off-by: Zong Li <zong.li@sifive.com>
CC: Vinod Koul <vkoul@kernel.org>
---
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 6a3011180846..6eebe34c2851 100644
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -167,7 +167,7 @@ uart0: serial@10010000 {
clocks = <&prci PRCI_CLK_TLCLK>;
status = "disabled";
};
- dma: dma@3000000 {
+ dma: dma-controller@3000000 {
compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
reg = <0x0 0x3000000 0x0 0x8000>;
interrupt-parent = <&plic0>;
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 4/4] dmaengine: sf-pdma: Get number of channel by device tree
2022-03-28 9:52 ` Zong Li
@ 2022-03-28 9:52 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Palmer Dabbelt
It currently assumes that there are always four channels, it would
cause the error if there is actually less than four channels. Change
that by getting number of channel from device tree.
For backwards-compatibility, it uses the default value (i.e. 4) when
there is no 'dma-channels' information in dts.
Signed-off-by: Zong Li <zong.li@sifive.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
---
drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++++++--------
drivers/dma/sf-pdma/sf-pdma.h | 8 ++------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index f12606aeff87..db5a4ef76077 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -482,23 +482,30 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)
static int sf_pdma_probe(struct platform_device *pdev)
{
struct sf_pdma *pdma;
- struct sf_pdma_chan *chan;
struct resource *res;
- int len, chans;
- int ret;
+ int ret, n_chans;
const enum dma_slave_buswidth widths =
DMA_SLAVE_BUSWIDTH_1_BYTE | DMA_SLAVE_BUSWIDTH_2_BYTES |
DMA_SLAVE_BUSWIDTH_4_BYTES | DMA_SLAVE_BUSWIDTH_8_BYTES |
DMA_SLAVE_BUSWIDTH_16_BYTES | DMA_SLAVE_BUSWIDTH_32_BYTES |
DMA_SLAVE_BUSWIDTH_64_BYTES;
- chans = PDMA_NR_CH;
- len = sizeof(*pdma) + sizeof(*chan) * chans;
- pdma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
+ ret = of_property_read_u32(pdev->dev.of_node, "dma-channels", &n_chans);
+ if (ret) {
+ /* backwards-compatibility for no dma-channels property */
+ dev_dbg(&pdev->dev, "set number of channels to default value: 4\n");
+ n_chans = PDMA_MAX_NR_CH;
+ } else if (n_chans > PDMA_MAX_NR_CH) {
+ dev_err(&pdev->dev, "the number of channels exceeds the maximum\n");
+ return -EINVAL;
+ }
+
+ pdma = devm_kzalloc(&pdev->dev, struct_size(pdma, chans, n_chans),
+ GFP_KERNEL);
if (!pdma)
return -ENOMEM;
- pdma->n_chans = chans;
+ pdma->n_chans = n_chans;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pdma->membase = devm_ioremap_resource(&pdev->dev, res);
@@ -556,7 +563,7 @@ static int sf_pdma_remove(struct platform_device *pdev)
struct sf_pdma_chan *ch;
int i;
- for (i = 0; i < PDMA_NR_CH; i++) {
+ for (i = 0; i < pdma->n_chans; i++) {
ch = &pdma->chans[i];
devm_free_irq(&pdev->dev, ch->txirq, ch);
@@ -574,6 +581,7 @@ static int sf_pdma_remove(struct platform_device *pdev)
static const struct of_device_id sf_pdma_dt_ids[] = {
{ .compatible = "sifive,fu540-c000-pdma" },
+ { .compatible = "sifive,pdma0" },
{},
};
MODULE_DEVICE_TABLE(of, sf_pdma_dt_ids);
diff --git a/drivers/dma/sf-pdma/sf-pdma.h b/drivers/dma/sf-pdma/sf-pdma.h
index 0c20167b097d..dcb3687bd5da 100644
--- a/drivers/dma/sf-pdma/sf-pdma.h
+++ b/drivers/dma/sf-pdma/sf-pdma.h
@@ -22,11 +22,7 @@
#include "../dmaengine.h"
#include "../virt-dma.h"
-#define PDMA_NR_CH 4
-
-#if (PDMA_NR_CH != 4)
-#error "Please define PDMA_NR_CH to 4"
-#endif
+#define PDMA_MAX_NR_CH 4
#define PDMA_BASE_ADDR 0x3000000
#define PDMA_CHAN_OFFSET 0x1000
@@ -118,7 +114,7 @@ struct sf_pdma {
void __iomem *membase;
void __iomem *mappedbase;
u32 n_chans;
- struct sf_pdma_chan chans[PDMA_NR_CH];
+ struct sf_pdma_chan chans[];
};
#endif /* _SF_PDMA_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v8 4/4] dmaengine: sf-pdma: Get number of channel by device tree
@ 2022-03-28 9:52 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-28 9:52 UTC (permalink / raw)
To: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, vkoul, dmaengine,
devicetree, linux-kernel, linux-riscv
Cc: Zong Li, Palmer Dabbelt
It currently assumes that there are always four channels, it would
cause the error if there is actually less than four channels. Change
that by getting number of channel from device tree.
For backwards-compatibility, it uses the default value (i.e. 4) when
there is no 'dma-channels' information in dts.
Signed-off-by: Zong Li <zong.li@sifive.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
---
drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++++++--------
drivers/dma/sf-pdma/sf-pdma.h | 8 ++------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index f12606aeff87..db5a4ef76077 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -482,23 +482,30 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)
static int sf_pdma_probe(struct platform_device *pdev)
{
struct sf_pdma *pdma;
- struct sf_pdma_chan *chan;
struct resource *res;
- int len, chans;
- int ret;
+ int ret, n_chans;
const enum dma_slave_buswidth widths =
DMA_SLAVE_BUSWIDTH_1_BYTE | DMA_SLAVE_BUSWIDTH_2_BYTES |
DMA_SLAVE_BUSWIDTH_4_BYTES | DMA_SLAVE_BUSWIDTH_8_BYTES |
DMA_SLAVE_BUSWIDTH_16_BYTES | DMA_SLAVE_BUSWIDTH_32_BYTES |
DMA_SLAVE_BUSWIDTH_64_BYTES;
- chans = PDMA_NR_CH;
- len = sizeof(*pdma) + sizeof(*chan) * chans;
- pdma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
+ ret = of_property_read_u32(pdev->dev.of_node, "dma-channels", &n_chans);
+ if (ret) {
+ /* backwards-compatibility for no dma-channels property */
+ dev_dbg(&pdev->dev, "set number of channels to default value: 4\n");
+ n_chans = PDMA_MAX_NR_CH;
+ } else if (n_chans > PDMA_MAX_NR_CH) {
+ dev_err(&pdev->dev, "the number of channels exceeds the maximum\n");
+ return -EINVAL;
+ }
+
+ pdma = devm_kzalloc(&pdev->dev, struct_size(pdma, chans, n_chans),
+ GFP_KERNEL);
if (!pdma)
return -ENOMEM;
- pdma->n_chans = chans;
+ pdma->n_chans = n_chans;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pdma->membase = devm_ioremap_resource(&pdev->dev, res);
@@ -556,7 +563,7 @@ static int sf_pdma_remove(struct platform_device *pdev)
struct sf_pdma_chan *ch;
int i;
- for (i = 0; i < PDMA_NR_CH; i++) {
+ for (i = 0; i < pdma->n_chans; i++) {
ch = &pdma->chans[i];
devm_free_irq(&pdev->dev, ch->txirq, ch);
@@ -574,6 +581,7 @@ static int sf_pdma_remove(struct platform_device *pdev)
static const struct of_device_id sf_pdma_dt_ids[] = {
{ .compatible = "sifive,fu540-c000-pdma" },
+ { .compatible = "sifive,pdma0" },
{},
};
MODULE_DEVICE_TABLE(of, sf_pdma_dt_ids);
diff --git a/drivers/dma/sf-pdma/sf-pdma.h b/drivers/dma/sf-pdma/sf-pdma.h
index 0c20167b097d..dcb3687bd5da 100644
--- a/drivers/dma/sf-pdma/sf-pdma.h
+++ b/drivers/dma/sf-pdma/sf-pdma.h
@@ -22,11 +22,7 @@
#include "../dmaengine.h"
#include "../virt-dma.h"
-#define PDMA_NR_CH 4
-
-#if (PDMA_NR_CH != 4)
-#error "Please define PDMA_NR_CH to 4"
-#endif
+#define PDMA_MAX_NR_CH 4
#define PDMA_BASE_ADDR 0x3000000
#define PDMA_CHAN_OFFSET 0x1000
@@ -118,7 +114,7 @@ struct sf_pdma {
void __iomem *membase;
void __iomem *mappedbase;
u32 n_chans;
- struct sf_pdma_chan chans[PDMA_NR_CH];
+ struct sf_pdma_chan chans[];
};
#endif /* _SF_PDMA_H */
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [PATCH v8 1/4] dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and modify compatible
2022-03-28 9:52 ` [PATCH v8 1/4] dt-bindings: dma-engine: sifive, fu540: " Zong Li
@ 2022-03-29 1:35 ` Bin Meng
-1 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Rob Herring, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:56 PM Zong Li <zong.li@sifive.com> wrote:
>
> Add dma-channels property, then we can determine how many channels there
> by device tree, rather than statically defining it in PDMA driver.
> In addition, we also modify the compatible for PDMA versioning scheme.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Suggested-by: Palmer Dabbelt <palmer@rivosinc.com>
> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 1/4] dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and modify compatible
@ 2022-03-29 1:35 ` Bin Meng
0 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Rob Herring, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:56 PM Zong Li <zong.li@sifive.com> wrote:
>
> Add dma-channels property, then we can determine how many channels there
> by device tree, rather than statically defining it in PDMA driver.
> In addition, we also modify the compatible for PDMA versioning scheme.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Suggested-by: Palmer Dabbelt <palmer@rivosinc.com>
> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 2/4] riscv: dts: Add dma-channels property and modify compatible
2022-03-28 9:52 ` Zong Li
@ 2022-03-29 1:35 ` Bin Meng
-1 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:25 PM Zong Li <zong.li@sifive.com> wrote:
>
> Add dma-channels property, then we can determine how many channels there
> by device tree, in addition, we add the pdma versioning scheme for
> compatible.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 2/4] riscv: dts: Add dma-channels property and modify compatible
@ 2022-03-29 1:35 ` Bin Meng
0 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:25 PM Zong Li <zong.li@sifive.com> wrote:
>
> Add dma-channels property, then we can determine how many channels there
> by device tree, in addition, we add the pdma versioning scheme for
> compatible.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 3/4] riscv: dts: rename the node name of dma
2022-03-28 9:52 ` Zong Li
@ 2022-03-29 1:35 ` Bin Meng
-1 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv
On Tue, Mar 29, 2022 at 6:27 AM Zong Li <zong.li@sifive.com> wrote:
>
> Rename the node name by the generic DMA naming
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> CC: Vinod Koul <vkoul@kernel.org>
> ---
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 3/4] riscv: dts: rename the node name of dma
@ 2022-03-29 1:35 ` Bin Meng
0 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv
On Tue, Mar 29, 2022 at 6:27 AM Zong Li <zong.li@sifive.com> wrote:
>
> Rename the node name by the generic DMA naming
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> CC: Vinod Koul <vkoul@kernel.org>
> ---
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 4/4] dmaengine: sf-pdma: Get number of channel by device tree
2022-03-28 9:52 ` Zong Li
@ 2022-03-29 1:35 ` Bin Meng
-1 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:38 PM Zong Li <zong.li@sifive.com> wrote:
>
> It currently assumes that there are always four channels, it would
> cause the error if there is actually less than four channels. Change
> that by getting number of channel from device tree.
>
> For backwards-compatibility, it uses the default value (i.e. 4) when
> there is no 'dma-channels' information in dts.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> ---
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++++++--------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++------
> 2 files changed, 18 insertions(+), 14 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 4/4] dmaengine: sf-pdma: Get number of channel by device tree
@ 2022-03-29 1:35 ` Bin Meng
0 siblings, 0 replies; 48+ messages in thread
From: Bin Meng @ 2022-03-29 1:35 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
krzysztof.kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, vkoul, dmaengine, devicetree, linux-kernel,
linux-riscv, Palmer Dabbelt
On Mon, Mar 28, 2022 at 7:38 PM Zong Li <zong.li@sifive.com> wrote:
>
> It currently assumes that there are always four channels, it would
> cause the error if there is actually less than four channels. Change
> that by getting number of channel from device tree.
>
> For backwards-compatibility, it uses the default value (i.e. 4) when
> there is no 'dma-channels' information in dts.
>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> ---
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++++++--------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++------
> 2 files changed, 18 insertions(+), 14 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-28 9:52 ` Zong Li
@ 2022-03-31 1:06 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-31 1:06 UTC (permalink / raw)
To: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, Vinod,
dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv, Palmer Dabbelt
Hi Vinod and Palmer,
This patchset got some reviewed-by and acked-by, if it is good to you
as well, are you willing to help me to pick them? Thanks.
On Mon, Mar 28, 2022 at 5:52 PM Zong Li <zong.li@sifive.com> wrote:
>
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
>
> This patch set contains the dts and dt-bindings change.
>
> Changed in v8:
> - Rebase on master
> - Remove modification of microchip-mpfs.dtsi
> - Rename DMA node name of fu540-c000.dtsi
>
> Changed in v7:
> - Rebase on tag v5.17-rc7
> - Modify the subject of patch
>
> Changed in v6:
> - Rebase on tag v5.17-rc6
> - Change sf_pdma.chans[] to a flexible array member.
>
> Changed in v5:
> - Rebase on tag v5.17-rc3
> - Fix typo in dt-bindings and commit message
> - Add PDMA versioning scheme for compatible
>
> Changed in v4:
> - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>
> Changed in v3:
> - Fix allocating wrong size
> - Return error if 'dma-channels' is larger than maximum
>
> Changed in v2:
> - Rebase on tag v5.16
> - Use 4 as default value of dma-channels
>
> Zong Li (4):
> dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> modify compatible
> riscv: dts: Add dma-channels property and modify compatible
> riscv: dts: rename the node name of dma
> dmaengine: sf-pdma: Get number of channel by device tree
>
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> 4 files changed, 38 insertions(+), 18 deletions(-)
>
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-31 1:06 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-03-31 1:06 UTC (permalink / raw)
To: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, Vinod,
dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv, Palmer Dabbelt
Hi Vinod and Palmer,
This patchset got some reviewed-by and acked-by, if it is good to you
as well, are you willing to help me to pick them? Thanks.
On Mon, Mar 28, 2022 at 5:52 PM Zong Li <zong.li@sifive.com> wrote:
>
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
>
> This patch set contains the dts and dt-bindings change.
>
> Changed in v8:
> - Rebase on master
> - Remove modification of microchip-mpfs.dtsi
> - Rename DMA node name of fu540-c000.dtsi
>
> Changed in v7:
> - Rebase on tag v5.17-rc7
> - Modify the subject of patch
>
> Changed in v6:
> - Rebase on tag v5.17-rc6
> - Change sf_pdma.chans[] to a flexible array member.
>
> Changed in v5:
> - Rebase on tag v5.17-rc3
> - Fix typo in dt-bindings and commit message
> - Add PDMA versioning scheme for compatible
>
> Changed in v4:
> - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>
> Changed in v3:
> - Fix allocating wrong size
> - Return error if 'dma-channels' is larger than maximum
>
> Changed in v2:
> - Rebase on tag v5.16
> - Use 4 as default value of dma-channels
>
> Zong Li (4):
> dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> modify compatible
> riscv: dts: Add dma-channels property and modify compatible
> riscv: dts: rename the node name of dma
> dmaengine: sf-pdma: Get number of channel by device tree
>
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> 4 files changed, 38 insertions(+), 18 deletions(-)
>
> --
> 2.35.1
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-28 9:52 ` Zong Li
@ 2022-03-31 3:15 ` Palmer Dabbelt
-1 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 3:15 UTC (permalink / raw)
To: zong.li
Cc: robh+dt, Paul Walmsley, aou, krzysztof.kozlowski, conor.dooley,
geert, bin.meng, green.wan, vkoul, dmaengine, devicetree,
linux-kernel, linux-riscv, zong.li
On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
>
> This patch set contains the dts and dt-bindings change.
>
> Changed in v8:
> - Rebase on master
> - Remove modification of microchip-mpfs.dtsi
> - Rename DMA node name of fu540-c000.dtsi
>
> Changed in v7:
> - Rebase on tag v5.17-rc7
> - Modify the subject of patch
>
> Changed in v6:
> - Rebase on tag v5.17-rc6
> - Change sf_pdma.chans[] to a flexible array member.
>
> Changed in v5:
> - Rebase on tag v5.17-rc3
> - Fix typo in dt-bindings and commit message
> - Add PDMA versioning scheme for compatible
>
> Changed in v4:
> - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>
> Changed in v3:
> - Fix allocating wrong size
> - Return error if 'dma-channels' is larger than maximum
>
> Changed in v2:
> - Rebase on tag v5.16
> - Use 4 as default value of dma-channels
>
> Zong Li (4):
> dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> modify compatible
> riscv: dts: Add dma-channels property and modify compatible
> riscv: dts: rename the node name of dma
> dmaengine: sf-pdma: Get number of channel by device tree
>
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> 4 files changed, 38 insertions(+), 18 deletions(-)
Thanks, these are on for-next.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-31 3:15 ` Palmer Dabbelt
0 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 3:15 UTC (permalink / raw)
To: zong.li
Cc: robh+dt, Paul Walmsley, aou, krzysztof.kozlowski, conor.dooley,
geert, bin.meng, green.wan, vkoul, dmaengine, devicetree,
linux-kernel, linux-riscv, zong.li
On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
>
> This patch set contains the dts and dt-bindings change.
>
> Changed in v8:
> - Rebase on master
> - Remove modification of microchip-mpfs.dtsi
> - Rename DMA node name of fu540-c000.dtsi
>
> Changed in v7:
> - Rebase on tag v5.17-rc7
> - Modify the subject of patch
>
> Changed in v6:
> - Rebase on tag v5.17-rc6
> - Change sf_pdma.chans[] to a flexible array member.
>
> Changed in v5:
> - Rebase on tag v5.17-rc3
> - Fix typo in dt-bindings and commit message
> - Add PDMA versioning scheme for compatible
>
> Changed in v4:
> - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>
> Changed in v3:
> - Fix allocating wrong size
> - Return error if 'dma-channels' is larger than maximum
>
> Changed in v2:
> - Rebase on tag v5.16
> - Use 4 as default value of dma-channels
>
> Zong Li (4):
> dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> modify compatible
> riscv: dts: Add dma-channels property and modify compatible
> riscv: dts: rename the node name of dma
> dmaengine: sf-pdma: Get number of channel by device tree
>
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> 4 files changed, 38 insertions(+), 18 deletions(-)
Thanks, these are on for-next.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-31 3:15 ` Palmer Dabbelt
@ 2022-03-31 5:21 ` Vinod Koul
-1 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-03-31 5:21 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On 30-03-22, 20:15, Palmer Dabbelt wrote:
> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> > The PDMA driver currently assumes there are four channels by default, it
> > might cause the error if there is actually less than four channels.
> > Change that by getting number of channel dynamically from device tree.
> > For backwards-compatible, it uses the default value (i.e. 4) when there
> > is no 'dma-channels' information in dts.
> >
> > This patch set contains the dts and dt-bindings change.
> >
> > Changed in v8:
> > - Rebase on master
> > - Remove modification of microchip-mpfs.dtsi
> > - Rename DMA node name of fu540-c000.dtsi
> >
> > Changed in v7:
> > - Rebase on tag v5.17-rc7
> > - Modify the subject of patch
> >
> > Changed in v6:
> > - Rebase on tag v5.17-rc6
> > - Change sf_pdma.chans[] to a flexible array member.
> >
> > Changed in v5:
> > - Rebase on tag v5.17-rc3
> > - Fix typo in dt-bindings and commit message
> > - Add PDMA versioning scheme for compatible
> >
> > Changed in v4:
> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> >
> > Changed in v3:
> > - Fix allocating wrong size
> > - Return error if 'dma-channels' is larger than maximum
> >
> > Changed in v2:
> > - Rebase on tag v5.16
> > - Use 4 as default value of dma-channels
> >
> > Zong Li (4):
> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> > modify compatible
> > riscv: dts: Add dma-channels property and modify compatible
> > riscv: dts: rename the node name of dma
> > dmaengine: sf-pdma: Get number of channel by device tree
> >
> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> > 4 files changed, 38 insertions(+), 18 deletions(-)
>
> Thanks, these are on for-next.
The drivers/dma/ should go thru dmaengine tree. During merge window I
dont apply the patches
--
~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-31 5:21 ` Vinod Koul
0 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-03-31 5:21 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On 30-03-22, 20:15, Palmer Dabbelt wrote:
> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> > The PDMA driver currently assumes there are four channels by default, it
> > might cause the error if there is actually less than four channels.
> > Change that by getting number of channel dynamically from device tree.
> > For backwards-compatible, it uses the default value (i.e. 4) when there
> > is no 'dma-channels' information in dts.
> >
> > This patch set contains the dts and dt-bindings change.
> >
> > Changed in v8:
> > - Rebase on master
> > - Remove modification of microchip-mpfs.dtsi
> > - Rename DMA node name of fu540-c000.dtsi
> >
> > Changed in v7:
> > - Rebase on tag v5.17-rc7
> > - Modify the subject of patch
> >
> > Changed in v6:
> > - Rebase on tag v5.17-rc6
> > - Change sf_pdma.chans[] to a flexible array member.
> >
> > Changed in v5:
> > - Rebase on tag v5.17-rc3
> > - Fix typo in dt-bindings and commit message
> > - Add PDMA versioning scheme for compatible
> >
> > Changed in v4:
> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> >
> > Changed in v3:
> > - Fix allocating wrong size
> > - Return error if 'dma-channels' is larger than maximum
> >
> > Changed in v2:
> > - Rebase on tag v5.16
> > - Use 4 as default value of dma-channels
> >
> > Zong Li (4):
> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> > modify compatible
> > riscv: dts: Add dma-channels property and modify compatible
> > riscv: dts: rename the node name of dma
> > dmaengine: sf-pdma: Get number of channel by device tree
> >
> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> > 4 files changed, 38 insertions(+), 18 deletions(-)
>
> Thanks, these are on for-next.
The drivers/dma/ should go thru dmaengine tree. During merge window I
dont apply the patches
--
~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-31 5:21 ` Vinod Koul
@ 2022-03-31 5:54 ` Palmer Dabbelt
-1 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 5:54 UTC (permalink / raw)
To: vkoul
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
> On 30-03-22, 20:15, Palmer Dabbelt wrote:
>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
>> > The PDMA driver currently assumes there are four channels by default, it
>> > might cause the error if there is actually less than four channels.
>> > Change that by getting number of channel dynamically from device tree.
>> > For backwards-compatible, it uses the default value (i.e. 4) when there
>> > is no 'dma-channels' information in dts.
>> >
>> > This patch set contains the dts and dt-bindings change.
>> >
>> > Changed in v8:
>> > - Rebase on master
>> > - Remove modification of microchip-mpfs.dtsi
>> > - Rename DMA node name of fu540-c000.dtsi
>> >
>> > Changed in v7:
>> > - Rebase on tag v5.17-rc7
>> > - Modify the subject of patch
>> >
>> > Changed in v6:
>> > - Rebase on tag v5.17-rc6
>> > - Change sf_pdma.chans[] to a flexible array member.
>> >
>> > Changed in v5:
>> > - Rebase on tag v5.17-rc3
>> > - Fix typo in dt-bindings and commit message
>> > - Add PDMA versioning scheme for compatible
>> >
>> > Changed in v4:
>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>> >
>> > Changed in v3:
>> > - Fix allocating wrong size
>> > - Return error if 'dma-channels' is larger than maximum
>> >
>> > Changed in v2:
>> > - Rebase on tag v5.16
>> > - Use 4 as default value of dma-channels
>> >
>> > Zong Li (4):
>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
>> > modify compatible
>> > riscv: dts: Add dma-channels property and modify compatible
>> > riscv: dts: rename the node name of dma
>> > dmaengine: sf-pdma: Get number of channel by device tree
>> >
>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
>> > 4 files changed, 38 insertions(+), 18 deletions(-)
>>
>> Thanks, these are on for-next.
>
> The drivers/dma/ should go thru dmaengine tree. During merge window I
> dont apply the patches
OK, I can drop this from my tree if you'd like?
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-31 5:54 ` Palmer Dabbelt
0 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 5:54 UTC (permalink / raw)
To: vkoul
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
> On 30-03-22, 20:15, Palmer Dabbelt wrote:
>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
>> > The PDMA driver currently assumes there are four channels by default, it
>> > might cause the error if there is actually less than four channels.
>> > Change that by getting number of channel dynamically from device tree.
>> > For backwards-compatible, it uses the default value (i.e. 4) when there
>> > is no 'dma-channels' information in dts.
>> >
>> > This patch set contains the dts and dt-bindings change.
>> >
>> > Changed in v8:
>> > - Rebase on master
>> > - Remove modification of microchip-mpfs.dtsi
>> > - Rename DMA node name of fu540-c000.dtsi
>> >
>> > Changed in v7:
>> > - Rebase on tag v5.17-rc7
>> > - Modify the subject of patch
>> >
>> > Changed in v6:
>> > - Rebase on tag v5.17-rc6
>> > - Change sf_pdma.chans[] to a flexible array member.
>> >
>> > Changed in v5:
>> > - Rebase on tag v5.17-rc3
>> > - Fix typo in dt-bindings and commit message
>> > - Add PDMA versioning scheme for compatible
>> >
>> > Changed in v4:
>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>> >
>> > Changed in v3:
>> > - Fix allocating wrong size
>> > - Return error if 'dma-channels' is larger than maximum
>> >
>> > Changed in v2:
>> > - Rebase on tag v5.16
>> > - Use 4 as default value of dma-channels
>> >
>> > Zong Li (4):
>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
>> > modify compatible
>> > riscv: dts: Add dma-channels property and modify compatible
>> > riscv: dts: rename the node name of dma
>> > dmaengine: sf-pdma: Get number of channel by device tree
>> >
>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
>> > 4 files changed, 38 insertions(+), 18 deletions(-)
>>
>> Thanks, these are on for-next.
>
> The drivers/dma/ should go thru dmaengine tree. During merge window I
> dont apply the patches
OK, I can drop this from my tree if you'd like?
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-31 5:54 ` Palmer Dabbelt
@ 2022-03-31 22:42 ` Palmer Dabbelt
-1 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 22:42 UTC (permalink / raw)
To: vkoul
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, 30 Mar 2022 22:54:47 PDT (-0700), Palmer Dabbelt wrote:
> On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
>> On 30-03-22, 20:15, Palmer Dabbelt wrote:
>>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
>>> > The PDMA driver currently assumes there are four channels by default, it
>>> > might cause the error if there is actually less than four channels.
>>> > Change that by getting number of channel dynamically from device tree.
>>> > For backwards-compatible, it uses the default value (i.e. 4) when there
>>> > is no 'dma-channels' information in dts.
>>> >
>>> > This patch set contains the dts and dt-bindings change.
>>> >
>>> > Changed in v8:
>>> > - Rebase on master
>>> > - Remove modification of microchip-mpfs.dtsi
>>> > - Rename DMA node name of fu540-c000.dtsi
>>> >
>>> > Changed in v7:
>>> > - Rebase on tag v5.17-rc7
>>> > - Modify the subject of patch
>>> >
>>> > Changed in v6:
>>> > - Rebase on tag v5.17-rc6
>>> > - Change sf_pdma.chans[] to a flexible array member.
>>> >
>>> > Changed in v5:
>>> > - Rebase on tag v5.17-rc3
>>> > - Fix typo in dt-bindings and commit message
>>> > - Add PDMA versioning scheme for compatible
>>> >
>>> > Changed in v4:
>>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>>> >
>>> > Changed in v3:
>>> > - Fix allocating wrong size
>>> > - Return error if 'dma-channels' is larger than maximum
>>> >
>>> > Changed in v2:
>>> > - Rebase on tag v5.16
>>> > - Use 4 as default value of dma-channels
>>> >
>>> > Zong Li (4):
>>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
>>> > modify compatible
>>> > riscv: dts: Add dma-channels property and modify compatible
>>> > riscv: dts: rename the node name of dma
>>> > dmaengine: sf-pdma: Get number of channel by device tree
>>> >
>>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
>>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
>>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
>>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
>>> > 4 files changed, 38 insertions(+), 18 deletions(-)
>>>
>>> Thanks, these are on for-next.
>>
>> The drivers/dma/ should go thru dmaengine tree. During merge window I
>> dont apply the patches
>
> OK, I can drop this from my tree if you'd like?
Just to follow up from IRC: I'm dropping these from my tree.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-03-31 22:42 ` Palmer Dabbelt
0 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-03-31 22:42 UTC (permalink / raw)
To: vkoul
Cc: zong.li, robh+dt, Paul Walmsley, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On Wed, 30 Mar 2022 22:54:47 PDT (-0700), Palmer Dabbelt wrote:
> On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
>> On 30-03-22, 20:15, Palmer Dabbelt wrote:
>>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
>>> > The PDMA driver currently assumes there are four channels by default, it
>>> > might cause the error if there is actually less than four channels.
>>> > Change that by getting number of channel dynamically from device tree.
>>> > For backwards-compatible, it uses the default value (i.e. 4) when there
>>> > is no 'dma-channels' information in dts.
>>> >
>>> > This patch set contains the dts and dt-bindings change.
>>> >
>>> > Changed in v8:
>>> > - Rebase on master
>>> > - Remove modification of microchip-mpfs.dtsi
>>> > - Rename DMA node name of fu540-c000.dtsi
>>> >
>>> > Changed in v7:
>>> > - Rebase on tag v5.17-rc7
>>> > - Modify the subject of patch
>>> >
>>> > Changed in v6:
>>> > - Rebase on tag v5.17-rc6
>>> > - Change sf_pdma.chans[] to a flexible array member.
>>> >
>>> > Changed in v5:
>>> > - Rebase on tag v5.17-rc3
>>> > - Fix typo in dt-bindings and commit message
>>> > - Add PDMA versioning scheme for compatible
>>> >
>>> > Changed in v4:
>>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
>>> >
>>> > Changed in v3:
>>> > - Fix allocating wrong size
>>> > - Return error if 'dma-channels' is larger than maximum
>>> >
>>> > Changed in v2:
>>> > - Rebase on tag v5.16
>>> > - Use 4 as default value of dma-channels
>>> >
>>> > Zong Li (4):
>>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
>>> > modify compatible
>>> > riscv: dts: Add dma-channels property and modify compatible
>>> > riscv: dts: rename the node name of dma
>>> > dmaengine: sf-pdma: Get number of channel by device tree
>>> >
>>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
>>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
>>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
>>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
>>> > 4 files changed, 38 insertions(+), 18 deletions(-)
>>>
>>> Thanks, these are on for-next.
>>
>> The drivers/dma/ should go thru dmaengine tree. During merge window I
>> dont apply the patches
>
> OK, I can drop this from my tree if you'd like?
Just to follow up from IRC: I'm dropping these from my tree.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-31 22:42 ` Palmer Dabbelt
@ 2022-04-01 5:50 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-01 5:50 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Vinod, Rob Herring, Paul Walmsley, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Fri, Apr 1, 2022 at 6:42 AM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Wed, 30 Mar 2022 22:54:47 PDT (-0700), Palmer Dabbelt wrote:
> > On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
> >> On 30-03-22, 20:15, Palmer Dabbelt wrote:
> >>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> >>> > The PDMA driver currently assumes there are four channels by default, it
> >>> > might cause the error if there is actually less than four channels.
> >>> > Change that by getting number of channel dynamically from device tree.
> >>> > For backwards-compatible, it uses the default value (i.e. 4) when there
> >>> > is no 'dma-channels' information in dts.
> >>> >
> >>> > This patch set contains the dts and dt-bindings change.
> >>> >
> >>> > Changed in v8:
> >>> > - Rebase on master
> >>> > - Remove modification of microchip-mpfs.dtsi
> >>> > - Rename DMA node name of fu540-c000.dtsi
> >>> >
> >>> > Changed in v7:
> >>> > - Rebase on tag v5.17-rc7
> >>> > - Modify the subject of patch
> >>> >
> >>> > Changed in v6:
> >>> > - Rebase on tag v5.17-rc6
> >>> > - Change sf_pdma.chans[] to a flexible array member.
> >>> >
> >>> > Changed in v5:
> >>> > - Rebase on tag v5.17-rc3
> >>> > - Fix typo in dt-bindings and commit message
> >>> > - Add PDMA versioning scheme for compatible
> >>> >
> >>> > Changed in v4:
> >>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> >>> >
> >>> > Changed in v3:
> >>> > - Fix allocating wrong size
> >>> > - Return error if 'dma-channels' is larger than maximum
> >>> >
> >>> > Changed in v2:
> >>> > - Rebase on tag v5.16
> >>> > - Use 4 as default value of dma-channels
> >>> >
> >>> > Zong Li (4):
> >>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> >>> > modify compatible
> >>> > riscv: dts: Add dma-channels property and modify compatible
> >>> > riscv: dts: rename the node name of dma
> >>> > dmaengine: sf-pdma: Get number of channel by device tree
> >>> >
> >>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> >>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> >>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> >>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> >>> > 4 files changed, 38 insertions(+), 18 deletions(-)
> >>>
> >>> Thanks, these are on for-next.
> >>
> >> The drivers/dma/ should go thru dmaengine tree. During merge window I
> >> dont apply the patches
> >
> > OK, I can drop this from my tree if you'd like?
>
> Just to follow up from IRC: I'm dropping these from my tree.
Hi Palmer and Vinod,
Many thanks for your help. As all you suggested, let's go this
patchset by the dmaengine tree. Thanks a lot!
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-01 5:50 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-01 5:50 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Vinod, Rob Herring, Paul Walmsley, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Fri, Apr 1, 2022 at 6:42 AM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Wed, 30 Mar 2022 22:54:47 PDT (-0700), Palmer Dabbelt wrote:
> > On Wed, 30 Mar 2022 22:21:56 PDT (-0700), vkoul@kernel.org wrote:
> >> On 30-03-22, 20:15, Palmer Dabbelt wrote:
> >>> On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> >>> > The PDMA driver currently assumes there are four channels by default, it
> >>> > might cause the error if there is actually less than four channels.
> >>> > Change that by getting number of channel dynamically from device tree.
> >>> > For backwards-compatible, it uses the default value (i.e. 4) when there
> >>> > is no 'dma-channels' information in dts.
> >>> >
> >>> > This patch set contains the dts and dt-bindings change.
> >>> >
> >>> > Changed in v8:
> >>> > - Rebase on master
> >>> > - Remove modification of microchip-mpfs.dtsi
> >>> > - Rename DMA node name of fu540-c000.dtsi
> >>> >
> >>> > Changed in v7:
> >>> > - Rebase on tag v5.17-rc7
> >>> > - Modify the subject of patch
> >>> >
> >>> > Changed in v6:
> >>> > - Rebase on tag v5.17-rc6
> >>> > - Change sf_pdma.chans[] to a flexible array member.
> >>> >
> >>> > Changed in v5:
> >>> > - Rebase on tag v5.17-rc3
> >>> > - Fix typo in dt-bindings and commit message
> >>> > - Add PDMA versioning scheme for compatible
> >>> >
> >>> > Changed in v4:
> >>> > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> >>> >
> >>> > Changed in v3:
> >>> > - Fix allocating wrong size
> >>> > - Return error if 'dma-channels' is larger than maximum
> >>> >
> >>> > Changed in v2:
> >>> > - Rebase on tag v5.16
> >>> > - Use 4 as default value of dma-channels
> >>> >
> >>> > Zong Li (4):
> >>> > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> >>> > modify compatible
> >>> > riscv: dts: Add dma-channels property and modify compatible
> >>> > riscv: dts: rename the node name of dma
> >>> > dmaengine: sf-pdma: Get number of channel by device tree
> >>> >
> >>> > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> >>> > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> >>> > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> >>> > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> >>> > 4 files changed, 38 insertions(+), 18 deletions(-)
> >>>
> >>> Thanks, these are on for-next.
> >>
> >> The drivers/dma/ should go thru dmaengine tree. During merge window I
> >> dont apply the patches
> >
> > OK, I can drop this from my tree if you'd like?
>
> Just to follow up from IRC: I'm dropping these from my tree.
Hi Palmer and Vinod,
Many thanks for your help. As all you suggested, let's go this
patchset by the dmaengine tree. Thanks a lot!
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-31 5:21 ` Vinod Koul
@ 2022-04-08 8:03 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-08 8:03 UTC (permalink / raw)
To: Vinod Koul
Cc: Palmer Dabbelt, Rob Herring, Paul Walmsley, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Thu, Mar 31, 2022 at 1:22 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 30-03-22, 20:15, Palmer Dabbelt wrote:
> > On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> > > The PDMA driver currently assumes there are four channels by default, it
> > > might cause the error if there is actually less than four channels.
> > > Change that by getting number of channel dynamically from device tree.
> > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > is no 'dma-channels' information in dts.
> > >
> > > This patch set contains the dts and dt-bindings change.
> > >
> > > Changed in v8:
> > > - Rebase on master
> > > - Remove modification of microchip-mpfs.dtsi
> > > - Rename DMA node name of fu540-c000.dtsi
> > >
> > > Changed in v7:
> > > - Rebase on tag v5.17-rc7
> > > - Modify the subject of patch
> > >
> > > Changed in v6:
> > > - Rebase on tag v5.17-rc6
> > > - Change sf_pdma.chans[] to a flexible array member.
> > >
> > > Changed in v5:
> > > - Rebase on tag v5.17-rc3
> > > - Fix typo in dt-bindings and commit message
> > > - Add PDMA versioning scheme for compatible
> > >
> > > Changed in v4:
> > > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> > >
> > > Changed in v3:
> > > - Fix allocating wrong size
> > > - Return error if 'dma-channels' is larger than maximum
> > >
> > > Changed in v2:
> > > - Rebase on tag v5.16
> > > - Use 4 as default value of dma-channels
> > >
> > > Zong Li (4):
> > > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> > > modify compatible
> > > riscv: dts: Add dma-channels property and modify compatible
> > > riscv: dts: rename the node name of dma
> > > dmaengine: sf-pdma: Get number of channel by device tree
> > >
> > > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> > > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> > > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> > > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> > > 4 files changed, 38 insertions(+), 18 deletions(-)
> >
> > Thanks, these are on for-next.
>
> The drivers/dma/ should go thru dmaengine tree. During merge window I
> dont apply the patches
>
> --
> ~Vinod
Hi Vinod,
Many thanks for considering this patchset :) Could I know if there is
an opportunity to pick this into the following few -rc kernels?
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-08 8:03 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-08 8:03 UTC (permalink / raw)
To: Vinod Koul
Cc: Palmer Dabbelt, Rob Herring, Paul Walmsley, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Thu, Mar 31, 2022 at 1:22 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 30-03-22, 20:15, Palmer Dabbelt wrote:
> > On Mon, 28 Mar 2022 02:52:21 PDT (-0700), zong.li@sifive.com wrote:
> > > The PDMA driver currently assumes there are four channels by default, it
> > > might cause the error if there is actually less than four channels.
> > > Change that by getting number of channel dynamically from device tree.
> > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > is no 'dma-channels' information in dts.
> > >
> > > This patch set contains the dts and dt-bindings change.
> > >
> > > Changed in v8:
> > > - Rebase on master
> > > - Remove modification of microchip-mpfs.dtsi
> > > - Rename DMA node name of fu540-c000.dtsi
> > >
> > > Changed in v7:
> > > - Rebase on tag v5.17-rc7
> > > - Modify the subject of patch
> > >
> > > Changed in v6:
> > > - Rebase on tag v5.17-rc6
> > > - Change sf_pdma.chans[] to a flexible array member.
> > >
> > > Changed in v5:
> > > - Rebase on tag v5.17-rc3
> > > - Fix typo in dt-bindings and commit message
> > > - Add PDMA versioning scheme for compatible
> > >
> > > Changed in v4:
> > > - Remove cflags of debug use reported-by: kernel test robot <lkp@intel.com>
> > >
> > > Changed in v3:
> > > - Fix allocating wrong size
> > > - Return error if 'dma-channels' is larger than maximum
> > >
> > > Changed in v2:
> > > - Rebase on tag v5.16
> > > - Use 4 as default value of dma-channels
> > >
> > > Zong Li (4):
> > > dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and
> > > modify compatible
> > > riscv: dts: Add dma-channels property and modify compatible
> > > riscv: dts: rename the node name of dma
> > > dmaengine: sf-pdma: Get number of channel by device tree
> > >
> > > .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +++++++++++++--
> > > arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 ++--
> > > drivers/dma/sf-pdma/sf-pdma.c | 24 ++++++++++++-------
> > > drivers/dma/sf-pdma/sf-pdma.h | 8 ++-----
> > > 4 files changed, 38 insertions(+), 18 deletions(-)
> >
> > Thanks, these are on for-next.
>
> The drivers/dma/ should go thru dmaengine tree. During merge window I
> dont apply the patches
>
> --
> ~Vinod
Hi Vinod,
Many thanks for considering this patchset :) Could I know if there is
an opportunity to pick this into the following few -rc kernels?
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-03-28 9:52 ` Zong Li
@ 2022-04-08 13:13 ` Vinod Koul
-1 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-04-08 13:13 UTC (permalink / raw)
To: Zong Li
Cc: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On 28-03-22, 17:52, Zong Li wrote:
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
Applied patch 1 & 4 to dmaengine-next, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-08 13:13 ` Vinod Koul
0 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-04-08 13:13 UTC (permalink / raw)
To: Zong Li
Cc: robh+dt, paul.walmsley, palmer, aou, krzysztof.kozlowski,
conor.dooley, geert, bin.meng, green.wan, dmaengine, devicetree,
linux-kernel, linux-riscv
On 28-03-22, 17:52, Zong Li wrote:
> The PDMA driver currently assumes there are four channels by default, it
> might cause the error if there is actually less than four channels.
> Change that by getting number of channel dynamically from device tree.
> For backwards-compatible, it uses the default value (i.e. 4) when there
> is no 'dma-channels' information in dts.
Applied patch 1 & 4 to dmaengine-next, thanks
--
~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-08 13:13 ` Vinod Koul
@ 2022-04-11 2:51 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-11 2:51 UTC (permalink / raw)
To: Vinod Koul
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 28-03-22, 17:52, Zong Li wrote:
> > The PDMA driver currently assumes there are four channels by default, it
> > might cause the error if there is actually less than four channels.
> > Change that by getting number of channel dynamically from device tree.
> > For backwards-compatible, it uses the default value (i.e. 4) when there
> > is no 'dma-channels' information in dts.
>
> Applied patch 1 & 4 to dmaengine-next, thanks
Hi Vinod,
Thanks for your help and review. For patch 2 and 3, does it mean that
we should go through the riscv tree?
>
> --
> ~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-11 2:51 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-11 2:51 UTC (permalink / raw)
To: Vinod Koul
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 28-03-22, 17:52, Zong Li wrote:
> > The PDMA driver currently assumes there are four channels by default, it
> > might cause the error if there is actually less than four channels.
> > Change that by getting number of channel dynamically from device tree.
> > For backwards-compatible, it uses the default value (i.e. 4) when there
> > is no 'dma-channels' information in dts.
>
> Applied patch 1 & 4 to dmaengine-next, thanks
Hi Vinod,
Thanks for your help and review. For patch 2 and 3, does it mean that
we should go through the riscv tree?
>
> --
> ~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-11 2:51 ` Zong Li
@ 2022-04-11 10:48 ` Vinod Koul
-1 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-04-11 10:48 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On 11-04-22, 10:51, Zong Li wrote:
> On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> >
> > On 28-03-22, 17:52, Zong Li wrote:
> > > The PDMA driver currently assumes there are four channels by default, it
> > > might cause the error if there is actually less than four channels.
> > > Change that by getting number of channel dynamically from device tree.
> > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > is no 'dma-channels' information in dts.
> >
> > Applied patch 1 & 4 to dmaengine-next, thanks
>
> Hi Vinod,
> Thanks for your help and review. For patch 2 and 3, does it mean that
> we should go through the riscv tree?
Yes
--
~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-11 10:48 ` Vinod Koul
0 siblings, 0 replies; 48+ messages in thread
From: Vinod Koul @ 2022-04-11 10:48 UTC (permalink / raw)
To: Zong Li
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Krzysztof Kozlowski, Conor Dooley, Geert Uytterhoeven, Bin Meng,
Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On 11-04-22, 10:51, Zong Li wrote:
> On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> >
> > On 28-03-22, 17:52, Zong Li wrote:
> > > The PDMA driver currently assumes there are four channels by default, it
> > > might cause the error if there is actually less than four channels.
> > > Change that by getting number of channel dynamically from device tree.
> > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > is no 'dma-channels' information in dts.
> >
> > Applied patch 1 & 4 to dmaengine-next, thanks
>
> Hi Vinod,
> Thanks for your help and review. For patch 2 and 3, does it mean that
> we should go through the riscv tree?
Yes
--
~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-11 10:48 ` Vinod Koul
@ 2022-04-11 11:43 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-11 11:43 UTC (permalink / raw)
To: Vinod Koul
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 11-04-22, 10:51, Zong Li wrote:
> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >
> > > On 28-03-22, 17:52, Zong Li wrote:
> > > > The PDMA driver currently assumes there are four channels by default, it
> > > > might cause the error if there is actually less than four channels.
> > > > Change that by getting number of channel dynamically from device tree.
> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > > is no 'dma-channels' information in dts.
> > >
> > > Applied patch 1 & 4 to dmaengine-next, thanks
> >
> > Hi Vinod,
> > Thanks for your help and review. For patch 2 and 3, does it mean that
> > we should go through the riscv tree?
>
> Yes
>
Hi Palmer,
Could you please help me to pick up the patch 2 and 3. Thanks :)
> --
> ~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-11 11:43 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-11 11:43 UTC (permalink / raw)
To: Vinod Koul
Cc: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Conor Dooley, Geert Uytterhoeven, Bin Meng, Green Wan, dmaengine,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org List, linux-riscv
On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>
> On 11-04-22, 10:51, Zong Li wrote:
> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >
> > > On 28-03-22, 17:52, Zong Li wrote:
> > > > The PDMA driver currently assumes there are four channels by default, it
> > > > might cause the error if there is actually less than four channels.
> > > > Change that by getting number of channel dynamically from device tree.
> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > > > is no 'dma-channels' information in dts.
> > >
> > > Applied patch 1 & 4 to dmaengine-next, thanks
> >
> > Hi Vinod,
> > Thanks for your help and review. For patch 2 and 3, does it mean that
> > we should go through the riscv tree?
>
> Yes
>
Hi Palmer,
Could you please help me to pick up the patch 2 and 3. Thanks :)
> --
> ~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-11 11:43 ` Zong Li
@ 2022-04-20 0:18 ` Palmer Dabbelt
-1 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-04-20 0:18 UTC (permalink / raw)
To: zong.li
Cc: vkoul, robh+dt, Paul Walmsley, aou, conor.dooley, geert,
bin.meng, green.wan, dmaengine, devicetree, linux-kernel,
linux-riscv
On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>>
>> On 11-04-22, 10:51, Zong Li wrote:
>> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>> > >
>> > > On 28-03-22, 17:52, Zong Li wrote:
>> > > > The PDMA driver currently assumes there are four channels by default, it
>> > > > might cause the error if there is actually less than four channels.
>> > > > Change that by getting number of channel dynamically from device tree.
>> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
>> > > > is no 'dma-channels' information in dts.
>> > >
>> > > Applied patch 1 & 4 to dmaengine-next, thanks
>> >
>> > Hi Vinod,
>> > Thanks for your help and review. For patch 2 and 3, does it mean that
>> > we should go through the riscv tree?
>>
>> Yes
>>
>
> Hi Palmer,
> Could you please help me to pick up the patch 2 and 3. Thanks :)
Sorry about that, I forgot about this one. I just put them on for-next,
there was a minor merge conflict but it looks pretty simple.
>
>> --
>> ~Vinod
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-20 0:18 ` Palmer Dabbelt
0 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-04-20 0:18 UTC (permalink / raw)
To: zong.li
Cc: vkoul, robh+dt, Paul Walmsley, aou, conor.dooley, geert,
bin.meng, green.wan, dmaengine, devicetree, linux-kernel,
linux-riscv
On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>>
>> On 11-04-22, 10:51, Zong Li wrote:
>> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>> > >
>> > > On 28-03-22, 17:52, Zong Li wrote:
>> > > > The PDMA driver currently assumes there are four channels by default, it
>> > > > might cause the error if there is actually less than four channels.
>> > > > Change that by getting number of channel dynamically from device tree.
>> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
>> > > > is no 'dma-channels' information in dts.
>> > >
>> > > Applied patch 1 & 4 to dmaengine-next, thanks
>> >
>> > Hi Vinod,
>> > Thanks for your help and review. For patch 2 and 3, does it mean that
>> > we should go through the riscv tree?
>>
>> Yes
>>
>
> Hi Palmer,
> Could you please help me to pick up the patch 2 and 3. Thanks :)
Sorry about that, I forgot about this one. I just put them on for-next,
there was a minor merge conflict but it looks pretty simple.
>
>> --
>> ~Vinod
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-20 0:18 ` Palmer Dabbelt
@ 2022-04-20 14:25 ` Rob Herring
-1 siblings, 0 replies; 48+ messages in thread
From: Rob Herring @ 2022-04-20 14:25 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Zong Li, Vinod, Paul Walmsley, Albert Ou, Conor Dooley,
Geert Uytterhoeven, Bin Meng, Green Wan,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, devicetree,
linux-kernel, linux-riscv
On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
> >>
> >> On 11-04-22, 10:51, Zong Li wrote:
> >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> >> > >
> >> > > On 28-03-22, 17:52, Zong Li wrote:
> >> > > > The PDMA driver currently assumes there are four channels by default, it
> >> > > > might cause the error if there is actually less than four channels.
> >> > > > Change that by getting number of channel dynamically from device tree.
> >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> >> > > > is no 'dma-channels' information in dts.
> >> > >
> >> > > Applied patch 1 & 4 to dmaengine-next, thanks
> >> >
> >> > Hi Vinod,
> >> > Thanks for your help and review. For patch 2 and 3, does it mean that
> >> > we should go through the riscv tree?
> >>
> >> Yes
> >>
> >
> > Hi Palmer,
> > Could you please help me to pick up the patch 2 and 3. Thanks :)
>
> Sorry about that, I forgot about this one. I just put them on for-next,
> there was a minor merge conflict but it looks pretty simple.
Looks like you applied patch 1 too which Vinod already applied to the
dmaengine tree. And you changed the 1st line removing the "# " before
the SPDX tag which results in:
make[1]: *** Deleting file
'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
Traceback (most recent call last):
File "/usr/local/bin/dt-extract-example", line 52, in <module>
binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
line 434, in load
return constructor.get_single_data()
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
line 119, in get_single_data
node = self.composer.get_single_node()
File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
ruamel.yaml.composer.ComposerError: expected a single document in the stream
in "<unicode string>", line 1, column 1
but found another document
in "<unicode string>", line 2, column 1
make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
Error 1
./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
[error] missing document start "---" (document-start)
Rob
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-20 14:25 ` Rob Herring
0 siblings, 0 replies; 48+ messages in thread
From: Rob Herring @ 2022-04-20 14:25 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Zong Li, Vinod, Paul Walmsley, Albert Ou, Conor Dooley,
Geert Uytterhoeven, Bin Meng, Green Wan,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, devicetree,
linux-kernel, linux-riscv
On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
> >>
> >> On 11-04-22, 10:51, Zong Li wrote:
> >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> >> > >
> >> > > On 28-03-22, 17:52, Zong Li wrote:
> >> > > > The PDMA driver currently assumes there are four channels by default, it
> >> > > > might cause the error if there is actually less than four channels.
> >> > > > Change that by getting number of channel dynamically from device tree.
> >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> >> > > > is no 'dma-channels' information in dts.
> >> > >
> >> > > Applied patch 1 & 4 to dmaengine-next, thanks
> >> >
> >> > Hi Vinod,
> >> > Thanks for your help and review. For patch 2 and 3, does it mean that
> >> > we should go through the riscv tree?
> >>
> >> Yes
> >>
> >
> > Hi Palmer,
> > Could you please help me to pick up the patch 2 and 3. Thanks :)
>
> Sorry about that, I forgot about this one. I just put them on for-next,
> there was a minor merge conflict but it looks pretty simple.
Looks like you applied patch 1 too which Vinod already applied to the
dmaengine tree. And you changed the 1st line removing the "# " before
the SPDX tag which results in:
make[1]: *** Deleting file
'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
Traceback (most recent call last):
File "/usr/local/bin/dt-extract-example", line 52, in <module>
binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
line 434, in load
return constructor.get_single_data()
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
line 119, in get_single_data
node = self.composer.get_single_node()
File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
ruamel.yaml.composer.ComposerError: expected a single document in the stream
in "<unicode string>", line 1, column 1
but found another document
in "<unicode string>", line 2, column 1
make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
Error 1
./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
[error] missing document start "---" (document-start)
Rob
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-20 14:25 ` Rob Herring
@ 2022-04-21 1:07 ` Zong Li
-1 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-21 1:07 UTC (permalink / raw)
To: Rob Herring
Cc: Palmer Dabbelt, Vinod, Paul Walmsley, Albert Ou, Conor Dooley,
Geert Uytterhoeven, Bin Meng, Green Wan,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, linux-riscv
On Wed, Apr 20, 2022 at 10:26 PM Rob Herring <robh+dt@kernel.org> wrote:
>
> On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
> >
> > On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> > > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >>
> > >> On 11-04-22, 10:51, Zong Li wrote:
> > >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >> > >
> > >> > > On 28-03-22, 17:52, Zong Li wrote:
> > >> > > > The PDMA driver currently assumes there are four channels by default, it
> > >> > > > might cause the error if there is actually less than four channels.
> > >> > > > Change that by getting number of channel dynamically from device tree.
> > >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > >> > > > is no 'dma-channels' information in dts.
> > >> > >
> > >> > > Applied patch 1 & 4 to dmaengine-next, thanks
> > >> >
> > >> > Hi Vinod,
> > >> > Thanks for your help and review. For patch 2 and 3, does it mean that
> > >> > we should go through the riscv tree?
> > >>
> > >> Yes
> > >>
> > >
> > > Hi Palmer,
> > > Could you please help me to pick up the patch 2 and 3. Thanks :)
> >
> > Sorry about that, I forgot about this one. I just put them on for-next,
> > there was a minor merge conflict but it looks pretty simple.
>
> Looks like you applied patch 1 too which Vinod already applied to the
> dmaengine tree. And you changed the 1st line removing the "# " before
> the SPDX tag which results in:
Hi Palmer,
Many thanks for helping me to pick them into riscv-tree, It seems like
we need to pick patch 2 and 3 in riscv tree, instead of patch 1 and 2.
:)
>
> make[1]: *** Deleting file
> 'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
> Traceback (most recent call last):
> File "/usr/local/bin/dt-extract-example", line 52, in <module>
> binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
> line 434, in load
> return constructor.get_single_data()
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
> line 119, in get_single_data
> node = self.composer.get_single_node()
> File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
> ruamel.yaml.composer.ComposerError: expected a single document in the stream
> in "<unicode string>", line 1, column 1
> but found another document
> in "<unicode string>", line 2, column 1
> make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
> Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
> Error 1
> ./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
> [error] missing document start "---" (document-start)
>
>
> Rob
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-21 1:07 ` Zong Li
0 siblings, 0 replies; 48+ messages in thread
From: Zong Li @ 2022-04-21 1:07 UTC (permalink / raw)
To: Rob Herring
Cc: Palmer Dabbelt, Vinod, Paul Walmsley, Albert Ou, Conor Dooley,
Geert Uytterhoeven, Bin Meng, Green Wan,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, linux-riscv
On Wed, Apr 20, 2022 at 10:26 PM Rob Herring <robh+dt@kernel.org> wrote:
>
> On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
> >
> > On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
> > > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >>
> > >> On 11-04-22, 10:51, Zong Li wrote:
> > >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
> > >> > >
> > >> > > On 28-03-22, 17:52, Zong Li wrote:
> > >> > > > The PDMA driver currently assumes there are four channels by default, it
> > >> > > > might cause the error if there is actually less than four channels.
> > >> > > > Change that by getting number of channel dynamically from device tree.
> > >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
> > >> > > > is no 'dma-channels' information in dts.
> > >> > >
> > >> > > Applied patch 1 & 4 to dmaengine-next, thanks
> > >> >
> > >> > Hi Vinod,
> > >> > Thanks for your help and review. For patch 2 and 3, does it mean that
> > >> > we should go through the riscv tree?
> > >>
> > >> Yes
> > >>
> > >
> > > Hi Palmer,
> > > Could you please help me to pick up the patch 2 and 3. Thanks :)
> >
> > Sorry about that, I forgot about this one. I just put them on for-next,
> > there was a minor merge conflict but it looks pretty simple.
>
> Looks like you applied patch 1 too which Vinod already applied to the
> dmaengine tree. And you changed the 1st line removing the "# " before
> the SPDX tag which results in:
Hi Palmer,
Many thanks for helping me to pick them into riscv-tree, It seems like
we need to pick patch 2 and 3 in riscv tree, instead of patch 1 and 2.
:)
>
> make[1]: *** Deleting file
> 'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
> Traceback (most recent call last):
> File "/usr/local/bin/dt-extract-example", line 52, in <module>
> binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
> line 434, in load
> return constructor.get_single_data()
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
> line 119, in get_single_data
> node = self.composer.get_single_node()
> File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
> ruamel.yaml.composer.ComposerError: expected a single document in the stream
> in "<unicode string>", line 1, column 1
> but found another document
> in "<unicode string>", line 2, column 1
> make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
> Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
> Error 1
> ./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
> [error] missing document start "---" (document-start)
>
>
> Rob
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
2022-04-20 14:25 ` Rob Herring
@ 2022-04-21 2:49 ` Palmer Dabbelt
-1 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-04-21 2:49 UTC (permalink / raw)
To: robh+dt
Cc: zong.li, vkoul, Paul Walmsley, aou, conor.dooley, geert,
bin.meng, green.wan, dmaengine, devicetree, linux-kernel,
linux-riscv
On Wed, 20 Apr 2022 07:25:53 PDT (-0700), robh+dt@kernel.org wrote:
> On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>>
>> On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
>> > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>> >>
>> >> On 11-04-22, 10:51, Zong Li wrote:
>> >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>> >> > >
>> >> > > On 28-03-22, 17:52, Zong Li wrote:
>> >> > > > The PDMA driver currently assumes there are four channels by default, it
>> >> > > > might cause the error if there is actually less than four channels.
>> >> > > > Change that by getting number of channel dynamically from device tree.
>> >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
>> >> > > > is no 'dma-channels' information in dts.
>> >> > >
>> >> > > Applied patch 1 & 4 to dmaengine-next, thanks
>> >> >
>> >> > Hi Vinod,
>> >> > Thanks for your help and review. For patch 2 and 3, does it mean that
>> >> > we should go through the riscv tree?
>> >>
>> >> Yes
>> >>
>> >
>> > Hi Palmer,
>> > Could you please help me to pick up the patch 2 and 3. Thanks :)
>>
>> Sorry about that, I forgot about this one. I just put them on for-next,
>> there was a minor merge conflict but it looks pretty simple.
>
> Looks like you applied patch 1 too which Vinod already applied to the
> dmaengine tree. And you changed the 1st line removing the "# " before
> the SPDX tag which results in:
>
> make[1]: *** Deleting file
> 'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
> Traceback (most recent call last):
> File "/usr/local/bin/dt-extract-example", line 52, in <module>
> binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
> line 434, in load
> return constructor.get_single_data()
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
> line 119, in get_single_data
> node = self.composer.get_single_node()
> File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
> ruamel.yaml.composer.ComposerError: expected a single document in the stream
> in "<unicode string>", line 1, column 1
> but found another document
> in "<unicode string>", line 2, column 1
> make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
> Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
> Error 1
> ./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
> [error] missing document start "---" (document-start)
Sorry about that, I cherry-picked them from my working repo which I
assumed was the same but I guess had some nastiness (including the patch
reordering). Then I also ran check in the wrong working repo, so I
didn't notice the mess.
This should all be fixed.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property
@ 2022-04-21 2:49 ` Palmer Dabbelt
0 siblings, 0 replies; 48+ messages in thread
From: Palmer Dabbelt @ 2022-04-21 2:49 UTC (permalink / raw)
To: robh+dt
Cc: zong.li, vkoul, Paul Walmsley, aou, conor.dooley, geert,
bin.meng, green.wan, dmaengine, devicetree, linux-kernel,
linux-riscv
On Wed, 20 Apr 2022 07:25:53 PDT (-0700), robh+dt@kernel.org wrote:
> On Tue, Apr 19, 2022 at 7:18 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>>
>> On Mon, 11 Apr 2022 04:43:35 PDT (-0700), zong.li@sifive.com wrote:
>> > On Mon, Apr 11, 2022 at 6:48 PM Vinod Koul <vkoul@kernel.org> wrote:
>> >>
>> >> On 11-04-22, 10:51, Zong Li wrote:
>> >> > On Fri, Apr 8, 2022 at 9:13 PM Vinod Koul <vkoul@kernel.org> wrote:
>> >> > >
>> >> > > On 28-03-22, 17:52, Zong Li wrote:
>> >> > > > The PDMA driver currently assumes there are four channels by default, it
>> >> > > > might cause the error if there is actually less than four channels.
>> >> > > > Change that by getting number of channel dynamically from device tree.
>> >> > > > For backwards-compatible, it uses the default value (i.e. 4) when there
>> >> > > > is no 'dma-channels' information in dts.
>> >> > >
>> >> > > Applied patch 1 & 4 to dmaengine-next, thanks
>> >> >
>> >> > Hi Vinod,
>> >> > Thanks for your help and review. For patch 2 and 3, does it mean that
>> >> > we should go through the riscv tree?
>> >>
>> >> Yes
>> >>
>> >
>> > Hi Palmer,
>> > Could you please help me to pick up the patch 2 and 3. Thanks :)
>>
>> Sorry about that, I forgot about this one. I just put them on for-next,
>> there was a minor merge conflict but it looks pretty simple.
>
> Looks like you applied patch 1 too which Vinod already applied to the
> dmaengine tree. And you changed the 1st line removing the "# " before
> the SPDX tag which results in:
>
> make[1]: *** Deleting file
> 'Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts'
> Traceback (most recent call last):
> File "/usr/local/bin/dt-extract-example", line 52, in <module>
> binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py",
> line 434, in load
> return constructor.get_single_data()
> File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py",
> line 119, in get_single_data
> node = self.composer.get_single_node()
> File "_ruamel_yaml.pyx", line 718, in _ruamel_yaml.CParser.get_single_node
> ruamel.yaml.composer.ComposerError: expected a single document in the stream
> in "<unicode string>", line 1, column 1
> but found another document
> in "<unicode string>", line 2, column 1
> make[1]: *** [Documentation/devicetree/bindings/Makefile:26:
> Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.example.dts]
> Error 1
> ./Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml:1:1:
> [error] missing document start "---" (document-start)
Sorry about that, I cherry-picked them from my working repo which I
assumed was the same but I guess had some nastiness (including the patch
reordering). Then I also ran check in the wrong working repo, so I
didn't notice the mess.
This should all be fixed.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2022-04-21 2:49 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-28 9:52 [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property Zong Li
2022-03-28 9:52 ` Zong Li
2022-03-28 9:52 ` [PATCH v8 1/4] dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and modify compatible Zong Li
2022-03-28 9:52 ` [PATCH v8 1/4] dt-bindings: dma-engine: sifive, fu540: " Zong Li
2022-03-29 1:35 ` [PATCH v8 1/4] dt-bindings: dma-engine: sifive,fu540: " Bin Meng
2022-03-29 1:35 ` Bin Meng
2022-03-28 9:52 ` [PATCH v8 2/4] riscv: dts: " Zong Li
2022-03-28 9:52 ` Zong Li
2022-03-29 1:35 ` Bin Meng
2022-03-29 1:35 ` Bin Meng
2022-03-28 9:52 ` [PATCH v8 3/4] riscv: dts: rename the node name of dma Zong Li
2022-03-28 9:52 ` Zong Li
2022-03-29 1:35 ` Bin Meng
2022-03-29 1:35 ` Bin Meng
2022-03-28 9:52 ` [PATCH v8 4/4] dmaengine: sf-pdma: Get number of channel by device tree Zong Li
2022-03-28 9:52 ` Zong Li
2022-03-29 1:35 ` Bin Meng
2022-03-29 1:35 ` Bin Meng
2022-03-31 1:06 ` [PATCH v8 0/4] Determine the number of DMA channels by 'dma-channels' property Zong Li
2022-03-31 1:06 ` Zong Li
2022-03-31 3:15 ` Palmer Dabbelt
2022-03-31 3:15 ` Palmer Dabbelt
2022-03-31 5:21 ` Vinod Koul
2022-03-31 5:21 ` Vinod Koul
2022-03-31 5:54 ` Palmer Dabbelt
2022-03-31 5:54 ` Palmer Dabbelt
2022-03-31 22:42 ` Palmer Dabbelt
2022-03-31 22:42 ` Palmer Dabbelt
2022-04-01 5:50 ` Zong Li
2022-04-01 5:50 ` Zong Li
2022-04-08 8:03 ` Zong Li
2022-04-08 8:03 ` Zong Li
2022-04-08 13:13 ` Vinod Koul
2022-04-08 13:13 ` Vinod Koul
2022-04-11 2:51 ` Zong Li
2022-04-11 2:51 ` Zong Li
2022-04-11 10:48 ` Vinod Koul
2022-04-11 10:48 ` Vinod Koul
2022-04-11 11:43 ` Zong Li
2022-04-11 11:43 ` Zong Li
2022-04-20 0:18 ` Palmer Dabbelt
2022-04-20 0:18 ` Palmer Dabbelt
2022-04-20 14:25 ` Rob Herring
2022-04-20 14:25 ` Rob Herring
2022-04-21 1:07 ` Zong Li
2022-04-21 1:07 ` Zong Li
2022-04-21 2:49 ` Palmer Dabbelt
2022-04-21 2:49 ` Palmer Dabbelt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.