dmaengine: dw: Add DMA-channels mask cell support

BugLink: https://bugs.launchpad.net/bugs/1902115
[ Upstream commit e8ee6c8cb61b676f1a2d6b942329e98224bd8ee9 ]

DW DMA IP-core provides a way to synthesize the DMA controller with
channels having different parameters like maximum burst-length,
multi-block support, maximum data width, etc. Those parameters both
explicitly and implicitly affect the channels performance. Since DMA slave
devices might be very demanding to the DMA performance, let's provide a
functionality for the slaves to be assigned with DW DMA channels, which
performance according to the platform engineer fulfill their requirements.
After this patch is applied it can be done by passing the mask of suitable
DMA-channels either directly in the dw_dma_slave structure instance or as
a fifth cell of the DMA DT-property. If mask is zero or not provided, then
there is no limitation on the channels allocation.

For instance Baikal-T1 SoC is equipped with a DW DMAC engine, which first
two channels are synthesized with max burst length of 16, while the rest
of the channels have been created with max-burst-len=4. It would seem that
the first two channels must be faster than the others and should be more
preferable for the time-critical DMA slave devices. In practice it turned
out that the situation is quite the opposite. The channels with
max-burst-len=4 demonstrated a better performance than the channels with
max-burst-len=16 even when they both had been initialized with the same
settings. The performance drop of the first two DMA-channels made them
unsuitable for the DW APB SSI slave device. No matter what settings they
are configured with, full-duplex SPI transfers occasionally experience the
Rx FIFO overflow. It means that the DMA-engine doesn't keep up with
incoming data pace even though the SPI-bus is enabled with speed of 25MHz
while the DW DMA controller is clocked with 50MHz signal. There is no such
problem has been noticed for the channels synthesized with
max-burst-len=4.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Link: https://lore.kernel.org/r/20200731200826.9292-6-Sergey.Semin@baikalelectronics.ru
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Ian May <ian.may@canonical.com>

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index a1b56f52db2f2437faa615c661f87d2673da583c..5e7fdc0b6e3db26fb95b40c660a19882ce42195d 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -772,6 +772,10 @@ bool dw_dma_filter(struct dma_chan *chan, void *param)
        if (dws->dma_dev != chan->device->dev)
                return false;
 
+       /* permit channels in accordance with the channels mask */
+       if (dws->channels && !(dws->channels & dwc->mask))
+               return false;
+
        /* We have to copy data since dws can be temporary storage */
        memcpy(&dwc->dws, dws, sizeof(struct dw_dma_slave));
 

diff --git a/drivers/dma/dw/of.c b/drivers/dma/dw/of.c
index 9e27831dee324d0db00ab0494ba0d6351335cd73..43e975fb671424d530cf89051ab7b204a03640af 100644 (file)
--- a/drivers/dma/dw/of.c
+++ b/drivers/dma/dw/of.c
@@ -22,18 +22,21 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
        };
        dma_cap_mask_t cap;
 
-       if (dma_spec->args_count != 3)
+       if (dma_spec->args_count < 3 || dma_spec->args_count > 4)
                return NULL;
 
        slave.src_id = dma_spec->args[0];
        slave.dst_id = dma_spec->args[0];
        slave.m_master = dma_spec->args[1];
        slave.p_master = dma_spec->args[2];
+       if (dma_spec->args_count >= 4)
+               slave.channels = dma_spec->args[3];
 
        if (WARN_ON(slave.src_id >= DW_DMA_MAX_NR_REQUESTS ||
                    slave.dst_id >= DW_DMA_MAX_NR_REQUESTS ||
                    slave.m_master >= dw->pdata->nr_masters ||
-                   slave.p_master >= dw->pdata->nr_masters))
+                   slave.p_master >= dw->pdata->nr_masters ||
+                   slave.channels >= BIT(dw->pdata->nr_channels)))
                return NULL;
 
        dma_cap_zero(cap);

diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h
index f3eaf9ec00a1be5e475726e1124a1851fe7d6d36..70078be166e3c93f25e75d8f35650a7fb74c2148 100644 (file)
--- a/include/linux/platform_data/dma-dw.h
+++ b/include/linux/platform_data/dma-dw.h
@@ -21,6 +21,7 @@
  * @dst_id:    dst request line
  * @m_master:  memory master for transfers on allocated channel
  * @p_master:  peripheral master for transfers on allocated channel
+ * @channels:  mask of the channels permitted for allocation (zero value means any)
  * @hs_polarity:set active low polarity of handshake interface
  */
 struct dw_dma_slave {
@@ -29,6 +30,7 @@ struct dw_dma_slave {
        u8                      dst_id;
        u8                      m_master;
        u8                      p_master;
+       u8                      channels;
        bool                    hs_polarity;
 };