From: Shravan Chippa <[email protected]>
This series does the following
1. Adds a PolarFire SoC specific compatible and code to support for
out-of-order dma transfers
2. Adds generic device tree bindings support by using
of_dma_controller_register()
Shravan Chippa (3):
dmaengine: sf-pdma: Support of_dma_controller_register()
dt-bindings: dma: sf-pdma: add new compatible name
dmaengine: sf-pdma: add mpfs-pdma compatible name
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 12 ++--
drivers/dma/sf-pdma/sf-pdma.c | 68 ++++++++++++++++++-
drivers/dma/sf-pdma/sf-pdma.h | 6 ++
3 files changed, 79 insertions(+), 7 deletions(-)
--
2.34.1
From: Shravan Chippa <[email protected]>
add new compatible name microchip,mpfs-pdma to support out of order dma
transfers this will improve the dma throughput for mem-to-mem transfer
Signed-off-by: Shravan Chippa <[email protected]>
Reviewed-by: Conor Dooley <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
---
.../bindings/dma/sifive,fu540-c000-pdma.yaml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
index a1af0b906365..974467c4bacb 100644
--- a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
+++ b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
@@ -27,10 +27,14 @@ allOf:
properties:
compatible:
- items:
- - enum:
- - sifive,fu540-c000-pdma
- - const: sifive,pdma0
+ oneOf:
+ - items:
+ - const: microchip,mpfs-pdma # Microchip out of order DMA transfer
+ - const: sifive,fu540-c000-pdma # Sifive in-order DMA transfer
+ - items:
+ - enum:
+ - sifive,fu540-c000-pdma
+ - const: sifive,pdma0
description:
Should be "sifive,<chip>-pdma" and "sifive,pdma<version>".
Supported compatible strings are -
--
2.34.1
Hey Shravan,
On Fri, Sep 22, 2023 at 03:20:38PM +0530, shravan chippa wrote:
> From: Shravan Chippa <[email protected]>
>
> add new compatible name microchip,mpfs-pdma to support out of order dma
> transfers this will improve the dma throughput for mem-to-mem transfer
>
> Signed-off-by: Shravan Chippa <[email protected]>
> Reviewed-by: Conor Dooley <[email protected]>
> Signed-off-by: Conor Dooley <[email protected]>
I would appreciate if you would drop any vendor tree related tags when
submitting patches upstream, especially for dt-bindings where it
actually means something to have my R-b on them.
Cheers,
Conor.
> ---
> .../bindings/dma/sifive,fu540-c000-pdma.yaml | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
> index a1af0b906365..974467c4bacb 100644
> --- a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
> +++ b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
> @@ -27,10 +27,14 @@ allOf:
>
> properties:
> compatible:
> - items:
> - - enum:
> - - sifive,fu540-c000-pdma
> - - const: sifive,pdma0
> + oneOf:
> + - items:
> + - const: microchip,mpfs-pdma # Microchip out of order DMA transfer
> + - const: sifive,fu540-c000-pdma # Sifive in-order DMA transfer
> + - items:
> + - enum:
> + - sifive,fu540-c000-pdma
> + - const: sifive,pdma0
> description:
> Should be "sifive,<chip>-pdma" and "sifive,pdma<version>".
> Supported compatible strings are -
> --
> 2.34.1
>
From: Shravan Chippa <[email protected]>
Update sf-pdma driver to adopt generic DMA device tree bindings.
It calls of_dma_controller_register() with sf-pdma specific
of_dma_xlate to get the generic DMA device tree helper support
and the DMA clients can look up the sf-pdma controller using
standard APIs.
Signed-off-by: Shravan Chippa <[email protected]>
---
drivers/dma/sf-pdma/sf-pdma.c | 41 +++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index d1c6956af452..c7558c9f9ac3 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -20,6 +20,7 @@
#include <linux/mod_devicetable.h>
#include <linux/dma-mapping.h>
#include <linux/of.h>
+#include <linux/of_dma.h>
#include <linux/slab.h>
#include "sf-pdma.h"
@@ -490,6 +491,33 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)
}
}
+static struct dma_chan *sf_pdma_of_xlate(struct of_phandle_args *dma_spec,
+ struct of_dma *ofdma)
+{
+ struct sf_pdma *pdma = ofdma->of_dma_data;
+ struct device *dev = pdma->dma_dev.dev;
+ struct sf_pdma_chan *chan;
+ struct dma_chan *c;
+ u32 channel_id;
+
+ if (dma_spec->args_count != 1) {
+ dev_err(dev, "Bad number of cells\n");
+ return NULL;
+ }
+
+ channel_id = dma_spec->args[0];
+
+ chan = &pdma->chans[channel_id];
+
+ c = dma_get_slave_channel(&chan->vchan.chan);
+ if (!c) {
+ dev_err(dev, "No more channels available\n");
+ return NULL;
+ }
+
+ return c;
+}
+
static int sf_pdma_probe(struct platform_device *pdev)
{
struct sf_pdma *pdma;
@@ -563,7 +591,20 @@ static int sf_pdma_probe(struct platform_device *pdev)
return ret;
}
+ ret = of_dma_controller_register(pdev->dev.of_node,
+ sf_pdma_of_xlate, pdma);
+ if (ret < 0) {
+ dev_err(&pdev->dev,
+ "Can't register SiFive Platform OF_DMA. (%d)\n", ret);
+ goto err_unregister;
+ }
+
return 0;
+
+err_unregister:
+ dma_async_device_unregister(&pdma->dma_dev);
+
+ return ret;
}
static int sf_pdma_remove(struct platform_device *pdev)
--
2.34.1
shravan chippa wrote:
> From: Shravan Chippa <[email protected]>
>
> Update sf-pdma driver to adopt generic DMA device tree bindings.
> It calls of_dma_controller_register() with sf-pdma specific
> of_dma_xlate to get the generic DMA device tree helper support
> and the DMA clients can look up the sf-pdma controller using
> standard APIs.
>
> Signed-off-by: Shravan Chippa <[email protected]>
> ---
> drivers/dma/sf-pdma/sf-pdma.c | 41 +++++++++++++++++++++++++++++++++++
> 1 file changed, 41 insertions(+)
>
> diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
> index d1c6956af452..c7558c9f9ac3 100644
> --- a/drivers/dma/sf-pdma/sf-pdma.c
> +++ b/drivers/dma/sf-pdma/sf-pdma.c
> @@ -20,6 +20,7 @@
> #include <linux/mod_devicetable.h>
> #include <linux/dma-mapping.h>
> #include <linux/of.h>
> +#include <linux/of_dma.h>
> #include <linux/slab.h>
>
> #include "sf-pdma.h"
> @@ -490,6 +491,33 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)
> }
> }
>
> +static struct dma_chan *sf_pdma_of_xlate(struct of_phandle_args *dma_spec,
> + struct of_dma *ofdma)
> +{
> + struct sf_pdma *pdma = ofdma->of_dma_data;
> + struct device *dev = pdma->dma_dev.dev;
> + struct sf_pdma_chan *chan;
> + struct dma_chan *c;
> + u32 channel_id;
> +
> + if (dma_spec->args_count != 1) {
> + dev_err(dev, "Bad number of cells\n");
> + return NULL;
> + }
> +
> + channel_id = dma_spec->args[0];
> +
> + chan = &pdma->chans[channel_id];
> +
> + c = dma_get_slave_channel(&chan->vchan.chan);
> + if (!c) {
> + dev_err(dev, "No more channels available\n");
> + return NULL;
> + }
> +
> + return c;
> +}
> +
> static int sf_pdma_probe(struct platform_device *pdev)
> {
> struct sf_pdma *pdma;
> @@ -563,7 +591,20 @@ static int sf_pdma_probe(struct platform_device *pdev)
> return ret;
> }
>
> + ret = of_dma_controller_register(pdev->dev.of_node,
> + sf_pdma_of_xlate, pdma);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "Can't register SiFive Platform OF_DMA. (%d)\n", ret);
> + goto err_unregister;
> + }
> +
Hi Shrivan,
Doesn't this need a matching unregister/free call in the
sf_pdma_remove function?
/Emil
> return 0;
> +
> +err_unregister:
> + dma_async_device_unregister(&pdma->dma_dev);
> +
> + return ret;
> }
>
> static int sf_pdma_remove(struct platform_device *pdev)
> --
> 2.34.1
>
>
> _______________________________________________
> linux-riscv mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv
From: Shravan Chippa <[email protected]>
Sifive platform dma does not allow out-of-order transfers,
buf out-of-order dma has a significant performance advantage.
Add a PolarFire SoC specific compatible and code to support
for out-of-order dma transfers
Signed-off-by: Shravan Chippa <[email protected]>
Reviewed-by: Conor Dooley <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/dma/sf-pdma/sf-pdma.c | 27 ++++++++++++++++++++++++---
drivers/dma/sf-pdma/sf-pdma.h | 6 ++++++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index c7558c9f9ac3..992a804166d5 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -21,6 +21,7 @@
#include <linux/dma-mapping.h>
#include <linux/of.h>
#include <linux/of_dma.h>
+#include <linux/of_device.h>
#include <linux/slab.h>
#include "sf-pdma.h"
@@ -66,7 +67,7 @@ static struct sf_pdma_desc *sf_pdma_alloc_desc(struct sf_pdma_chan *chan)
static void sf_pdma_fill_desc(struct sf_pdma_desc *desc,
u64 dst, u64 src, u64 size)
{
- desc->xfer_type = PDMA_FULL_SPEED;
+ desc->xfer_type = desc->chan->pdma->transfer_type;
desc->xfer_size = size;
desc->dst_addr = dst;
desc->src_addr = src;
@@ -520,6 +521,7 @@ static struct dma_chan *sf_pdma_of_xlate(struct of_phandle_args *dma_spec,
static int sf_pdma_probe(struct platform_device *pdev)
{
+ const struct sf_pdma_driver_platdata *ddata;
struct sf_pdma *pdma;
int ret, n_chans;
const enum dma_slave_buswidth widths =
@@ -545,6 +547,14 @@ static int sf_pdma_probe(struct platform_device *pdev)
pdma->n_chans = n_chans;
+ pdma->transfer_type = PDMA_FULL_SPEED;
+
+ ddata = of_device_get_match_data(&pdev->dev);
+ if (ddata) {
+ if (ddata->quirks & NO_STRICT_ORDERING)
+ pdma->transfer_type &= ~(NO_STRICT_ORDERING);
+ }
+
pdma->membase = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(pdma->membase))
return PTR_ERR(pdma->membase);
@@ -629,11 +639,22 @@ static int sf_pdma_remove(struct platform_device *pdev)
return 0;
}
+static const struct sf_pdma_driver_platdata mpfs_pdma = {
+ .quirks = NO_STRICT_ORDERING,
+};
+
static const struct of_device_id sf_pdma_dt_ids[] = {
- { .compatible = "sifive,fu540-c000-pdma" },
- { .compatible = "sifive,pdma0" },
+ {
+ .compatible = "sifive,fu540-c000-pdma",
+ }, {
+ .compatible = "sifive,pdma0",
+ }, {
+ .compatible = "microchip,mpfs-pdma",
+ .data = &mpfs_pdma,
+ },
{},
};
+
MODULE_DEVICE_TABLE(of, sf_pdma_dt_ids);
static struct platform_driver sf_pdma_driver = {
diff --git a/drivers/dma/sf-pdma/sf-pdma.h b/drivers/dma/sf-pdma/sf-pdma.h
index 5c398a83b491..3b16db4daa0b 100644
--- a/drivers/dma/sf-pdma/sf-pdma.h
+++ b/drivers/dma/sf-pdma/sf-pdma.h
@@ -49,6 +49,7 @@
/* Transfer Type */
#define PDMA_FULL_SPEED 0xFF000008
+#define NO_STRICT_ORDERING BIT(3)
/* Error Recovery */
#define MAX_RETRY 1
@@ -112,8 +113,13 @@ struct sf_pdma {
struct dma_device dma_dev;
void __iomem *membase;
void __iomem *mappedbase;
+ u32 transfer_type;
u32 n_chans;
struct sf_pdma_chan chans[];
};
+struct sf_pdma_driver_platdata {
+ u32 quirks;
+};
+
#endif /* _SF_PDMA_H */
--
2.34.1
> -----Original Message-----
> From: Emil Renner Berthing <[email protected]>
> Sent: Friday, September 22, 2023 4:16 PM
> To: shravan Chippa - I35088 <[email protected]>;
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected]; linux-
> [email protected]; [email protected]; Nagasuresh Relli -
> I67208 <[email protected]>; Praveen Kumar - I30718
> <[email protected]>
> Subject: Re: [PATCH v1 1/3] dmaengine: sf-pdma: Support
> of_dma_controller_register()
>
> [You don't often get email from [email protected]. Learn
> why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the
> content is safe
>
> shravan chippa wrote:
> > From: Shravan Chippa <[email protected]>
> >
> > Update sf-pdma driver to adopt generic DMA device tree bindings.
> > It calls of_dma_controller_register() with sf-pdma specific
> > of_dma_xlate to get the generic DMA device tree helper support and the
> > DMA clients can look up the sf-pdma controller using standard APIs.
> >
> > Signed-off-by: Shravan Chippa <[email protected]>
> > ---
> > drivers/dma/sf-pdma/sf-pdma.c | 41
> > +++++++++++++++++++++++++++++++++++
> > 1 file changed, 41 insertions(+)
> >
> > diff --git a/drivers/dma/sf-pdma/sf-pdma.c
> > b/drivers/dma/sf-pdma/sf-pdma.c index d1c6956af452..c7558c9f9ac3
> > 100644
> > --- a/drivers/dma/sf-pdma/sf-pdma.c
> > +++ b/drivers/dma/sf-pdma/sf-pdma.c
> > @@ -20,6 +20,7 @@
> > #include <linux/mod_devicetable.h>
> > #include <linux/dma-mapping.h>
> > #include <linux/of.h>
> > +#include <linux/of_dma.h>
> > #include <linux/slab.h>
> >
> > #include "sf-pdma.h"
> > @@ -490,6 +491,33 @@ static void sf_pdma_setup_chans(struct sf_pdma
> *pdma)
> > }
> > }
> >
> > +static struct dma_chan *sf_pdma_of_xlate(struct of_phandle_args
> *dma_spec,
> > + struct of_dma *ofdma) {
> > + struct sf_pdma *pdma = ofdma->of_dma_data;
> > + struct device *dev = pdma->dma_dev.dev;
> > + struct sf_pdma_chan *chan;
> > + struct dma_chan *c;
> > + u32 channel_id;
> > +
> > + if (dma_spec->args_count != 1) {
> > + dev_err(dev, "Bad number of cells\n");
> > + return NULL;
> > + }
> > +
> > + channel_id = dma_spec->args[0];
> > +
> > + chan = &pdma->chans[channel_id];
> > +
> > + c = dma_get_slave_channel(&chan->vchan.chan);
> > + if (!c) {
> > + dev_err(dev, "No more channels available\n");
> > + return NULL;
> > + }
> > +
> > + return c;
> > +}
> > +
> > static int sf_pdma_probe(struct platform_device *pdev) {
> > struct sf_pdma *pdma;
> > @@ -563,7 +591,20 @@ static int sf_pdma_probe(struct platform_device
> *pdev)
> > return ret;
> > }
> >
> > + ret = of_dma_controller_register(pdev->dev.of_node,
> > + sf_pdma_of_xlate, pdma);
> > + if (ret < 0) {
> > + dev_err(&pdev->dev,
> > + "Can't register SiFive Platform OF_DMA. (%d)\n", ret);
> > + goto err_unregister;
> > + }
> > +
>
> Hi Shrivan,
>
> Doesn't this need a matching unregister/free call in the sf_pdma_remove
> function?
>
> /Emil
>
Will add of_dma_controller_free(np) call in the sf_pdma_remove().
> > return 0;
> > +
> > +err_unregister:
> > + dma_async_device_unregister(&pdma->dma_dev);
> > +
> > + return ret;
> > }
> >
> > static int sf_pdma_remove(struct platform_device *pdev)
> > --
> > 2.34.1
> >
> >
> > _______________________________________________
> > linux-riscv mailing list
> > [email protected]
> > http://lists.infradead.org/mailman/listinfo/linux-riscv