Skip to contentSkip to conversation

dw_dmac: introduce autoconfiguration

PATCH Superseded Andy Shevchenko 5 participants 58 messages Sep 17, 2012 – Oct 1, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover dw_dmac: introduce autoconfiguration

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Comments are welcome.

Andy Shevchenko (7):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: check if controller supports LLP
dw_dmac: introduce software emulation of LLP transfers

 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  207 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   48 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/7 dw_dmac: mark dwc_dump_chan_regs as inline

---
 drivers/dma/dw_dmac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dw_dmac.c +1 -1
index 832538c..75ab5af 100644
@@ -208,7 +208,7 @@ static inline unsigned int dwc_fast_fls(unsigned long long v)
 	return 0;
 }
 
-static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
+static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
 {
 	dev_err(chan2dev(&dwc->chan),
 		"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
Signature · 1 line
1.7.10.4
Acked-by on v1 1/7
#2 lore raw

Re: [PATCH 1/7] dw_dmac: mark dwc_dump_chan_regs as inline

Quoted 10 lines · Andy Shevchenko
---
 drivers/dma/dw_dmac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dw_dmac.c +0 -0
index 832538c..75ab5af 100644

drivers/dma/dw_dmac.c static inline unsigned int dwc_fast_fls(unsigned long long v) · line 214

Quoted 8 lines
drivers/dma/dw_dmac.c +1 -1
@@ -208,7 +208,7 @@ static inline unsigned int dwc_fast_fls(unsigned long long v)
        return 0;
 }
 
-static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
+static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
 {
        dev_err(chan2dev(&dwc->chan),
                "  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
#3 lore raw

PATCH 2/7 dw_dmac: fill optional encoded parameters in register structure

In reply to Andy Shevchenko

There is a block of the registers that are optional. However, if enabled they contain useful information about the controller hardware configuration. We will use this piece of data to autoconfigure the driver.

---
 drivers/dma/dw_dmac_regs.h |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
drivers/dma/dw_dmac_regs.h +19 -0
index f6d92d7..4633d39 100644
@@ -82,9 +82,28 @@ struct dw_dma_regs {
 	DW_REG(ID);
 	DW_REG(TEST);
 
+	/* reserved */
+	DW_REG(__reserved0);
+	DW_REG(__reserved1);
+
 	/* optional encoded params, 0x3c8..0x3f7 */
+	u32	__reserved;
+
+	/* per-channel configuration registers */
+	u32	DWC_PARAMS[DW_DMA_MAX_NR_CHANNELS];
+	u32	MULTI_BLK_TYPE;
+	u32	MAX_BLK_SIZE;
+
+	/* top-level parameters */
+	u32	DW_PARAMS;
 };
 
+#define dma_raw_readl(addr, name) \
+	readl((addr) + offsetof(struct dw_dma_regs, name))
+
+#define dma_raw_writel(addr, name, val) \
+	writel((val), (addr) + offsetof(struct dw_dma_regs, name))
+
 /* Bitfields in CTL_LO */
 #define DWC_CTLL_INT_EN		(1 << 0)	/* irqs enabled? */
 #define DWC_CTLL_DST_WIDTH(n)	((n)<<1)	/* bytes per element */
Signature · 1 line
1.7.10.4
#4 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

Quoted 13 lines · Andy Shevchenko
drivers/dma/dw_dmac_regs.h +4 -0
index f6d92d7..4633d39 100644
@@ -82,9 +82,28 @@ struct dw_dma_regs {
        DW_REG(ID);
        DW_REG(TEST);
 
+       /* reserved */
+       DW_REG(__reserved0);
+       DW_REG(__reserved1);
+
        /* optional encoded params, 0x3c8..0x3f7 */

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 99

Quoted 10 lines
drivers/dma/dw_dmac_regs.h +9 -0
+       u32     __reserved;
+
+       /* per-channel configuration registers */
+       u32     DWC_PARAMS[DW_DMA_MAX_NR_CHANNELS];
+       u32     MULTI_BLK_TYPE;
+       u32     MAX_BLK_SIZE;
+
+       /* top-level parameters */
+       u32     DW_PARAMS;
 };

Above is Ok.

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 106

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +6 -0
+#define dma_raw_readl(addr, name) \
+       readl((addr) + offsetof(struct dw_dma_regs, name))
+
+#define dma_raw_writel(addr, name, val) \
+       writel((val), (addr) + offsetof(struct dw_dma_regs, name))
+

But why don't you use earlier defined readl/writel macros:
dma_readl and dma_writel?

--
viresh

#5 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

On Tue, 2012-09-18 at 12:09 +0530, viresh kumar wrote:

[snip]

Quoted 9 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 106

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +6 -0
+#define dma_raw_readl(addr, name) \
+       readl((addr) + offsetof(struct dw_dma_regs, name))
+
+#define dma_raw_writel(addr, name, val) \
+       writel((val), (addr) + offsetof(struct dw_dma_regs, name))
+

But why don't you use earlier defined readl/writel macros:
dma_readl and dma_writel?

If you look at further patches, namely 3rd, the access to the register is needed before we allocate memory for the dw_dma structure.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#6 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

Quoted 10 lines · Andy Shevchenko
Quoted 9 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 106

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +6 -0
+#define dma_raw_readl(addr, name) \
+       readl((addr) + offsetof(struct dw_dma_regs, name))
+
+#define dma_raw_writel(addr, name, val) \
+       writel((val), (addr) + offsetof(struct dw_dma_regs, name))
+

But why don't you use earlier defined readl/writel macros:
dma_readl and dma_writel?

Quoted 2 lines

If you look at further patches, namely 3rd, the access to the register is needed before we allocate memory for the dw_dma structure.

Ok. If i am not wrong, such calls are only required once for below line:

dw_params = dma_raw_readl(regs, DW_PARAMS

dma_raw_writel() is not used and shouldn't be required in future too. So remove it.
dma_raw_readl() is required but the name is a bit confusing... this raw type is different
from raw_readl...

Can we name it dma_read_byaddr()?

to make it more explicit.

viresh

#7 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

Quoted 12 lines · viresh kumar
Quoted 9 lines · Andy Shevchenko
Quoted 9 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 106

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +6 -0
+#define dma_raw_readl(addr, name) \
+       readl((addr) + offsetof(struct dw_dma_regs, name))
+
+#define dma_raw_writel(addr, name, val) \
+       writel((val), (addr) + offsetof(struct dw_dma_regs, name))
+

But why don't you use earlier defined readl/writel macros:
dma_readl and dma_writel?

Quoted 4 lines
Quoted 2 lines

If you look at further patches, namely 3rd, the access to the register is needed before we allocate memory for the dw_dma structure.

Ok. If i am not wrong, such calls are only required once for below line:

Actually twice...

Quoted 1 line

dw_params = dma_raw_readl(regs, DW_PARAMS

...here and for channel parameters.

Quoted 2 lines

dma_raw_writel() is not used and shouldn't be required in future too. So remove it.

Ok

Quoted 6 lines

dma_raw_readl() is required but the name is a bit confusing... this raw type is different
from raw_readl...

Can we name it dma_read_byaddr()?
to make it more explicit.

Ok.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#8 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

Quoted 4 lines · Andy Shevchenko
Quoted 1 line

Ok. If i am not wrong, such calls are only required once for below line:

Actually twice...

Quoted 1 line

dw_params = dma_raw_readl(regs, DW_PARAMS

...here and for channel parameters.

Till the time we hit channel code, we can allocate memory for dw and so can use dma_readl/writel. Isn't it?

viresh

#9 lore raw

Re: [PATCH 2/7] dw_dmac: fill optional encoded parameters in register structure

Quoted 9 lines · viresh kumar
Quoted 4 lines · Andy Shevchenko
Quoted 1 line

Ok. If i am not wrong, such calls are only required once for below line:

Actually twice...

Quoted 1 line

dw_params = dma_raw_readl(regs, DW_PARAMS

...here and for channel parameters.

Till the time we hit channel code, we can allocate memory for dw and so can use dma_readl/writel. Isn't it?

Actually no. Becase we have the same name for 8 registers.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#10 lore raw

PATCH 3/7 dw_dmac: get number of channels from hardware if possible

In reply to Andy Shevchenko

In case the controller has the encoded parameters feature enabled the driver will use it to get the number of channels. In the future it will be used for the other important parameters as well.

---
 drivers/dma/dw_dmac.c      |   33 +++++++++++++++++++++++----------
 drivers/dma/dw_dmac_regs.h |    4 ++++
 2 files changed, 27 insertions(+), 10 deletions(-)
drivers/dma/dw_dmac.c +23 -10
index 75ab5af..2a3b730 100644
@@ -1376,6 +1376,10 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	struct resource		*io;
 	struct dw_dma		*dw;
 	size_t			size;
+	void __iomem		*regs;
+	bool			autocfg;
+	unsigned int		dw_params;
+	unsigned int		nr_channels;
 	int			irq;
 	int			err;
 	int			i;
@@ -1392,23 +1396,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	if (irq < 0)
 		return irq;
 
-	size = sizeof(struct dw_dma);
-	size += pdata->nr_channels * sizeof(struct dw_dma_chan);
+	regs = devm_request_and_ioremap(&pdev->dev, io);
+	if (!regs)
+		return -EBUSY;
+
+	dw_params = dma_raw_readl(regs, DW_PARAMS);
+	autocfg = dw_params >> DW_PARAMS_EN & 0x1;
+
+	if (autocfg)
+		nr_channels = (dw_params >> DW_PARAMS_NR_CHAN & 0x7) + 1;
+	else
+		nr_channels = pdata->nr_channels;
+
+	size = sizeof(struct dw_dma) + nr_channels * sizeof(struct dw_dma_chan);
 	dw = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
 	if (!dw)
 		return -ENOMEM;
 
-	dw->regs = devm_request_and_ioremap(&pdev->dev, io);
-	if (!dw->regs)
-		return -EBUSY;
-
 	dw->clk = devm_clk_get(&pdev->dev, "hclk");
 	if (IS_ERR(dw->clk))
 		return PTR_ERR(dw->clk);
 	clk_prepare_enable(dw->clk);
 
+	dw->regs = regs;
+
 	/* Calculate all channel mask before DMA setup */
-	dw->all_chan_mask = (1 << pdata->nr_channels) - 1;
+	dw->all_chan_mask = (1 << nr_channels) - 1;
 
 	/* force dma off, just in case */
 	dw_dma_off(dw);
@@ -1426,7 +1439,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);
 
 	INIT_LIST_HEAD(&dw->dma.channels);
-	for (i = 0; i < pdata->nr_channels; i++) {
+	for (i = 0; i < nr_channels; i++) {
 		struct dw_dma_chan	*dwc = &dw->chan[i];
 
 		dwc->chan.device = &dw->dma;
@@ -1439,7 +1452,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 		/* 7 is highest priority & 0 is lowest. */
 		if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-			dwc->priority = pdata->nr_channels - i - 1;
+			dwc->priority = nr_channels - i - 1;
 		else
 			dwc->priority = i;
 
@@ -1480,7 +1493,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	dma_writel(dw, CFG, DW_CFG_DMA_EN);
 
 	printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n",
-			dev_name(&pdev->dev), pdata->nr_channels);
+			dev_name(&pdev->dev), nr_channels);
 
 	dma_async_device_register(&dw->dma);
 
drivers/dma/dw_dmac_regs.h +4 -0
index 4633d39..0f96965 100644
@@ -104,6 +104,10 @@ struct dw_dma_regs {
 #define dma_raw_writel(addr, name, val) \
 	writel((val), (addr) + offsetof(struct dw_dma_regs, name))
 
+/* Bitfields in DW_PARAMS */
+#define DW_PARAMS_NR_CHAN	8		/* number of channels */
+#define DW_PARAMS_EN		28		/* encoded parameters */
+
 /* Bitfields in CTL_LO */
 #define DWC_CTLL_INT_EN		(1 << 0)	/* irqs enabled? */
 #define DWC_CTLL_DST_WIDTH(n)	((n)<<1)	/* bytes per element */
Signature · 1 line
1.7.10.4
#11 lore raw

Re: [PATCH 3/7] dw_dmac: get number of channels from hardware if possible

Quoted 26 lines · Andy Shevchenko

In case the controller has the encoded parameters feature enabled the driver will use it to get the number of channels. In the future it will be used for the other important parameters as well.

---
 drivers/dma/dw_dmac.c      |   33 +++++++++++++++++++++++----------
 drivers/dma/dw_dmac_regs.h |    4 ++++
 2 files changed, 27 insertions(+), 10 deletions(-)
drivers/dma/dw_dmac.c +4 -0
index 75ab5af..2a3b730 100644
@@ -1376,6 +1376,10 @@ static int __devinit dw_probe(struct platform_device *pdev)
        struct resource         *io;
        struct dw_dma           *dw;
        size_t                  size;
+       void __iomem            *regs;
+       bool                    autocfg;
+       unsigned int            dw_params;
+       unsigned int            nr_channels;
        int                     irq;
        int                     err;
        int                     i;

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1403

Quoted 10 lines
drivers/dma/dw_dmac.c +5 -2
@@ -1392,23 +1396,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
        if (irq < 0)
                return irq;
 
-       size = sizeof(struct dw_dma);
-       size += pdata->nr_channels * sizeof(struct dw_dma_chan);
+       regs = devm_request_and_ioremap(&pdev->dev, io);
+       if (!regs)
+               return -EBUSY;
+
+       dw_params = dma_raw_readl(regs, DW_PARAMS);

Is this valid for every SoC implementation. What if this configuration is not valid
for a particular SoC and it is invalid to access this address? Or this gives a invalid
value instead of returning 0?

Quoted 61 lines
drivers/dma/dw_dmac.c +14 -8
+       autocfg = dw_params >> DW_PARAMS_EN & 0x1;
+
+       if (autocfg)
+               nr_channels = (dw_params >> DW_PARAMS_NR_CHAN & 0x7) + 1;
+       else
+               nr_channels = pdata->nr_channels;
+
+       size = sizeof(struct dw_dma) + nr_channels * sizeof(struct dw_dma_chan);
        dw = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
        if (!dw)
                return -ENOMEM;
 
-       dw->regs = devm_request_and_ioremap(&pdev->dev, io);
-       if (!dw->regs)
-               return -EBUSY;
-
        dw->clk = devm_clk_get(&pdev->dev, "hclk");
        if (IS_ERR(dw->clk))
                return PTR_ERR(dw->clk);
        clk_prepare_enable(dw->clk);
 
+       dw->regs = regs;
+
        /* Calculate all channel mask before DMA setup */
-       dw->all_chan_mask = (1 << pdata->nr_channels) - 1;
+       dw->all_chan_mask = (1 << nr_channels) - 1;
 
        /* force dma off, just in case */
        dw_dma_off(dw);
@@ -1426,7 +1439,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
        tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);
 
        INIT_LIST_HEAD(&dw->dma.channels);
-       for (i = 0; i < pdata->nr_channels; i++) {
+       for (i = 0; i < nr_channels; i++) {
                struct dw_dma_chan      *dwc = &dw->chan[i];
 
                dwc->chan.device = &dw->dma;
@@ -1439,7 +1452,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
                /* 7 is highest priority & 0 is lowest. */
                if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-                       dwc->priority = pdata->nr_channels - i - 1;
+                       dwc->priority = nr_channels - i - 1;
                else
                        dwc->priority = i;
 
@@ -1480,7 +1493,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
        dma_writel(dw, CFG, DW_CFG_DMA_EN);
 
        printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n",
-                       dev_name(&pdev->dev), pdata->nr_channels);
+                       dev_name(&pdev->dev), nr_channels);
 
        dma_async_device_register(&dw->dma);
 
drivers/dma/dw_dmac_regs.h +0 -0
index 4633d39..0f96965 100644

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 110

Quoted 7 lines
drivers/dma/dw_dmac_regs.h +4 -0
@@ -104,6 +104,10 @@ struct dw_dma_regs {
 #define dma_raw_writel(addr, name, val) \
        writel((val), (addr) + offsetof(struct dw_dma_regs, name))
 
+/* Bitfields in DW_PARAMS */
+#define DW_PARAMS_NR_CHAN      8               /* number of channels */
+#define DW_PARAMS_EN           28              /* encoded parameters */
+

Can you make this part of patch 2/7?

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +0 -1
 /* Bitfields in CTL_LO */
 #define DWC_CTLL_INT_EN                (1 << 0)        /* irqs enabled? */
 #define DWC_CTLL_DST_WIDTH(n)  ((n)<<1)        /* bytes per element */
--

1.7.10.4

#12 lore raw

Re: [PATCH 3/7] dw_dmac: get number of channels from hardware if possible

Quoted 5 lines · viresh kumar
Quoted 3 lines · Andy Shevchenko

In case the controller has the encoded parameters feature enabled the driver will use it to get the number of channels. In the future it will be used for the other important parameters as well.

[snip]

Quoted 4 lines
Quoted 4 lines
drivers/dma/dw_dmac.c +0 -0
@@ -1392,23 +1396,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
        if (irq < 0)
                return irq;
 
Quoted 13 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1403

Quoted 7 lines
drivers/dma/dw_dmac.c +5 -2
-       size = sizeof(struct dw_dma);
-       size += pdata->nr_channels * sizeof(struct dw_dma_chan);
+       regs = devm_request_and_ioremap(&pdev->dev, io);
+       if (!regs)
+               return -EBUSY;
+
+       dw_params = dma_raw_readl(regs, DW_PARAMS);

Is this valid for every SoC implementation. What if this configuration is not valid
for a particular SoC and it is invalid to access this address? Or this gives a invalid
value instead of returning 0?

Actually I didn't get it clearly from the documentation. We have only one test report from Hein until now.

Quoted 8 lines
Quoted 8 lines
drivers/dma/dw_dmac_regs.h +0 -0
index 4633d39..0f96965 100644
@@ -104,6 +104,10 @@ struct dw_dma_regs {
 #define dma_raw_writel(addr, name, val) \
        writel((val), (addr) + offsetof(struct dw_dma_regs, name))
 
Quoted 6 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 110

Quoted 4 lines
drivers/dma/dw_dmac_regs.h +4 -0
+/* Bitfields in DW_PARAMS */
+#define DW_PARAMS_NR_CHAN      8               /* number of channels */
+#define DW_PARAMS_EN           28              /* encoded parameters */
+

Can you make this part of patch 2/7?

Do you mean to combine patch 2 and 3 together or only the parts related to dw_dmac_regs.h?

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#13 lore raw

Re: [PATCH 3/7] dw_dmac: get number of channels from hardware if possible

Quoted 10 lines · Andy Shevchenko
Quoted 8 lines · viresh kumar

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1396

Quoted 2 lines
drivers/dma/dw_dmac.c +1 -0
@@ -1392,23 +1396,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
+       dw_params = dma_raw_readl(regs, DW_PARAMS);

Is this valid for every SoC implementation. What if this configuration is not valid
for a particular SoC and it is invalid to access this address? Or this gives a invalid
value instead of returning 0?

Quoted 2 lines

Actually I didn't get it clearly from the documentation. We have only one test report from Hein until now.

@Shiraz: Can you please verify reading this register from u-boot? This is important before we apply this patch to linux-next.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/dma/dw_dmac_regs.h +0 -0
index 4633d39..0f96965 100644
@@ -104,6 +104,10 @@ struct dw_dma_regs {
 #define dma_raw_writel(addr, name, val) \
        writel((val), (addr) + offsetof(struct dw_dma_regs, name))
 
Quoted 8 lines
Quoted 6 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 110

Quoted 4 lines
drivers/dma/dw_dmac_regs.h +4 -0
+/* Bitfields in DW_PARAMS */
+#define DW_PARAMS_NR_CHAN      8               /* number of channels */
+#define DW_PARAMS_EN           28              /* encoded parameters */
+

Can you make this part of patch 2/7?

Do you mean to combine patch 2 and 3 together or only the parts related to dw_dmac_regs.h?

Only the new register definition macros in dmac_regs.h. :)

--
viresh

#14 lore raw

Re: [PATCH 3/7] dw_dmac: get number of channels from hardware if possible

Quoted 12 lines · viresh kumar
Quoted 9 lines · Andy Shevchenko
Quoted 8 lines · viresh kumar

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1396

Quoted 2 lines
drivers/dma/dw_dmac.c +1 -0
@@ -1392,23 +1396,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
+       dw_params = dma_raw_readl(regs, DW_PARAMS);

Is this valid for every SoC implementation. What if this configuration is not valid
for a particular SoC and it is invalid to access this address? Or this gives a invalid
value instead of returning 0?

Quoted 5 lines
Quoted 2 lines

Actually I didn't get it clearly from the documentation. We have only one test report from Hein until now.

@Shiraz: Can you please verify reading this register from u-boot? This is important before we apply this patch to linux-next.

Ok. I have verified from the documentation. This are valid registers for SPEAr. @Shiraz: No need to check now. :)

--
viresh

#15 lore raw

PATCH 4/7 dw_dmac: autoconfigure block_size or use platform data

In reply to Andy Shevchenko

The maximum block size is a configurable parameter for the chip. So, driver will try to get it from the encoded component parameters. Otherwise it will come from the platform data.

---
 arch/arm/mach-spear13xx/spear13xx.c |    1 +
 arch/avr32/mach-at32ap/at32ap700x.c |    1 +
 drivers/dma/dw_dmac.c               |   34 ++++++++++++++++++----------------
 drivers/dma/dw_dmac_regs.h          |    3 +++
 include/linux/dw_dmac.h             |    2 ++
 5 files changed, 25 insertions(+), 16 deletions(-)
arch/arm/mach-spear13xx/spear13xx.c +1 -0
index cf936b1..c64d812 100644
@@ -78,6 +78,7 @@ struct dw_dma_platform_data dmac_plat_data = {
 	.nr_channels = 8,
 	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 	.chan_priority = CHAN_PRIORITY_DESCENDING,
+	.block_size = 4095U,
 };
 
 void __init spear13xx_l2x0_init(void)
arch/avr32/mach-at32ap/at32ap700x.c +1 -0
index 0445c4f..2c4aefe 100644
@@ -605,6 +605,7 @@ static void __init genclk_init_parent(struct clk *clk)
 
 static struct dw_dma_platform_data dw_dmac0_data = {
 	.nr_channels	= 3,
+	.block_size	= 4095U,
 };
 
 static struct resource dw_dmac0_resource[] = {
drivers/dma/dw_dmac.c +18 -16
index 2a3b730..ab718ee 100644
@@ -58,16 +58,6 @@
 	})
 
 /*
- * This is configuration-dependent and usually a funny size like 4095.
- *
- * Note that this is a transfer count, i.e. if we transfer 32-bit
- * words, we can do 16380 bytes per descriptor.
- *
- * This parameter is also system-specific.
- */
-#define DWC_MAX_COUNT	4095U
-
-/*
  * Number of descriptors to allocate for each channel. This should be
  * made configurable somehow; preferably, the clients (at least the
  * ones using slave transfers) should be able to give us a hint.
@@ -669,7 +659,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 
 	for (offset = 0; offset < len; offset += xfer_count << src_width) {
 		xfer_count = min_t(size_t, (len - offset) >> src_width,
-				DWC_MAX_COUNT);
+					   dwc->block_size);
 
 		desc = dwc_desc_get(dwc);
 		if (!desc)
@@ -770,8 +760,8 @@ slave_sg_todev_fill_desc:
 			desc->lli.sar = mem;
 			desc->lli.dar = reg;
 			desc->lli.ctllo = ctllo | DWC_CTLL_SRC_WIDTH(mem_width);
-			if ((len >> mem_width) > DWC_MAX_COUNT) {
-				dlen = DWC_MAX_COUNT << mem_width;
+			if ((len >> mem_width) > dwc->block_size) {
+				dlen = dwc->block_size << mem_width;
 				mem += dlen;
 				len -= dlen;
 			} else {
@@ -830,8 +820,8 @@ slave_sg_fromdev_fill_desc:
 			desc->lli.sar = reg;
 			desc->lli.dar = mem;
 			desc->lli.ctllo = ctllo | DWC_CTLL_DST_WIDTH(mem_width);
-			if ((len >> reg_width) > DWC_MAX_COUNT) {
-				dlen = DWC_MAX_COUNT << reg_width;
+			if ((len >> reg_width) > dwc->block_size) {
+				dlen = dwc->block_size << reg_width;
 				mem += dlen;
 				len -= dlen;
 			} else {
@@ -1214,7 +1204,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 	periods = buf_len / period_len;
 
 	/* Check for too big/unaligned periods and unaligned DMA buffer. */
-	if (period_len > (DWC_MAX_COUNT << reg_width))
+	if (period_len > (dwc->block_size << reg_width))
 		goto out_err;
 	if (unlikely(period_len & ((1 << reg_width) - 1)))
 		goto out_err;
@@ -1380,6 +1370,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	bool			autocfg;
 	unsigned int		dw_params;
 	unsigned int		nr_channels;
+	unsigned int		max_blk_size;
 	int			irq;
 	int			err;
 	int			i;
@@ -1420,6 +1411,9 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 	dw->regs = regs;
 
+	/* get hardware configuration parameters */
+	max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+
 	/* Calculate all channel mask before DMA setup */
 	dw->all_chan_mask = (1 << nr_channels) - 1;
 
@@ -1465,6 +1459,14 @@ static int __devinit dw_probe(struct platform_device *pdev)
 		INIT_LIST_HEAD(&dwc->free_list);
 
 		channel_clear_bit(dw, CH_EN, dwc->mask);
+
+		/* hardware configuration */
+		if (autocfg) {
+			dwc->block_size =
+				(4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
+		} else {
+			dwc->block_size = pdata->block_size;
+		}
 	}
 
 	/* Clear all interrupts on all channels. */
drivers/dma/dw_dmac_regs.h +3 -0
index 0f96965..233f5e5 100644
@@ -186,6 +186,9 @@ struct dw_dma_chan {
 
 	unsigned int		descs_allocated;
 
+	/* hardware configuration */
+	unsigned short		block_size;
+
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
 };
include/linux/dw_dmac.h +2 -0
index 2412e02..3315ef9 100644
@@ -19,6 +19,7 @@
  * @nr_channels: Number of channels supported by hardware (max 8)
  * @is_private: The device channels should be marked as private and not for
  *	by the general purpose DMA channel allocator.
+ * @block_size: Maximum block size supported by the controller
  */
 struct dw_dma_platform_data {
 	unsigned int	nr_channels;
@@ -29,6 +30,7 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_ASCENDING		0	/* chan0 highest */
 #define CHAN_PRIORITY_DESCENDING	1	/* chan7 highest */
 	unsigned char	chan_priority;
+	unsigned short	block_size;
 };
 
 /* bursts size */
Signature · 1 line
1.7.10.4
#16 lore raw

Re: [PATCH 4/7] dw_dmac: autoconfigure block_size or use platform data

Quoted 9 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +1 -0
@@ -1380,6 +1370,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
        bool                    autocfg;
        unsigned int            dw_params;
        unsigned int            nr_channels;
+       unsigned int            max_blk_size;
        int                     irq;
        int                     err;
        int                     i;

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1416

Quoted 6 lines
drivers/dma/dw_dmac.c +3 -0
@@ -1420,6 +1411,9 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
        dw->regs = regs;
 
+       /* get hardware configuration parameters */
+       max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+

Do this only for autocfg case.

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1466

Quoted 12 lines
drivers/dma/dw_dmac.c +5 -0
        /* Calculate all channel mask before DMA setup */
        dw->all_chan_mask = (1 << nr_channels) - 1;
 
@@ -1465,6 +1459,14 @@ static int __devinit dw_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&dwc->free_list);
 
                channel_clear_bit(dw, CH_EN, dwc->mask);
+
+               /* hardware configuration */
+               if (autocfg) {
+                       dwc->block_size =
+                               (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;

Put a comment on what are you doing here.

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1469

Quoted 3 lines
drivers/dma/dw_dmac.c +3 -0
+               } else {
+                       dwc->block_size = pdata->block_size;
+               }

Don't need {} for single line statements.

Quoted 8 lines
drivers/dma/dw_dmac.c +0 -0
        }
 
        /* Clear all interrupts on all channels. */
drivers/dma/dw_dmac_regs.h +0 -0
index 0f96965..233f5e5 100644

drivers/dma/dw_dmac_regs.h struct dw_dma_chan { · line 191

Quoted 6 lines
drivers/dma/dw_dmac_regs.h +3 -0
@@ -186,6 +186,9 @@ struct dw_dma_chan {
 
        unsigned int            descs_allocated;
 
+       /* hardware configuration */
+       unsigned short          block_size;
+

You actually don't save any memory here with short and actually makes access to block_size more complex. keeping it int would be better i believe.

viresh

#17 lore raw

Re: [PATCH 4/7] dw_dmac: autoconfigure block_size or use platform data

On Tue, 2012-09-18 at 12:27 +0530, viresh kumar wrote:

[snip]

Quoted 9 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1416

Quoted 7 lines
drivers/dma/dw_dmac.c +3 -0
@@ -1420,6 +1411,9 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
        dw->regs = regs;
 
+       /* get hardware configuration parameters */
+       max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+

Do this only for autocfg case.

Ok.

Quoted 11 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1466

Quoted 9 lines
drivers/dma/dw_dmac.c +5 -0
@@ -1465,6 +1459,14 @@ static int __devinit dw_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&dwc->free_list);
 
                channel_clear_bit(dw, CH_EN, dwc->mask);
+
+               /* hardware configuration */
+               if (autocfg) {
+                       dwc->block_size =
+                               (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;

Put a comment on what are you doing here.

Ok.

Quoted 6 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1469

Quoted 4 lines
drivers/dma/dw_dmac.c +3 -0
+               } else {
+                       dwc->block_size = pdata->block_size;
+               }

Don't need {} for single line statements.

Ok. By the way it comes by next patch anyway.

Quoted 4 lines
Quoted 4 lines
drivers/dma/dw_dmac_regs.h +0 -0
@@ -186,6 +186,9 @@ struct dw_dma_chan {
 
Quoted 8 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_chan { · line 191

Quoted 5 lines
drivers/dma/dw_dmac_regs.h +3 -0
        unsigned int            descs_allocated;
 
+       /* hardware configuration */
+       unsigned short          block_size;
+

You actually don't save any memory here with short and actually makes access to block_size more complex. keeping it int would be better i believe.

I rather agree with you. I'll change it.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#18 lore raw

PATCH 5/7 dw_dmac: autoconfigure data_width or get it via platform data

In reply to Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data..

---
 arch/arm/mach-spear13xx/spear13xx.c |    2 ++
 arch/avr32/mach-at32ap/at32ap700x.c |    2 ++
 drivers/dma/dw_dmac.c               |   46 +++++++++++++++++++++++++++++++----
 drivers/dma/dw_dmac_regs.h          |   13 ++++++++++
 include/linux/dw_dmac.h             |    5 ++++
 5 files changed, 63 insertions(+), 5 deletions(-)
arch/arm/mach-spear13xx/spear13xx.c +2 -0
index c64d812..6a7dfe1 100644
@@ -79,6 +79,8 @@ struct dw_dma_platform_data dmac_plat_data = {
 	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 	.chan_priority = CHAN_PRIORITY_DESCENDING,
 	.block_size = 4095U,
+	.nr_masters = 2,
+	.data_width = { 3, 3, 0, 0 },
 };
 
 void __init spear13xx_l2x0_init(void)
arch/avr32/mach-at32ap/at32ap700x.c +2 -0
index 2c4aefe..b323d8d 100644
@@ -606,6 +606,8 @@ static void __init genclk_init_parent(struct clk *clk)
 static struct dw_dma_platform_data dw_dmac0_data = {
 	.nr_channels	= 3,
 	.block_size	= 4095U,
+	.nr_masters	= 2,
+	.data_width	= { 2, 2, 0, 0 },
 };
 
 static struct resource dw_dmac0_resource[] = {
drivers/dma/dw_dmac.c +41 -5

104 lines not on this page · raw message

drivers/dma/dw_dmac_regs.h +13 -0
index 233f5e5..9beaef0 100644
@@ -106,6 +106,12 @@ struct dw_dma_regs {
 
 /* Bitfields in DW_PARAMS */
 #define DW_PARAMS_NR_CHAN	8		/* number of channels */
+#define DW_PARAMS_NR_MASTER	11		/* number of AHB masters */
+#define DW_PARAMS_DATA_WIDTH(n)	(15 + 2 * (n))
+#define DW_PARAMS_DATA_WIDTH1	15		/* master 1 data width */
+#define DW_PARAMS_DATA_WIDTH2	17		/* master 2 data width */
+#define DW_PARAMS_DATA_WIDTH3	19		/* master 3 data width */
+#define DW_PARAMS_DATA_WIDTH4	21		/* master 4 data width */
 #define DW_PARAMS_EN		28		/* encoded parameters */
 
 /* Bitfields in CTL_LO */
@@ -191,6 +197,9 @@ struct dw_dma_chan {
 
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
+
+	/* backlink to dw_dma */
+	struct dw_dma		*dw;
 };
 
 static inline struct dw_dma_chan_regs __iomem *
@@ -217,6 +226,10 @@ struct dw_dma {
 
 	u8			all_chan_mask;
 
+	/* hardware configuration */
+	unsigned char		nr_masters;
+	unsigned char		data_width[4];
+
 	struct dw_dma_chan	chan[0];
 };
 
include/linux/dw_dmac.h +5 -0
index 3315ef9..e1c8c9e 100644
@@ -20,6 +20,9 @@
  * @is_private: The device channels should be marked as private and not for
  *	by the general purpose DMA channel allocator.
  * @block_size: Maximum block size supported by the controller
+ * @nr_masters: Number of AHB masters supported by the controller
+ * @data_width: Maximum data width supported by hardware per AHB master
+ *		(0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
  */
 struct dw_dma_platform_data {
 	unsigned int	nr_channels;
@@ -31,6 +34,8 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_DESCENDING	1	/* chan7 highest */
 	unsigned char	chan_priority;
 	unsigned short	block_size;
+	unsigned char	nr_masters;
+	unsigned char	data_width[4];
 };
 
 /* bursts size */
Signature · 1 line
1.7.10.4
#19 lore raw

Re: [PATCH 5/7] dw_dmac: autoconfigure data_width or get it via platform data

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 662

Quoted 8 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +3 -1
@@ -647,7 +657,11 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
                return NULL;
        }
 
-       src_width = dst_width = dwc_fast_fls(src | dest | len);
+       src_width = dst_width = min_t(unsigned int,
+                                     /* For memory-to-memory transfers we
+                                      * always use AHB master 1 */

Sorry couldn't understand your comment. :(
We use master 0 for src and master 1 for dst in memcpy.

Quoted 23 lines
drivers/dma/dw_dmac.c +5 -0
+                                     dwc->dw->data_width[0],
+                                     dwc_fast_fls(src | dest | len));
 
        ctllo = DWC_DEFAULT_CTLLO(chan)
                        | DWC_CTLL_DST_WIDTH(dst_width)
@@ -717,6 +731,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
        dma_addr_t              reg;
        unsigned int            reg_width;
        unsigned int            mem_width;
+       unsigned int            data_width;
        unsigned int            i;
        struct scatterlist      *sg;
        size_t                  total_len = 0;
@@ -740,6 +755,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                ctllo |= sconfig->device_fc ? DWC_CTLL_FC(DW_DMA_FC_P_M2P) :
                        DWC_CTLL_FC(DW_DMA_FC_D_M2P);
 
+               data_width = dwc->dw->data_width[dwc_get_sms(dws)];
+
                for_each_sg(sgl, sg, sg_len, i) {
                        struct dw_desc  *desc;
                        u32             len, dlen, mem;

drivers/dma/dw_dmac.c dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, · line 769

Quoted 7 lines
drivers/dma/dw_dmac.c +3 -1
@@ -747,7 +764,9 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
-                       mem_width = dwc_fast_fls(mem | len);
+                       mem_width = min_t(unsigned int,
+                                         data_width,
+                                         dwc_fast_fls(mem | len));

can above three be merged into a single line or two lines?

Quoted 13 lines
drivers/dma/dw_dmac.c +2 -0
 slave_sg_todev_fill_desc:
                        desc = dwc_desc_get(dwc);
@@ -800,6 +819,8 @@ slave_sg_todev_fill_desc:
                ctllo |= sconfig->device_fc ? DWC_CTLL_FC(DW_DMA_FC_P_P2M) :
                        DWC_CTLL_FC(DW_DMA_FC_D_P2M);
 
+               data_width = dwc->dw->data_width[dwc_get_dms(dws)];
+
                for_each_sg(sgl, sg, sg_len, i) {
                        struct dw_desc  *desc;
                        u32             len, dlen, mem;

drivers/dma/dw_dmac.c slave_sg_todev_fill_desc: · line 833

Quoted 7 lines
drivers/dma/dw_dmac.c +3 -1
@@ -807,7 +828,9 @@ slave_sg_todev_fill_desc:
                        mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
-                       mem_width = dwc_fast_fls(mem | len);
+                       mem_width = min_t(unsigned int,
+                                         data_width,
+                                         dwc_fast_fls(mem | len));

ditto

Quoted 8 lines
drivers/dma/dw_dmac.c +1 -0
 slave_sg_fromdev_fill_desc:
                        desc = dwc_desc_get(dwc);
@@ -1413,6 +1436,17 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
        /* get hardware configuration parameters */
        max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+       if (autocfg)

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1449

Quoted 10 lines
drivers/dma/dw_dmac.c +10 -0
+               dw->nr_masters = (dw_params >> DW_PARAMS_NR_MASTER & 3) + 1;
+       else
+               dw->nr_masters = pdata->nr_masters;
+       for (i = 0; i < dw->nr_masters; i++) {
+               if (autocfg)
+                       dw->data_width[i] =
+                               (dw_params >> DW_PARAMS_DATA_WIDTH(i) & 3) + 2;
+               else
+                       dw->data_width[i] = pdata->data_width[i];
+       }

There are many autocfg, if, else statements now in probe. Can you try to group these
into as minimum if, else calls?

Quoted 18 lines
drivers/dma/dw_dmac.c +2 -0
        /* Calculate all channel mask before DMA setup */
        dw->all_chan_mask = (1 << nr_channels) - 1;
@@ -1460,6 +1494,8 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
                channel_clear_bit(dw, CH_EN, dwc->mask);
 
+               dwc->dw = dw;
+
                /* hardware configuration */
                if (autocfg) {
                        dwc->block_size =
drivers/dma/dw_dmac_regs.h +0 -0
index 233f5e5..9beaef0 100644
@@ -106,6 +106,12 @@ struct dw_dma_regs {
 

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 116

Quoted 10 lines
drivers/dma/dw_dmac_regs.h +6 -0
 /* Bitfields in DW_PARAMS */
 #define DW_PARAMS_NR_CHAN      8               /* number of channels */
+#define DW_PARAMS_NR_MASTER    11              /* number of AHB masters */
+#define DW_PARAMS_DATA_WIDTH(n)        (15 + 2 * (n))
+#define DW_PARAMS_DATA_WIDTH1  15              /* master 1 data width */
+#define DW_PARAMS_DATA_WIDTH2  17              /* master 2 data width */
+#define DW_PARAMS_DATA_WIDTH3  19              /* master 3 data width */
+#define DW_PARAMS_DATA_WIDTH4  21              /* master 4 data width */
 #define DW_PARAMS_EN           28              /* encoded parameters */
 

Do these changes in a single patch 2/7

viresh

#20 lore raw

Re: [PATCH 5/7] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 6 lines · viresh kumar
Quoted 4 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +0 -0
@@ -647,7 +657,11 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
                return NULL;
        }
 
Quoted 7 lines

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 662

Quoted 4 lines
drivers/dma/dw_dmac.c +3 -1
-       src_width = dst_width = dwc_fast_fls(src | dest | len);
+       src_width = dst_width = min_t(unsigned int,
+                                     /* For memory-to-memory transfers we
+                                      * always use AHB master 1 */

Sorry couldn't understand your comment. :(
We use master 0 for src and master 1 for dst in memcpy.

Yeah, it might require to rewrite the logic a bit to depend on proper AHB master properties.

I will fix it.

Quoted 10 lines

drivers/dma/dw_dmac.c dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, · line 769

Quoted 8 lines
drivers/dma/dw_dmac.c +3 -1
@@ -747,7 +764,9 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
-                       mem_width = dwc_fast_fls(mem | len);
+                       mem_width = min_t(unsigned int,
+                                         data_width,
+                                         dwc_fast_fls(mem | len));

can above three be merged into a single line or two lines?

I think so, if there no objections from checkpatch.pl side.

Quoted 10 lines

drivers/dma/dw_dmac.c slave_sg_todev_fill_desc: · line 833

Quoted 8 lines
drivers/dma/dw_dmac.c +3 -1
@@ -807,7 +828,9 @@ slave_sg_todev_fill_desc:
                        mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
-                       mem_width = dwc_fast_fls(mem | len);
+                       mem_width = min_t(unsigned int,
+                                         data_width,
+                                         dwc_fast_fls(mem | len));

ditto

See above.

Quoted 11 lines
Quoted 11 lines
drivers/dma/dw_dmac.c +7 -0
@@ -1413,6 +1436,17 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
        /* get hardware configuration parameters */
        max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+       if (autocfg)
+               dw->nr_masters = (dw_params >> DW_PARAMS_NR_MASTER & 3) + 1;
+       else
+               dw->nr_masters = pdata->nr_masters;
+       for (i = 0; i < dw->nr_masters; i++) {
+               if (autocfg)
+                       dw->data_width[i] =
Quoted 8 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1449

Quoted 4 lines
drivers/dma/dw_dmac.c +4 -0
+                               (dw_params >> DW_PARAMS_DATA_WIDTH(i) & 3) + 2;
+               else
+                       dw->data_width[i] = pdata->data_width[i];
+       }

There are many autocfg, if, else statements now in probe. Can you try to group these
into as minimum if, else calls?

Ok, will try to optimize it.

Quoted 4 lines
Quoted 4 lines
drivers/dma/dw_dmac_regs.h +0 -0
@@ -106,6 +106,12 @@ struct dw_dma_regs {
 
Quoted 12 lines

drivers/dma/dw_dmac_regs.h struct dw_dma_regs { · line 115

Quoted 9 lines
drivers/dma/dw_dmac_regs.h +6 -0
 /* Bitfields in DW_PARAMS */
 #define DW_PARAMS_NR_CHAN      8               /* number of channels */
+#define DW_PARAMS_NR_MASTER    11              /* number of AHB masters */
+#define DW_PARAMS_DATA_WIDTH(n)        (15 + 2 * (n))
+#define DW_PARAMS_DATA_WIDTH1  15              /* master 1 data width */
+#define DW_PARAMS_DATA_WIDTH2  17              /* master 2 data width */
+#define DW_PARAMS_DATA_WIDTH3  19              /* master 3 data width */
+#define DW_PARAMS_DATA_WIDTH4  21              /* master 4 data width */
 #define DW_PARAMS_EN           28              /* encoded parameters */

Do these changes in a single patch 2/7
From this comment I guess you would like to have dw_dmac_regs.h changes

at one place. Am I right?

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#21 lore raw

Re: [PATCH 5/7] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 3 lines · Andy Shevchenko
Quoted 1 line

Do these changes in a single patch 2/7

From this comment I guess you would like to have dw_dmac_regs.h changes at one place. Am I right?

yes.

#22 lore raw

Re: [PATCH 5/7] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 7 lines · viresh kumar
Quoted 3 lines · Andy Shevchenko
Quoted 1 line

Do these changes in a single patch 2/7

From this comment I guess you would like to have dw_dmac_regs.h changes at one place. Am I right?

yes.

Okay, will do.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#23 lore raw

PATCH 6/7 dw_dmac: check if controller supports LLP

In reply to Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a check and refuses to deal with such devices.

---
 drivers/dma/dw_dmac.c      |   35 ++++++++++++++++++++++++++++++++++-
 drivers/dma/dw_dmac_regs.h |    4 ++++
 2 files changed, 38 insertions(+), 1 deletion(-)
drivers/dma/dw_dmac.c +34 -1
index fdb7d5a..00958ad 100644
@@ -647,6 +647,12 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 	unsigned int		dst_width;
 	u32			ctllo;
 
+	if (dwc->nollp) {
+		dev_dbg(chan2dev(&dwc->chan),
+				"channel doesn't support LLP transfers\n");
+		return NULL;
+	}
+
 	dev_vdbg(chan2dev(chan),
 			"%s: d0x%llx s0x%llx l0x%zx f0x%lx\n", __func__,
 			(unsigned long long)dest, (unsigned long long)src,
@@ -741,6 +747,12 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 	if (unlikely(!dws || !sg_len))
 		return NULL;
 
+	if (dwc->nollp) {
+		dev_dbg(chan2dev(&dwc->chan),
+				"channel doesn't support LLP transfers\n");
+		return NULL;
+	}
+
 	prev = first = NULL;
 
 	switch (direction) {
@@ -1202,6 +1214,13 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 	unsigned long			flags;
 
 	spin_lock_irqsave(&dwc->lock, flags);
+	if (dwc->nollp) {
+		spin_unlock_irqrestore(&dwc->lock, flags);
+		dev_dbg(chan2dev(&dwc->chan),
+				"channel doesn't support LLP transfers\n");
+		return ERR_PTR(-EINVAL);
+	}
+
 	if (!list_empty(&dwc->queue) || !list_empty(&dwc->active_list)) {
 		spin_unlock_irqrestore(&dwc->lock, flags);
 		dev_dbg(chan2dev(&dwc->chan),
@@ -1469,6 +1488,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&dw->dma.channels);
 	for (i = 0; i < nr_channels; i++) {
 		struct dw_dma_chan	*dwc = &dw->chan[i];
+		int			r = nr_channels - i - 1;
 
 		dwc->chan.device = &dw->dma;
 		dma_cookie_init(&dwc->chan);
@@ -1480,7 +1500,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 		/* 7 is highest priority & 0 is lowest. */
 		if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-			dwc->priority = nr_channels - i - 1;
+			dwc->priority = r;
 		else
 			dwc->priority = i;
 
@@ -1498,10 +1518,23 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 		/* hardware configuration */
 		if (autocfg) {
+			unsigned int dwc_params;
+
+			dwc_params = dma_raw_readl(regs + r * sizeof(u32),
+						   DWC_PARAMS);
+
 			dwc->block_size =
 				(4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
+			dwc->nollp =
+				(dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) == 0;
 		} else {
 			dwc->block_size = pdata->block_size;
+
+			/* Check if channel supports multi block transfer */
+			channel_writel(dwc, LLP, 0xfffffffc);
+			dwc->nollp =
+				(channel_readl(dwc, LLP) & 0xfffffffc) == 0;
+			channel_writel(dwc, LLP, 0);
 		}
 	}
 
drivers/dma/dw_dmac_regs.h +4 -0
index 9beaef0..b66a716 100644
@@ -114,6 +114,9 @@ struct dw_dma_regs {
 #define DW_PARAMS_DATA_WIDTH4	21		/* master 4 data width */
 #define DW_PARAMS_EN		28		/* encoded parameters */
 
+/* Bitfields in DWC_PARAMS */
+#define DWC_PARAMS_MBLK_EN	11		/* multi block transfer */
+
 /* Bitfields in CTL_LO */
 #define DWC_CTLL_INT_EN		(1 << 0)	/* irqs enabled? */
 #define DWC_CTLL_DST_WIDTH(n)	((n)<<1)	/* bytes per element */
@@ -194,6 +197,7 @@ struct dw_dma_chan {
 
 	/* hardware configuration */
 	unsigned short		block_size;
+	bool			nollp;
 
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
Signature · 1 line
1.7.10.4
#24 lore raw

Re: [PATCH 6/7] dw_dmac: check if controller supports LLP

Quoted 15 lines · Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a check and refuses to deal with such devices.

---
 drivers/dma/dw_dmac.c      |   35 ++++++++++++++++++++++++++++++++++-
 drivers/dma/dw_dmac_regs.h |    4 ++++
 2 files changed, 38 insertions(+), 1 deletion(-)
drivers/dma/dw_dmac.c +0 -0
index fdb7d5a..00958ad 100644

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 654

Quoted 8 lines
drivers/dma/dw_dmac.c +5 -0
@@ -647,6 +647,12 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        unsigned int            dst_width;
        u32                     ctllo;
 
+       if (dwc->nollp) {
+               dev_dbg(chan2dev(&dwc->chan),
+                               "channel doesn't support LLP transfers\n");
+               return NULL;
+       }

But this could have been a single block request. Isn't it?

--
viresh

#25 lore raw

Re: [PATCH 6/7] dw_dmac: check if controller supports LLP

Quoted 20 lines · viresh kumar
Quoted 18 lines · Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a check and refuses to deal with such devices.

---
 drivers/dma/dw_dmac.c      |   35 ++++++++++++++++++++++++++++++++++-
 drivers/dma/dw_dmac_regs.h |    4 ++++
 2 files changed, 38 insertions(+), 1 deletion(-)
drivers/dma/dw_dmac.c +0 -0
index fdb7d5a..00958ad 100644
@@ -647,6 +647,12 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        unsigned int            dst_width;
        u32                     ctllo;
 
Quoted 7 lines

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 654

Quoted 5 lines
drivers/dma/dw_dmac.c +5 -0
+       if (dwc->nollp) {
+               dev_dbg(chan2dev(&dwc->chan),
+                               "channel doesn't support LLP transfers\n");
+               return NULL;
+       }

But this could have been a single block request. Isn't it?

I think we could discard this comment in regard to comments on next patch.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#26 lore raw

PATCH 7/7 dw_dmac: introduce software emulation of LLP transfers

In reply to Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a support of such controllers. In case of memory copy or scatter-gather lists it emulates LLP transfers via bunch of the regular single block ones.

---
 drivers/dma/dw_dmac.c      |   83 +++++++++++++++++++++++++++++++++++++-------
 drivers/dma/dw_dmac_regs.h |    5 +++
 2 files changed, 75 insertions(+), 13 deletions(-)
drivers/dma/dw_dmac.c +70 -13
index 00958ad..fa23711 100644
@@ -229,10 +229,29 @@ static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /*----------------------------------------------------------------------*/
 
+/* Perform single block transfer */
+static inline void dwc_do_single_block(struct dw_dma_chan *dwc,
+				       struct dw_desc *desc)
+{
+	struct dw_dma	*dw = to_dw_dma(dwc->chan.device);
+	u32		ctllo;
+
+	/* Software emulation of LLP mode relies on interrupts to continue
+	 * multi block transfer. */
+	ctllo = desc->lli.ctllo | DWC_CTLL_INT_EN;
+
+	channel_writel(dwc, SAR, desc->lli.sar);
+	channel_writel(dwc, DAR, desc->lli.dar);
+	channel_writel(dwc, CTL_LO, ctllo);
+	channel_writel(dwc, CTL_HI, desc->lli.ctlhi);
+	channel_set_bit(dw, CH_EN, dwc->mask);
+}
+
 /* Called with dwc->lock held and bh disabled */
 static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
 {
 	struct dw_dma	*dw = to_dw_dma(dwc->chan.device);
+	unsigned long	was_soft_llp;
 
 	/* ASSERT:  channel is idle */
 	if (dma_readl(dw, CH_EN) & dwc->mask) {
@@ -244,6 +263,26 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
 		return;
 	}
 
+	if (dwc->nollp) {
+		was_soft_llp = test_and_set_bit(DW_DMA_IS_SOFT_LLP,
+						&dwc->flags);
+		if (was_soft_llp) {
+			dev_err(chan2dev(&dwc->chan),
+				"BUG: Attempted to start new LLP transfer "
+				"inside ongoing one\n");
+			return;
+		}
+
+		dwc_initialize(dwc);
+
+		dwc->tx_list = &first->tx_list;
+		dwc->tx_node_active = first->tx_list.next;
+
+		dwc_do_single_block(dwc, first);
+
+		return;
+	}
+
 	dwc_initialize(dwc);
 
 	channel_writel(dwc, LLP, first->txd.phys);
@@ -555,8 +594,36 @@ static void dw_dma_tasklet(unsigned long data)
 			dwc_handle_cyclic(dw, dwc, status_err, status_xfer);
 		else if (status_err & (1 << i))
 			dwc_handle_error(dw, dwc);
-		else if (status_xfer & (1 << i))
+		else if (status_xfer & (1 << i)) {
+			unsigned long flags;
+
+			spin_lock_irqsave(&dwc->lock, flags);
+			if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) {
+				if (dwc->tx_node_active != dwc->tx_list) {
+					struct dw_desc *desc =
+						list_entry(dwc->tx_node_active,
+							   struct dw_desc,
+							   desc_node);
+
+					dma_writel(dw, CLEAR.XFER, dwc->mask);
+
+					/* move pointer to next descriptor */
+					dwc->tx_node_active =
+						dwc->tx_node_active->next;
+
+					dwc_do_single_block(dwc, desc);
+
+					spin_unlock_irqrestore(&dwc->lock, flags);
+					continue;
+				} else {
+					/* we are done here */
+					clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
+				}
+			}
+			spin_unlock_irqrestore(&dwc->lock, flags);
+
 			dwc_scan_descriptors(dw, dwc);
+		}
 	}
 
 	/*
@@ -647,12 +714,6 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 	unsigned int		dst_width;
 	u32			ctllo;
 
-	if (dwc->nollp) {
-		dev_dbg(chan2dev(&dwc->chan),
-				"channel doesn't support LLP transfers\n");
-		return NULL;
-	}
-
 	dev_vdbg(chan2dev(chan),
 			"%s: d0x%llx s0x%llx l0x%zx f0x%lx\n", __func__,
 			(unsigned long long)dest, (unsigned long long)src,
@@ -747,12 +808,6 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 	if (unlikely(!dws || !sg_len))
 		return NULL;
 
-	if (dwc->nollp) {
-		dev_dbg(chan2dev(&dwc->chan),
-				"channel doesn't support LLP transfers\n");
-		return NULL;
-	}
-
 	prev = first = NULL;
 
 	switch (direction) {
@@ -972,6 +1027,8 @@ static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	} else if (cmd == DMA_TERMINATE_ALL) {
 		spin_lock_irqsave(&dwc->lock, flags);
 
+		clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
+
 		dwc_chan_disable(dw, dwc);
 
 		dwc->paused = false;
drivers/dma/dw_dmac_regs.h +5 -0
index b66a716..297ab18 100644
@@ -174,6 +174,7 @@ struct dw_dma_regs {
 
 enum dw_dmac_flags {
 	DW_DMA_IS_CYCLIC = 0,
+	DW_DMA_IS_SOFT_LLP = 1,
 };
 
 struct dw_dma_chan {
@@ -184,6 +185,10 @@ struct dw_dma_chan {
 	bool			paused;
 	bool			initialized;
 
+	/* software emulation of the LLP transfers */
+	struct list_head	*tx_list;
+	struct list_head	*tx_node_active;
+
 	spinlock_t		lock;
 
 	/* these other elements are all protected by lock */
Signature · 1 line
1.7.10.4
#27 lore raw

Re: [PATCH 7/7] dw_dmac: introduce software emulation of LLP transfers

Quoted 66 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +39 -1
index 00958ad..fa23711 100644
@@ -229,10 +229,29 @@ static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /*----------------------------------------------------------------------*/
 
+/* Perform single block transfer */
+static inline void dwc_do_single_block(struct dw_dma_chan *dwc,
+                                      struct dw_desc *desc)
+{
+       struct dw_dma   *dw = to_dw_dma(dwc->chan.device);
+       u32             ctllo;
+
+       /* Software emulation of LLP mode relies on interrupts to continue
+        * multi block transfer. */
+       ctllo = desc->lli.ctllo | DWC_CTLL_INT_EN;
+
+       channel_writel(dwc, SAR, desc->lli.sar);
+       channel_writel(dwc, DAR, desc->lli.dar);
+       channel_writel(dwc, CTL_LO, ctllo);
+       channel_writel(dwc, CTL_HI, desc->lli.ctlhi);
+       channel_set_bit(dw, CH_EN, dwc->mask);
+}
+
 /* Called with dwc->lock held and bh disabled */
 static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
 {
        struct dw_dma   *dw = to_dw_dma(dwc->chan.device);
+       unsigned long   was_soft_llp;
 
        /* ASSERT:  channel is idle */
        if (dma_readl(dw, CH_EN) & dwc->mask) {
@@ -244,6 +263,26 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
                return;
        }
 
+       if (dwc->nollp) {
+               was_soft_llp = test_and_set_bit(DW_DMA_IS_SOFT_LLP,
+                                               &dwc->flags);
+               if (was_soft_llp) {
+                       dev_err(chan2dev(&dwc->chan),
+                               "BUG: Attempted to start new LLP transfer "
+                               "inside ongoing one\n");
+                       return;
+               }
+
+               dwc_initialize(dwc);
+
+               dwc->tx_list = &first->tx_list;
+               dwc->tx_node_active = first->tx_list.next;
+
+               dwc_do_single_block(dwc, first);
+
+               return;
+       }
+
        dwc_initialize(dwc);
 
        channel_writel(dwc, LLP, first->txd.phys);
@@ -555,8 +594,36 @@ static void dw_dma_tasklet(unsigned long data)
                        dwc_handle_cyclic(dw, dwc, status_err, status_xfer);
                else if (status_err & (1 << i))
                        dwc_handle_error(dw, dwc);
-               else if (status_xfer & (1 << i))

drivers/dma/dw_dmac.c static void dw_dma_tasklet(unsigned long data) · line 606

Quoted 10 lines
drivers/dma/dw_dmac.c +10 -0
+               else if (status_xfer & (1 << i)) {
+                       unsigned long flags;
+
+                       spin_lock_irqsave(&dwc->lock, flags);
+                       if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) {
+                               if (dwc->tx_node_active != dwc->tx_list) {
+                                       struct dw_desc *desc =
+                                               list_entry(dwc->tx_node_active,
+                                                          struct dw_desc,
+                                                          desc_node);

can come in single line.

Quoted 24 lines
drivers/dma/dw_dmac.c +19 -0
+
+                                       dma_writel(dw, CLEAR.XFER, dwc->mask);
+
+                                       /* move pointer to next descriptor */
+                                       dwc->tx_node_active =
+                                               dwc->tx_node_active->next;
+
+                                       dwc_do_single_block(dwc, desc);
+
+                                       spin_unlock_irqrestore(&dwc->lock, flags);
+                                       continue;
+                               } else {
+                                       /* we are done here */
+                                       clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
+                               }
+                       }
+                       spin_unlock_irqrestore(&dwc->lock, flags);
+
                        dwc_scan_descriptors(dw, dwc);
+               }
        }
 
        /*

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 655

Quoted 9 lines
drivers/dma/dw_dmac.c +0 -6
@@ -647,12 +714,6 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        unsigned int            dst_width;
        u32                     ctllo;
 
-       if (dwc->nollp) {
-               dev_dbg(chan2dev(&dwc->chan),
-                               "channel doesn't support LLP transfers\n");
-               return NULL;
-       }
-

:)
You should actually merge 6/7 with 7/7... You can't revert something in the same patchset.

viresh

#28 lore raw

Re: [PATCH 7/7] dw_dmac: introduce software emulation of LLP transfers

Quoted 11 lines · viresh kumar
Quoted 9 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +4 -1
@@ -555,8 +594,36 @@ static void dw_dma_tasklet(unsigned long data)
                        dwc_handle_cyclic(dw, dwc, status_err, status_xfer);
                else if (status_err & (1 << i))
                        dwc_handle_error(dw, dwc);
-               else if (status_xfer & (1 << i))
+               else if (status_xfer & (1 << i)) {
+                       unsigned long flags;
+
+                       spin_lock_irqsave(&dwc->lock, flags);
Quoted 8 lines

drivers/dma/dw_dmac.c static void dw_dma_tasklet(unsigned long data) · line 606

Quoted 6 lines
drivers/dma/dw_dmac.c +6 -0
+                       if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) {
+                               if (dwc->tx_node_active != dwc->tx_list) {
+                                       struct dw_desc *desc =
+                                               list_entry(dwc->tx_node_active,
+                                                          struct dw_desc,
+                                                          desc_node);

can come in single line.

Depends on checkpatch.pl. Anyway I'll try to squeeze it.

Quoted 4 lines
Quoted 4 lines
drivers/dma/dw_dmac.c +0 -0
@@ -647,12 +714,6 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        unsigned int            dst_width;
        u32                     ctllo;
 
Quoted 10 lines

drivers/dma/dw_dmac.c dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, · line 655

Quoted 6 lines
drivers/dma/dw_dmac.c +0 -6
-       if (dwc->nollp) {
-               dev_dbg(chan2dev(&dwc->chan),
-                               "channel doesn't support LLP transfers\n");
-               return NULL;
-       }
-

:)
You should actually merge 6/7 with 7/7... You can't revert something in the same patchset.

Ok. It was done just in regard to have a bisectability working.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#29 lore raw
In reply to Andy Shevchenko
Quoted 20 lines · Andy Shevchenko

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Comments are welcome.

Andy Shevchenko (7):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: check if controller supports LLP
dw_dmac: introduce software emulation of LLP transfers

Quoted 6 lines
 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  207 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   48 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)

Thanks a lot Andy,

I will soon test these patches on my avr32 platform and make a separate patch for the 'configurable' endianness. I'm sure this can also be detected automatically but at the cost of performance

Hein

Tested-by on the v1 series
#30 lore raw
In reply to Andy Shevchenko
Quoted 20 lines · Andy Shevchenko

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Comments are welcome.

Andy Shevchenko (7):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: check if controller supports LLP
dw_dmac: introduce software emulation of LLP transfers

Quoted 6 lines
 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  207 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   48 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)

Andy,

The (embedded) dw dma on the AP7000 indeed does not support auto configuration (the register reads as zero) and so it needs the platform data.

I tested the driver on AVR32 with the atmel-mci driver and it all worked well.

I also tested the new software emulation of LLP mode by setting nollp for each channel to true. That also worked as expected.

#31 lore raw
Quoted 4 lines · Hein Tibosch

The (embedded) dw dma on the AP7000 indeed does not support auto configuration (the register reads as zero) and so it needs the platform data.

Quoted 8 lines

I tested the driver on AVR32 with the atmel-mci driver and it all worked well.

I also tested the new software emulation of LLP mode by setting nollp for each channel to true. That also worked as expected.

Great. :)

#32 lore raw
In reply to Hein Tibosch
Quoted 27 lines · Hein Tibosch
Quoted 20 lines · Andy Shevchenko

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Comments are welcome.

Andy Shevchenko (7):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: check if controller supports LLP
dw_dmac: introduce software emulation of LLP transfers

Quoted 6 lines
 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  207 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   48 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)
Quoted 4 lines

Andy,

The (embedded) dw dma on the AP7000 indeed does not support auto configuration (the register reads as zero)

Nice to have the test report. I have no devices around without auto configuration block.

Quoted 7 lines

and so it needs the platform data.

I tested the driver on AVR32 with the atmel-mci driver and it all worked well.

I also tested the new software emulation of LLP mode by setting nollp for each channel to true. That also worked as expected.

Thanks!

Quoted 1 line
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#33 lore raw

v2 cover dw_dmac: introduce autoconfiguration

In reply to Andy Shevchenko

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Since v1:
- addressed all Viresh's comments.

Andy Shevchenko (6):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: introduce software emulation of LLP transfers

 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  209 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   46 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)
Signature · 1 line
1.7.10.4
#34 lore raw

PATCH v2 1/6 dw_dmac: mark dwc_dump_chan_regs as inline

---
 drivers/dma/dw_dmac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dw_dmac.c +1 -1
index 8db1ab2..2272f79 100644
@@ -213,7 +213,7 @@ static inline unsigned int dwc_fast_fls(unsigned long long v)
 	return 0;
 }
 
-static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
+static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
 {
 	dev_err(chan2dev(&dwc->chan),
 		"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",
Signature · 1 line
1.7.10.4
#35 lore raw

PATCH v2 2/6 dw_dmac: fill optional encoded parameters in register structure

In reply to Andy Shevchenko

There is a block of the registers that are optional. However, if enabled they contain useful information about the controller hardware configuration. We will use this piece of data to autoconfigure the driver.

---
 drivers/dma/dw_dmac_regs.h |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
drivers/dma/dw_dmac_regs.h +30 -0
index f6d92d7..8a3a81a 100644
@@ -82,9 +82,39 @@ struct dw_dma_regs {
 	DW_REG(ID);
 	DW_REG(TEST);
 
+	/* reserved */
+	DW_REG(__reserved0);
+	DW_REG(__reserved1);
+
 	/* optional encoded params, 0x3c8..0x3f7 */
+	u32	__reserved;
+
+	/* per-channel configuration registers */
+	u32	DWC_PARAMS[DW_DMA_MAX_NR_CHANNELS];
+	u32	MULTI_BLK_TYPE;
+	u32	MAX_BLK_SIZE;
+
+	/* top-level parameters */
+	u32	DW_PARAMS;
 };
 
+/* To access the registers in early stage of probe */
+#define dma_read_byaddr(addr, name) \
+	readl((addr) + offsetof(struct dw_dma_regs, name))
+
+/* Bitfields in DW_PARAMS */
+#define DW_PARAMS_NR_CHAN	8		/* number of channels */
+#define DW_PARAMS_NR_MASTER	11		/* number of AHB masters */
+#define DW_PARAMS_DATA_WIDTH(n)	(15 + 2 * (n))
+#define DW_PARAMS_DATA_WIDTH1	15		/* master 1 data width */
+#define DW_PARAMS_DATA_WIDTH2	17		/* master 2 data width */
+#define DW_PARAMS_DATA_WIDTH3	19		/* master 3 data width */
+#define DW_PARAMS_DATA_WIDTH4	21		/* master 4 data width */
+#define DW_PARAMS_EN		28		/* encoded parameters */
+
+/* Bitfields in DWC_PARAMS */
+#define DWC_PARAMS_MBLK_EN	11		/* multi block transfer */
+
 /* Bitfields in CTL_LO */
 #define DWC_CTLL_INT_EN		(1 << 0)	/* irqs enabled? */
 #define DWC_CTLL_DST_WIDTH(n)	((n)<<1)	/* bytes per element */
Signature · 1 line
1.7.10.4
Acked-by on v2 2/6
#36 lore raw

Re: [PATCHv2 2/6] dw_dmac: fill optional encoded parameters in register structure

Quoted 3 lines · Andy Shevchenko

There is a block of the registers that are optional. However, if enabled they contain useful information about the controller hardware configuration. We will use this piece of data to autoconfigure the driver.

#37 lore raw

PATCH v2 3/6 dw_dmac: get number of channels from hardware if possible

In reply to Andy Shevchenko

In case the controller has the encoded parameters feature enabled the driver will use it to get the number of channels. In the future it will be used for the other important parameters as well.

---
 drivers/dma/dw_dmac.c |   33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/dma/dw_dmac.c +23 -10
index 2272f79..c964f6e 100644
@@ -1381,6 +1381,10 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	struct resource		*io;
 	struct dw_dma		*dw;
 	size_t			size;
+	void __iomem		*regs;
+	bool			autocfg;
+	unsigned int		dw_params;
+	unsigned int		nr_channels;
 	int			irq;
 	int			err;
 	int			i;
@@ -1397,23 +1401,32 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	if (irq < 0)
 		return irq;
 
-	size = sizeof(struct dw_dma);
-	size += pdata->nr_channels * sizeof(struct dw_dma_chan);
+	regs = devm_request_and_ioremap(&pdev->dev, io);
+	if (!regs)
+		return -EBUSY;
+
+	dw_params = dma_read_byaddr(regs, DW_PARAMS);
+	autocfg = dw_params >> DW_PARAMS_EN & 0x1;
+
+	if (autocfg)
+		nr_channels = (dw_params >> DW_PARAMS_NR_CHAN & 0x7) + 1;
+	else
+		nr_channels = pdata->nr_channels;
+
+	size = sizeof(struct dw_dma) + nr_channels * sizeof(struct dw_dma_chan);
 	dw = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
 	if (!dw)
 		return -ENOMEM;
 
-	dw->regs = devm_request_and_ioremap(&pdev->dev, io);
-	if (!dw->regs)
-		return -EBUSY;
-
 	dw->clk = devm_clk_get(&pdev->dev, "hclk");
 	if (IS_ERR(dw->clk))
 		return PTR_ERR(dw->clk);
 	clk_prepare_enable(dw->clk);
 
+	dw->regs = regs;
+
 	/* Calculate all channel mask before DMA setup */
-	dw->all_chan_mask = (1 << pdata->nr_channels) - 1;
+	dw->all_chan_mask = (1 << nr_channels) - 1;
 
 	/* force dma off, just in case */
 	dw_dma_off(dw);
@@ -1431,7 +1444,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);
 
 	INIT_LIST_HEAD(&dw->dma.channels);
-	for (i = 0; i < pdata->nr_channels; i++) {
+	for (i = 0; i < nr_channels; i++) {
 		struct dw_dma_chan	*dwc = &dw->chan[i];
 
 		dwc->chan.device = &dw->dma;
@@ -1444,7 +1457,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 		/* 7 is highest priority & 0 is lowest. */
 		if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-			dwc->priority = pdata->nr_channels - i - 1;
+			dwc->priority = nr_channels - i - 1;
 		else
 			dwc->priority = i;
 
@@ -1485,7 +1498,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	dma_writel(dw, CFG, DW_CFG_DMA_EN);
 
 	printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n",
-			dev_name(&pdev->dev), pdata->nr_channels);
+			dev_name(&pdev->dev), nr_channels);
 
 	dma_async_device_register(&dw->dma);
 
Signature · 1 line
1.7.10.4
Acked-by on v2 3/6
#38 lore raw

Re: [PATCHv2 3/6] dw_dmac: get number of channels from hardware if possible

Quoted 3 lines · Andy Shevchenko

In case the controller has the encoded parameters feature enabled the driver will use it to get the number of channels. In the future it will be used for the other important parameters as well.

#39 lore raw

PATCH v2 4/6 dw_dmac: autoconfigure block_size or use platform data

In reply to Andy Shevchenko

The maximum block size is a configurable parameter for the chip. So, driver will try to get it from the encoded component parameters. Otherwise it will come from the platform data.

---
 arch/arm/mach-spear13xx/spear13xx.c |    1 +
 arch/avr32/mach-at32ap/at32ap700x.c |    1 +
 drivers/dma/dw_dmac.c               |   37 ++++++++++++++++++++---------------
 drivers/dma/dw_dmac_regs.h          |    3 +++
 include/linux/dw_dmac.h             |    2 ++
 5 files changed, 28 insertions(+), 16 deletions(-)
arch/arm/mach-spear13xx/spear13xx.c +1 -0
index e106488..9491137 100644
@@ -78,6 +78,7 @@ struct dw_dma_platform_data dmac_plat_data = {
 	.nr_channels = 8,
 	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 	.chan_priority = CHAN_PRIORITY_DESCENDING,
+	.block_size = 4095U,
 };
 
 void __init spear13xx_l2x0_init(void)
arch/avr32/mach-at32ap/at32ap700x.c +1 -0
index 0445c4f..2c4aefe 100644
@@ -605,6 +605,7 @@ static void __init genclk_init_parent(struct clk *clk)
 
 static struct dw_dma_platform_data dw_dmac0_data = {
 	.nr_channels	= 3,
+	.block_size	= 4095U,
 };
 
 static struct resource dw_dmac0_resource[] = {
drivers/dma/dw_dmac.c +21 -16
index c964f6e..4af9fad 100644
@@ -58,16 +58,6 @@
 	})
 
 /*
- * This is configuration-dependent and usually a funny size like 4095.
- *
- * Note that this is a transfer count, i.e. if we transfer 32-bit
- * words, we can do 16380 bytes per descriptor.
- *
- * This parameter is also system-specific.
- */
-#define DWC_MAX_COUNT	4095U
-
-/*
  * Number of descriptors to allocate for each channel. This should be
  * made configurable somehow; preferably, the clients (at least the
  * ones using slave transfers) should be able to give us a hint.
@@ -674,7 +664,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 
 	for (offset = 0; offset < len; offset += xfer_count << src_width) {
 		xfer_count = min_t(size_t, (len - offset) >> src_width,
-				DWC_MAX_COUNT);
+					   dwc->block_size);
 
 		desc = dwc_desc_get(dwc);
 		if (!desc)
@@ -775,8 +765,8 @@ slave_sg_todev_fill_desc:
 			desc->lli.sar = mem;
 			desc->lli.dar = reg;
 			desc->lli.ctllo = ctllo | DWC_CTLL_SRC_WIDTH(mem_width);
-			if ((len >> mem_width) > DWC_MAX_COUNT) {
-				dlen = DWC_MAX_COUNT << mem_width;
+			if ((len >> mem_width) > dwc->block_size) {
+				dlen = dwc->block_size << mem_width;
 				mem += dlen;
 				len -= dlen;
 			} else {
@@ -835,8 +825,8 @@ slave_sg_fromdev_fill_desc:
 			desc->lli.sar = reg;
 			desc->lli.dar = mem;
 			desc->lli.ctllo = ctllo | DWC_CTLL_DST_WIDTH(mem_width);
-			if ((len >> reg_width) > DWC_MAX_COUNT) {
-				dlen = DWC_MAX_COUNT << reg_width;
+			if ((len >> reg_width) > dwc->block_size) {
+				dlen = dwc->block_size << reg_width;
 				mem += dlen;
 				len -= dlen;
 			} else {
@@ -1219,7 +1209,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 	periods = buf_len / period_len;
 
 	/* Check for too big/unaligned periods and unaligned DMA buffer. */
-	if (period_len > (DWC_MAX_COUNT << reg_width))
+	if (period_len > (dwc->block_size << reg_width))
 		goto out_err;
 	if (unlikely(period_len & ((1 << reg_width) - 1)))
 		goto out_err;
@@ -1385,6 +1375,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	bool			autocfg;
 	unsigned int		dw_params;
 	unsigned int		nr_channels;
+	unsigned int		max_blk_size = 0;
 	int			irq;
 	int			err;
 	int			i;
@@ -1425,6 +1416,10 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 	dw->regs = regs;
 
+	/* get hardware configuration parameters */
+	if (autocfg)
+		max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+
 	/* Calculate all channel mask before DMA setup */
 	dw->all_chan_mask = (1 << nr_channels) - 1;
 
@@ -1470,6 +1465,16 @@ static int __devinit dw_probe(struct platform_device *pdev)
 		INIT_LIST_HEAD(&dwc->free_list);
 
 		channel_clear_bit(dw, CH_EN, dwc->mask);
+
+		/* hardware configuration */
+		if (autocfg)
+			/* Decode maximum block size for given channel. The
+			 * stored 4 bit value represents blocks from 0x00 for 3
+			 * up to 0x0a for 4095. */
+			dwc->block_size =
+				(4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
+		else
+			dwc->block_size = pdata->block_size;
 	}
 
 	/* Clear all interrupts on all channels. */
drivers/dma/dw_dmac_regs.h +3 -0
index 8a3a81a..2a1cc53 100644
@@ -193,6 +193,9 @@ struct dw_dma_chan {
 
 	unsigned int		descs_allocated;
 
+	/* hardware configuration */
+	unsigned int		block_size;
+
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
 };
include/linux/dw_dmac.h +2 -0
index 2412e02..3315ef9 100644
@@ -19,6 +19,7 @@
  * @nr_channels: Number of channels supported by hardware (max 8)
  * @is_private: The device channels should be marked as private and not for
  *	by the general purpose DMA channel allocator.
+ * @block_size: Maximum block size supported by the controller
  */
 struct dw_dma_platform_data {
 	unsigned int	nr_channels;
@@ -29,6 +30,7 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_ASCENDING		0	/* chan0 highest */
 #define CHAN_PRIORITY_DESCENDING	1	/* chan7 highest */
 	unsigned char	chan_priority;
+	unsigned short	block_size;
 };
 
 /* bursts size */
Signature · 1 line
1.7.10.4
#40 lore raw

Re: [PATCHv2 4/6] dw_dmac: autoconfigure block_size or use platform data

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1379

Quoted 7 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +4 -0
@@ -1385,6 +1375,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
+       /* get hardware configuration parameters */
+       if (autocfg)
+               max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+

Why don't you do above with the below ++ code

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1473

Quoted 13 lines
drivers/dma/dw_dmac.c +6 -0
        /* Calculate all channel mask before DMA setup */
        dw->all_chan_mask = (1 << nr_channels) - 1;
@@ -1470,6 +1465,16 @@ static int __devinit dw_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&dwc->free_list);
 
                channel_clear_bit(dw, CH_EN, dwc->mask);
+
+               /* hardware configuration */
+               if (autocfg)
+                       /* Decode maximum block size for given channel. The
+                        * stored 4 bit value represents blocks from 0x00 for 3
+                        * up to 0x0a for 4095. */

i.e. here?

Quoted 5 lines
drivers/dma/dw_dmac.c +4 -0
+                       dwc->block_size =
+                               (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
+               else
+                       dwc->block_size = pdata->block_size;
        }
#41 lore raw

Re: [PATCHv2 4/6] dw_dmac: autoconfigure block_size or use platform data

Quoted 18 lines · viresh kumar

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1379

Quoted 7 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +4 -0
@@ -1385,6 +1375,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
+       /* get hardware configuration parameters */
+       if (autocfg)
+               max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+

Why don't you do above with the below ++ code

Quoted 6 lines
drivers/dma/dw_dmac.c +0 -0
        /* Calculate all channel mask before DMA setup */
        dw->all_chan_mask = (1 << nr_channels) - 1;
@@ -1470,6 +1465,16 @@ static int __devinit dw_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&dwc->free_list);
 
Quoted 9 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1473

Quoted 7 lines
drivers/dma/dw_dmac.c +6 -0
                channel_clear_bit(dw, CH_EN, dwc->mask);
+
+               /* hardware configuration */
+               if (autocfg)
+                       /* Decode maximum block size for given channel. The
+                        * stored 4 bit value represents blocks from 0x00 for 3
+                        * up to 0x0a for 4095. */

i.e. here?

Because there is only one register, but we have loop for channels. Shall we read the same register as many times as amount of channels we have?

Quoted 6 lines
Quoted 6 lines
drivers/dma/dw_dmac.c +4 -0
+                       dwc->block_size =
+                               (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
+               else
+                       dwc->block_size = pdata->block_size;
        }
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
Acked-by
#42 lore raw

Re: [PATCHv2 4/6] dw_dmac: autoconfigure block_size or use platform data

Quoted 28 lines · Andy Shevchenko
Quoted 18 lines · viresh kumar

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1379

Quoted 7 lines · Andy Shevchenko
drivers/dma/dw_dmac.c +4 -0
@@ -1385,6 +1375,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
+       /* get hardware configuration parameters */
+       if (autocfg)
+               max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
+

Why don't you do above with the below ++ code

Quoted 6 lines
drivers/dma/dw_dmac.c +0 -0
        /* Calculate all channel mask before DMA setup */
        dw->all_chan_mask = (1 << nr_channels) - 1;
@@ -1470,6 +1465,16 @@ static int __devinit dw_probe(struct platform_device *pdev)
                INIT_LIST_HEAD(&dwc->free_list);
 
Quoted 9 lines

drivers/dma/dw_dmac.c static int __devinit dw_probe(struct platform_device *pdev) · line 1473

Quoted 7 lines
drivers/dma/dw_dmac.c +6 -0
                channel_clear_bit(dw, CH_EN, dwc->mask);
+
+               /* hardware configuration */
+               if (autocfg)
+                       /* Decode maximum block size for given channel. The
+                        * stored 4 bit value represents blocks from 0x00 for 3
+                        * up to 0x0a for 4095. */

i.e. here?

Quoted 2 lines

Because there is only one register, but we have loop for channels. Shall we read the same register as many times as amount of channels we have?

Obviously not :)
I misread the code.

#43 lore raw

PATCH v2 5/6 dw_dmac: autoconfigure data_width or get it via platform data

In reply to Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

---
 arch/arm/mach-spear13xx/spear13xx.c |    2 ++
 arch/avr32/mach-at32ap/at32ap700x.c |    2 ++
 drivers/dma/dw_dmac.c               |   46 ++++++++++++++++++++++++++++++-----
 drivers/dma/dw_dmac_regs.h          |    7 ++++++
 include/linux/dw_dmac.h             |    5 ++++
 5 files changed, 56 insertions(+), 6 deletions(-)
arch/arm/mach-spear13xx/spear13xx.c +2 -0
index 9491137..5633d69 100644
@@ -79,6 +79,8 @@ struct dw_dma_platform_data dmac_plat_data = {
 	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 	.chan_priority = CHAN_PRIORITY_DESCENDING,
 	.block_size = 4095U,
+	.nr_masters = 2,
+	.data_width = { 3, 3, 0, 0 },
 };
 
 void __init spear13xx_l2x0_init(void)
arch/avr32/mach-at32ap/at32ap700x.c +2 -0
index 2c4aefe..b323d8d 100644
@@ -606,6 +606,8 @@ static void __init genclk_init_parent(struct clk *clk)
 static struct dw_dma_platform_data dw_dmac0_data = {
 	.nr_channels	= 3,
 	.block_size	= 4095U,
+	.nr_masters	= 2,
+	.data_width	= { 2, 2, 0, 0 },
 };
 
 static struct resource dw_dmac0_resource[] = {
drivers/dma/dw_dmac.c +40 -6

112 lines not on this page · raw message

drivers/dma/dw_dmac_regs.h +7 -0
index 2a1cc53..06f0391 100644
@@ -198,6 +198,9 @@ struct dw_dma_chan {
 
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
+
+	/* backlink to dw_dma */
+	struct dw_dma		*dw;
 };
 
 static inline struct dw_dma_chan_regs __iomem *
@@ -224,6 +227,10 @@ struct dw_dma {
 
 	u8			all_chan_mask;
 
+	/* hardware configuration */
+	unsigned char		nr_masters;
+	unsigned char		data_width[4];
+
 	struct dw_dma_chan	chan[0];
 };
 
include/linux/dw_dmac.h +5 -0
index 3315ef9..e1c8c9e 100644
@@ -20,6 +20,9 @@
  * @is_private: The device channels should be marked as private and not for
  *	by the general purpose DMA channel allocator.
  * @block_size: Maximum block size supported by the controller
+ * @nr_masters: Number of AHB masters supported by the controller
+ * @data_width: Maximum data width supported by hardware per AHB master
+ *		(0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
  */
 struct dw_dma_platform_data {
 	unsigned int	nr_channels;
@@ -31,6 +34,8 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_DESCENDING	1	/* chan7 highest */
 	unsigned char	chan_priority;
 	unsigned short	block_size;
+	unsigned char	nr_masters;
+	unsigned char	data_width[4];
 };
 
 /* bursts size */
Signature · 1 line
1.7.10.4
Acked-by on v2 5/6
#44 lore raw

Re: [PATCHv2 5/6] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 3 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

#45 lore raw

PATCH v3 1/1 dw_dmac: autoconfigure data_width or get it via platform data

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

---
Since v2:
- sometimes memory-to-memory test is failed, that's why we need to choose minimum data portion between source and destination limits

 arch/arm/mach-spear13xx/spear13xx.c |    2 ++
 arch/avr32/mach-at32ap/at32ap700x.c |    2 ++
 drivers/dma/dw_dmac.c               |   47 ++++++++++++++++++++++++++++++-----
 drivers/dma/dw_dmac_regs.h          |    7 ++++++
 include/linux/dw_dmac.h             |    5 ++++
 5 files changed, 57 insertions(+), 6 deletions(-)
arch/arm/mach-spear13xx/spear13xx.c +2 -0
index 9491137..5633d69 100644
@@ -79,6 +79,8 @@ struct dw_dma_platform_data dmac_plat_data = {
 	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 	.chan_priority = CHAN_PRIORITY_DESCENDING,
 	.block_size = 4095U,
+	.nr_masters = 2,
+	.data_width = { 3, 3, 0, 0 },
 };
 
 void __init spear13xx_l2x0_init(void)
arch/avr32/mach-at32ap/at32ap700x.c +2 -0
index 2c4aefe..b323d8d 100644
@@ -606,6 +606,8 @@ static void __init genclk_init_parent(struct clk *clk)
 static struct dw_dma_platform_data dw_dmac0_data = {
 	.nr_channels	= 3,
 	.block_size	= 4095U,
+	.nr_masters	= 2,
+	.data_width	= { 2, 2, 0, 0 },
 };
 
 static struct resource dw_dmac0_resource[] = {
drivers/dma/dw_dmac.c +41 -6

119 lines not on this page · raw message

drivers/dma/dw_dmac_regs.h +7 -0
index 2a1cc53..06f0391 100644
@@ -198,6 +198,9 @@ struct dw_dma_chan {
 
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
+
+	/* backlink to dw_dma */
+	struct dw_dma		*dw;
 };
 
 static inline struct dw_dma_chan_regs __iomem *
@@ -224,6 +227,10 @@ struct dw_dma {
 
 	u8			all_chan_mask;
 
+	/* hardware configuration */
+	unsigned char		nr_masters;
+	unsigned char		data_width[4];
+
 	struct dw_dma_chan	chan[0];
 };
 
include/linux/dw_dmac.h +5 -0
index 3315ef9..e1c8c9e 100644
@@ -20,6 +20,9 @@
  * @is_private: The device channels should be marked as private and not for
  *	by the general purpose DMA channel allocator.
  * @block_size: Maximum block size supported by the controller
+ * @nr_masters: Number of AHB masters supported by the controller
+ * @data_width: Maximum data width supported by hardware per AHB master
+ *		(0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
  */
 struct dw_dma_platform_data {
 	unsigned int	nr_channels;
@@ -31,6 +34,8 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_DESCENDING	1	/* chan7 highest */
 	unsigned char	chan_priority;
 	unsigned short	block_size;
+	unsigned char	nr_masters;
+	unsigned char	data_width[4];
 };
 
 /* bursts size */
Signature · 1 line
1.7.10.4
Acked-by on v3 1/1
#46 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 9 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

---
Since v2:
- sometimes memory-to-memory test is failed, that's why we need to choose minimum data portion between source and destination limits

#47 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

In reply to Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

Signature · 1 line
~Vinod
#48 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 7 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

%s/can/can't

Signature · 1 line
~Vinod
#49 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 10 lines · Vinod Koul
Quoted 7 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

%s/can/can't

Against linux-next, last used was yesterday's version of it.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#50 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

In reply to Vinod Koul
Quoted 8 lines · Vinod Koul
Quoted 6 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

%s/can/can't

Today I got what was happened. I sent an update to one patch of the series, but you tried to apply it on top of previous version. It seems I was not clear. So, now we have a regression, and I will send a fix soon today.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#51 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 7 lines · Andy Shevchenko
Quoted 6 lines · Vinod Koul
Quoted 5 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

Quoted 6 lines
Quoted 2 lines
Quoted 1 line

What was this gen against, I can apply this.

%s/can/can't

Today I got what was happened. I sent an update to one patch of the series, but you tried to apply it on top of previous version. It seems I was not clear. So, now we have a regression, and I will send a fix soon today.

I received a series, and a patch on top and that what I tried to apply :(
I am okay to revert the whole series now.

Please send me fix by today, merge window has started, I hate to change stuff now.

Signature · 1 line
~Vinod
#52 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 14 lines · Vinod Koul
Quoted 7 lines · Andy Shevchenko
Quoted 6 lines · Vinod Koul
Quoted 5 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

Quoted 6 lines
Quoted 2 lines
Quoted 1 line

What was this gen against, I can apply this.

%s/can/can't

Today I got what was happened. I sent an update to one patch of the series, but you tried to apply it on top of previous version. It seems I was not clear. So, now we have a regression, and I will send a fix soon today.

Quoted 6 lines

I received a series, and a patch on top and that what I tried to apply :(
I am okay to revert the whole series now.

Please send me fix by today, merge window has started, I hate to change stuff now.

I've sent a patch. You could apply on top of the series, or squash it with the one called "dw_dmac: autoconfigure data_width or get it via platform data"

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#53 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

In reply to Vinod Koul
Quoted 6 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

Just rebased to recent linux-next, no conflicts.
...
Applying: dw_dmac: mark dwc_dump_chan_regs as inline
Applying: dw_dmac: fill optional encoded parameters in register structure
Applying: dw_dmac: get number of channels from hardware if possible
Applying: dw_dmac: autoconfigure block_size or use platform data
Applying: dw_dmac: autoconfigure data_width or get it via platform data
Applying: dw_dmac: introduce software emulation of LLP transfers
...

Have you kept the order of the patches?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#54 lore raw

Re: [PATCHv3] dw_dmac: autoconfigure data_width or get it via platform data

Quoted 8 lines · Andy Shevchenko
Quoted 6 lines · Vinod Koul
Quoted 4 lines · Andy Shevchenko

Not all of the controllers support the 64 bit data width. Make it configurable via platform data. The driver will try to get a value from the component parameters, otherwise it will use the platform data.

What was this gen against, I can apply this.

Just rebased to recent linux-next, no conflicts.

And I dont apply patches against linux-next!! I apply against slave-dma-next.

Quoted 10 lines

...
Applying: dw_dmac: mark dwc_dump_chan_regs as inline
Applying: dw_dmac: fill optional encoded parameters in register structure
Applying: dw_dmac: get number of channels from hardware if possible
Applying: dw_dmac: autoconfigure block_size or use platform data
Applying: dw_dmac: autoconfigure data_width or get it via platform data
Applying: dw_dmac: introduce software emulation of LLP transfers
...

Have you kept the order of the patches?

Obviously see my next

The reason for conflict is nature of this patch. It should be split up.

arch/arm/mach-spear13xx/spear13xx.c |    2 ++
arch/avr32/mach-at32ap/at32ap700x.c |    2 ++

It fails here, send these separately to Arnd.

Signature · 1 line
~Vinod
#55 lore raw

PATCH v2 6/6 dw_dmac: introduce software emulation of LLP transfers

In reply to Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a support of such controllers. In case of memory copy or scatter-gather lists it emulates LLP transfers via bunch of the regular single block ones.

---
 drivers/dma/dw_dmac.c      |   99 ++++++++++++++++++++++++++++++++++++++++++--
 drivers/dma/dw_dmac_regs.h |    6 +++
 2 files changed, 101 insertions(+), 4 deletions(-)
drivers/dma/dw_dmac.c +95 -4
index d47b76a..47b9b3e 100644
@@ -234,10 +234,29 @@ static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /*----------------------------------------------------------------------*/
 
+/* Perform single block transfer */
+static inline void dwc_do_single_block(struct dw_dma_chan *dwc,
+				       struct dw_desc *desc)
+{
+	struct dw_dma	*dw = to_dw_dma(dwc->chan.device);
+	u32		ctllo;
+
+	/* Software emulation of LLP mode relies on interrupts to continue
+	 * multi block transfer. */
+	ctllo = desc->lli.ctllo | DWC_CTLL_INT_EN;
+
+	channel_writel(dwc, SAR, desc->lli.sar);
+	channel_writel(dwc, DAR, desc->lli.dar);
+	channel_writel(dwc, CTL_LO, ctllo);
+	channel_writel(dwc, CTL_HI, desc->lli.ctlhi);
+	channel_set_bit(dw, CH_EN, dwc->mask);
+}
+
 /* Called with dwc->lock held and bh disabled */
 static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
 {
 	struct dw_dma	*dw = to_dw_dma(dwc->chan.device);
+	unsigned long	was_soft_llp;
 
 	/* ASSERT:  channel is idle */
 	if (dma_readl(dw, CH_EN) & dwc->mask) {
@@ -249,6 +268,26 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
 		return;
 	}
 
+	if (dwc->nollp) {
+		was_soft_llp = test_and_set_bit(DW_DMA_IS_SOFT_LLP,
+						&dwc->flags);
+		if (was_soft_llp) {
+			dev_err(chan2dev(&dwc->chan),
+				"BUG: Attempted to start new LLP transfer "
+				"inside ongoing one\n");
+			return;
+		}
+
+		dwc_initialize(dwc);
+
+		dwc->tx_list = &first->tx_list;
+		dwc->tx_node_active = first->tx_list.next;
+
+		dwc_do_single_block(dwc, first);
+
+		return;
+	}
+
 	dwc_initialize(dwc);
 
 	channel_writel(dwc, LLP, first->txd.phys);
@@ -560,8 +599,36 @@ static void dw_dma_tasklet(unsigned long data)
 			dwc_handle_cyclic(dw, dwc, status_err, status_xfer);
 		else if (status_err & (1 << i))
 			dwc_handle_error(dw, dwc);
-		else if (status_xfer & (1 << i))
+		else if (status_xfer & (1 << i)) {
+			unsigned long flags;
+
+			spin_lock_irqsave(&dwc->lock, flags);
+			if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) {
+				if (dwc->tx_node_active != dwc->tx_list) {
+					struct dw_desc *desc =
+						list_entry(dwc->tx_node_active,
+							   struct dw_desc,
+							   desc_node);
+
+					dma_writel(dw, CLEAR.XFER, dwc->mask);
+
+					/* move pointer to next descriptor */
+					dwc->tx_node_active =
+						dwc->tx_node_active->next;
+
+					dwc_do_single_block(dwc, desc);
+
+					spin_unlock_irqrestore(&dwc->lock, flags);
+					continue;
+				} else {
+					/* we are done here */
+					clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
+				}
+			}
+			spin_unlock_irqrestore(&dwc->lock, flags);
+
 			dwc_scan_descriptors(dw, dwc);
+		}
 	}
 
 	/*
@@ -964,6 +1031,8 @@ static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	} else if (cmd == DMA_TERMINATE_ALL) {
 		spin_lock_irqsave(&dwc->lock, flags);
 
+		clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
+
 		dwc_chan_disable(dw, dwc);
 
 		dwc->paused = false;
@@ -1206,6 +1275,13 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 	unsigned long			flags;
 
 	spin_lock_irqsave(&dwc->lock, flags);
+	if (dwc->nollp) {
+		spin_unlock_irqrestore(&dwc->lock, flags);
+		dev_dbg(chan2dev(&dwc->chan),
+				"channel doesn't support LLP transfers\n");
+		return ERR_PTR(-EINVAL);
+	}
+
 	if (!list_empty(&dwc->queue) || !list_empty(&dwc->active_list)) {
 		spin_unlock_irqrestore(&dwc->lock, flags);
 		dev_dbg(chan2dev(&dwc->chan),
@@ -1473,6 +1549,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&dw->dma.channels);
 	for (i = 0; i < nr_channels; i++) {
 		struct dw_dma_chan	*dwc = &dw->chan[i];
+		int			r = nr_channels - i - 1;
 
 		dwc->chan.device = &dw->dma;
 		dma_cookie_init(&dwc->chan);
@@ -1484,7 +1561,7 @@ static int __devinit dw_probe(struct platform_device *pdev)
 
 		/* 7 is highest priority & 0 is lowest. */
 		if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-			dwc->priority = nr_channels - i - 1;
+			dwc->priority = r;
 		else
 			dwc->priority = i;
 
@@ -1501,14 +1578,28 @@ static int __devinit dw_probe(struct platform_device *pdev)
 		dwc->dw = dw;
 
 		/* hardware configuration */
-		if (autocfg)
+		if (autocfg) {
+			unsigned int dwc_params;
+
+			dwc_params = dma_read_byaddr(regs + r * sizeof(u32),
+						     DWC_PARAMS);
+
 			/* Decode maximum block size for given channel. The
 			 * stored 4 bit value represents blocks from 0x00 for 3
 			 * up to 0x0a for 4095. */
 			dwc->block_size =
 				(4 << ((max_blk_size >> 4 * i) & 0xf)) - 1;
-		else
+			dwc->nollp =
+				(dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) == 0;
+		} else {
 			dwc->block_size = pdata->block_size;
+
+			/* Check if channel supports multi block transfer */
+			channel_writel(dwc, LLP, 0xfffffffc);
+			dwc->nollp =
+				(channel_readl(dwc, LLP) & 0xfffffffc) == 0;
+			channel_writel(dwc, LLP, 0);
+		}
 	}
 
 	/* Clear all interrupts on all channels. */
drivers/dma/dw_dmac_regs.h +6 -0
index 06f0391..ff39fa6 100644
@@ -172,6 +172,7 @@ struct dw_dma_regs {
 
 enum dw_dmac_flags {
 	DW_DMA_IS_CYCLIC = 0,
+	DW_DMA_IS_SOFT_LLP = 1,
 };
 
 struct dw_dma_chan {
@@ -182,6 +183,10 @@ struct dw_dma_chan {
 	bool			paused;
 	bool			initialized;
 
+	/* software emulation of the LLP transfers */
+	struct list_head	*tx_list;
+	struct list_head	*tx_node_active;
+
 	spinlock_t		lock;
 
 	/* these other elements are all protected by lock */
@@ -195,6 +200,7 @@ struct dw_dma_chan {
 
 	/* hardware configuration */
 	unsigned int		block_size;
+	bool			nollp;
 
 	/* configuration passed via DMA_SLAVE_CONFIG */
 	struct dma_slave_config dma_sconfig;
Signature · 1 line
1.7.10.4
Acked-by on v2 6/6
#56 lore raw

Re: [PATCHv2 6/6] dw_dmac: introduce software emulation of LLP transfers

Quoted 4 lines · Andy Shevchenko

Some controllers have the reduced functionality where the LLP multi block transfers are not supported. This patch introduces a support of such controllers. In case of memory copy or scatter-gather lists it emulates LLP transfers via bunch of the regular single block ones.

Applied
#57 lore raw
In reply to Andy Shevchenko
Quoted 11 lines · Andy Shevchenko

Here is a patchset that allows to adapt the driver to the hardware configuration during probe time. The hardware should have the specific optional parameters enabled. Otherwise the driver will consider values stored in the platform data.

Additionally it brings support of the software LLP transfers. It means that normal linked list transfer is substituted by set of single block transfers transparently to the user.

Since v1:
- addressed all Viresh's comments.

Applied all, Thanks

Quoted 16 lines

Andy Shevchenko (6):
dw_dmac: mark dwc_dump_chan_regs as inline
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: get number of channels from hardware if possible
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: introduce software emulation of LLP transfers

 arch/arm/mach-spear13xx/spear13xx.c |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +
 drivers/dma/dw_dmac.c               |  209 +++++++++++++++++++++++++++++------
 drivers/dma/dw_dmac_regs.h          |   46 ++++++++
 include/linux/dw_dmac.h             |    7 ++
 5 files changed, 235 insertions(+), 33 deletions(-)
Signature · 1 line
~Vinod