| Message ID | cover.1648461096.git.zong.li@sifive.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Determine the number of DMA channels by 'dma-channels' property | expand |
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 >
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.
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
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?
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.
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!
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?
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
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
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
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
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
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
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
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.
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(-)