dmaengine: DW DMAC: add multi-block property to device tree

Several versions of DW DMAC have multi block transfers hardware
support. Hardware support of multi block transfers is disabled
by default if we use DT to configure DMAC and software emulation
of multi block transfers used instead.
Add multi-block property, so it is possible to enable hardware
multi block transfers (if present) via DT.

Switch from per device is_nollp variable to multi_block array
to be able enable/disable multi block transfers separately per
channel.

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt
index 0f5583293c9caba6b8758d28e68a26ecffec2fbd..4775c66f4508c5c0dbdd1091495bc7ff95dc584b 100644 (file)
--- a/Documentation/devicetree/bindings/dma/snps-dma.txt
+++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
@@ -27,6 +27,8 @@ Optional properties:
   that services interrupts for this device
 - is_private: The device channels should be marked as private and not for by the
   general purpose DMA channel allocator. False if not passed.
+- multi-block: Multi block transfers supported by hardware. Array property with
+  one cell per channel. 0: not supported, 1 (default): supported.
 
 Example:
 

diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi
index de53f5c3251cd8cec8e637136bf2f269c46242d5..3121536b25a375883a5eca1b94a3e2a4db372680 100644 (file)
--- a/arch/arc/boot/dts/abilis_tb10x.dtsi
+++ b/arch/arc/boot/dts/abilis_tb10x.dtsi
@@ -129,6 +129,7 @@
                        data-width = <4>;
                        clocks = <&ahb_clk>;
                        clock-names = "hclk";
+                       multi-block = <1 1 1 1 1 1>;
                };
 
                i2c0: i2c@FF120000 {

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 449acf0d82721c057b9383b5996b56f17af96179..17ea0abcdbd7c5bb2e3a529bdf33802362c54b74 100644 (file)
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -118,6 +118,7 @@
                        block_size = <0xfff>;
                        dma-masters = <2>;
                        data-width = <8 8>;
+                       multi-block = <1 1 1 1 1 1 1 1>;
                };
 
                dma@eb000000 {
@@ -134,6 +135,7 @@
                        chan_priority = <1>;
                        block_size = <0xfff>;
                        data-width = <8 8>;
+                       multi-block = <1 1 1 1 1 1 1 1>;
                };
 
                fsmc: flash@b0000000 {

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index c2c0a613cb7aab53ac5f8e85c6c7441ecc7ef3fc..e5adf5d1c34fcf53dfeab355ee647a97c2765661 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -1569,7 +1569,7 @@ int dw_dma_probe(struct dw_dma_chip *chip)
                                (dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) == 0;
                } else {
                        dwc->block_size = pdata->block_size;
-                       dwc->nollp = pdata->is_nollp;
+                       dwc->nollp = !pdata->multi_block[i];
                }
        }
 

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index aa7a5c1b9bf8b00c21c365a45611e24a83c6f78a..b1655e40cfa24f7313e11c49c7394951cda68451 100644 (file)
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -102,7 +102,7 @@ dw_dma_parse_dt(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct dw_dma_platform_data *pdata;
-       u32 tmp, arr[DW_DMA_MAX_NR_MASTERS];
+       u32 tmp, arr[DW_DMA_MAX_NR_MASTERS], mb[DW_DMA_MAX_NR_CHANNELS];
        u32 nr_masters;
        u32 nr_channels;
 
@@ -118,6 +118,8 @@ dw_dma_parse_dt(struct platform_device *pdev)
 
        if (of_property_read_u32(np, "dma-channels", &nr_channels))
                return NULL;
+       if (nr_channels > DW_DMA_MAX_NR_CHANNELS)
+               return NULL;
 
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
@@ -152,6 +154,14 @@ dw_dma_parse_dt(struct platform_device *pdev)
                        pdata->data_width[tmp] = BIT(arr[tmp] & 0x07);
        }
 
+       if (!of_property_read_u32_array(np, "multi-block", mb, nr_channels)) {
+               for (tmp = 0; tmp < nr_channels; tmp++)
+                       pdata->multi_block[tmp] = mb[tmp];
+       } else {
+               for (tmp = 0; tmp < nr_channels; tmp++)
+                       pdata->multi_block[tmp] = 1;
+       }
+
        return pdata;
 }
 #else

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index f65dd104479fabcfd2842893325b13f11023fac7..4e0128c627047741487123e8d51e38c010b6f914 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -12,7 +12,8 @@
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
 
-#define DW_DMA_MAX_NR_CHANNELS 8
+#include "internal.h"
+
 #define DW_DMA_MAX_NR_REQUESTS 16
 
 /* flow controller */

diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c
index 886fcf37f291ac7c78654aa2f3a511f976846732..c4593ec68ff79fa98794c09246b176e673096435 100644 (file)
--- a/drivers/tty/serial/8250/8250_lpss.c
+++ b/drivers/tty/serial/8250/8250_lpss.c
@@ -157,12 +157,12 @@ static int byt_serial_setup(struct lpss8250 *lpss, struct uart_port *port)
 static const struct dw_dma_platform_data qrk_serial_dma_pdata = {
        .nr_channels = 2,
        .is_private = true,
-       .is_nollp = true,
        .chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
        .chan_priority = CHAN_PRIORITY_ASCENDING,
        .block_size = 4095,
        .nr_masters = 1,
        .data_width = {4},
+       .multi_block = {0},
 };
 
 static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port)

diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h
index 5f0e11e7354cdbb28e09668ba75686fdcc524e9e..e69e415d0d988701c73e20d97756561cab797738 100644 (file)
--- a/include/linux/platform_data/dma-dw.h
+++ b/include/linux/platform_data/dma-dw.h
@@ -14,6 +14,7 @@
 #include <linux/device.h>
 
 #define DW_DMA_MAX_NR_MASTERS  4
+#define DW_DMA_MAX_NR_CHANNELS 8
 
 /**
  * struct dw_dma_slave - Controller-specific information about a slave
@@ -40,19 +41,18 @@ struct dw_dma_slave {
  * @is_private: The device channels should be marked as private and not for
  *     by the general purpose DMA channel allocator.
  * @is_memcpy: The device channels do support memory-to-memory transfers.
- * @is_nollp: The device channels does not support multi block transfers.
  * @chan_allocation_order: Allocate channels starting from 0 or 7
  * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0.
  * @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
  *             (in bytes, power of 2)
+ * @multi_block: Multi block transfers supported by hardware per channel.
  */
 struct dw_dma_platform_data {
        unsigned int    nr_channels;
        bool            is_private;
        bool            is_memcpy;
-       bool            is_nollp;
 #define CHAN_ALLOCATION_ASCENDING      0       /* zero to seven */
 #define CHAN_ALLOCATION_DESCENDING     1       /* seven to zero */
        unsigned char   chan_allocation_order;
@@ -62,6 +62,7 @@ struct dw_dma_platform_data {
        unsigned int    block_size;
        unsigned char   nr_masters;
        unsigned char   data_width[DW_DMA_MAX_NR_MASTERS];
+       unsigned char   multi_block[DW_DMA_MAX_NR_CHANNELS];
 };
 
 #endif /* _PLATFORM_DATA_DMA_DW_H */