dmaengine: dw: rename masters to reflect actual topology

The source and destination masters are reflecting buses or their layers to
where the different devices can be connected. The patch changes the master
names to reflect which one is related to which independently on the transfer
direction.

The outcome of the change is that the memory data width is now always limited
by a data width of the master which is dedicated to communicate to memory.

The patch will not break anything since all current users have the same data
width for all masters. Though it would be nice to revisit avr32 platforms to
check what is the actual hardware topology in use there. It seems that it has
one bus and two masters on it as stated by Table 8-2, that's why everything
works independently on the master in use. The purpose of the sequential patch
is to fix the driver for configuration of more than one bus.

The change is done in the assumption that src_master and dst_master are
reflecting a connection to the memory and peripheral correspondently on avr32
and otherwise on the rest.

Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.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 c261598164a7612c929092ebf2876b478a1c70f6..c99c1ffac199d3f0faad9ba97c7b24be4efb183f 100644 (file)
--- a/Documentation/devicetree/bindings/dma/snps-dma.txt
+++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
@@ -47,8 +47,8 @@ The four cells in order are:
 
 1. A phandle pointing to the DMA controller
 2. The DMA request line number
-3. Source master for transfers on allocated channel
-4. Destination master for transfers on allocated channel
+3. Memory master for transfers on allocated channel
+4. Peripheral master for transfers on allocated channel
 
 Example:
        

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index bf445aa482826920ebd0091c3b88d0a948e0ccae..00d6dcc1d9b664c68627d4ddf7742331f8f215f1 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1365,8 +1365,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
        slave->dma_dev = &dw_dmac0_device.dev;
        slave->src_id = 0;
        slave->dst_id = 1;
-       slave->src_master = 1;
-       slave->dst_master = 0;
+       slave->m_master = 1;
+       slave->p_master = 0;
 
        data->dma_slave = slave;
        data->dma_filter = at32_mci_dma_filter;
@@ -2061,16 +2061,16 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
        if (flags & AC97C_CAPTURE) {
                rx_dws->dma_dev = &dw_dmac0_device.dev;
                rx_dws->src_id = 3;
-               rx_dws->src_master = 0;
-               rx_dws->dst_master = 1;
+               rx_dws->m_master = 0;
+               rx_dws->p_master = 1;
        }
 
        /* Check if DMA slave interface for playback should be configured. */
        if (flags & AC97C_PLAYBACK) {
                tx_dws->dma_dev = &dw_dmac0_device.dev;
                tx_dws->dst_id = 4;
-               tx_dws->src_master = 0;
-               tx_dws->dst_master = 1;
+               tx_dws->m_master = 0;
+               tx_dws->p_master = 1;
        }
 
        if (platform_device_add_data(pdev, data,
@@ -2141,8 +2141,8 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
 
        dws->dma_dev = &dw_dmac0_device.dev;
        dws->dst_id = 2;
-       dws->src_master = 0;
-       dws->dst_master = 1;
+       dws->m_master = 0;
+       dws->p_master = 1;
 
        if (platform_device_add_data(pdev, data,
                                sizeof(struct atmel_abdac_pdata)))

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 902034991517347c6bbcb38f09fbdd99e63aaba3..80bdcabc293f5b73cc9bbaa1ef7e0c4e761ac2c0 100644 (file)
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -201,8 +201,8 @@ static struct sata_dwc_host_priv host_pvt;
 static struct dw_dma_slave sata_dwc_dma_dws = {
        .src_id = 0,
        .dst_id = 0,
-       .src_master = 0,
-       .dst_master = 1,
+       .m_master = 1,
+       .p_master = 0,
 };
 
 /*

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 97199b3c25a22cd907c1a73648c76a96a594b370..5bd7873a02c67ab10b7dbd4849f85f26f4e70629 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -50,8 +50,8 @@
                 | DWC_CTLL_SRC_MSIZE(_smsize)                  \
                 | DWC_CTLL_LLP_D_EN                            \
                 | DWC_CTLL_LLP_S_EN                            \
-                | DWC_CTLL_DMS(_dwc->dst_master)               \
-                | DWC_CTLL_SMS(_dwc->src_master));             \
+                | DWC_CTLL_DMS(_dwc->p_master)                 \
+                | DWC_CTLL_SMS(_dwc->m_master));               \
        })
 
 /*
@@ -709,8 +709,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 
        dwc->direction = DMA_MEM_TO_MEM;
 
-       data_width = min_t(unsigned int, dw->data_width[dwc->src_master],
-                          dw->data_width[dwc->dst_master]);
+       data_width = dw->data_width[dwc->m_master];
 
        src_width = dst_width = min_t(unsigned int, data_width,
                                      dwc_fast_ffs(src | dest | len));
@@ -802,7 +801,7 @@ 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 = dw->data_width[dwc->src_master];
+               data_width = dw->data_width[dwc->m_master];
 
                for_each_sg(sgl, sg, sg_len, i) {
                        struct dw_desc  *desc;
@@ -859,7 +858,7 @@ 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 = dw->data_width[dwc->dst_master];
+               data_width = dw->data_width[dwc->m_master];
 
                for_each_sg(sgl, sg, sg_len, i) {
                        struct dw_desc  *desc;
@@ -937,8 +936,8 @@ bool dw_dma_filter(struct dma_chan *chan, void *param)
        dwc->src_id = dws->src_id;
        dwc->dst_id = dws->dst_id;
 
-       dwc->src_master = dws->src_master;
-       dwc->dst_master = dws->dst_master;
+       dwc->m_master = dws->m_master;
+       dwc->p_master = dws->p_master;
 
        return true;
 }
@@ -1227,8 +1226,8 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
        dwc->src_id = 0;
        dwc->dst_id = 0;
 
-       dwc->src_master = 0;
-       dwc->dst_master = 0;
+       dwc->m_master = 0;
+       dwc->p_master = 0;
 
        dwc->initialized = false;
 

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 26edbe3a27ac39c1cd559dcdecc8b3c11f0886b7..23616c57645c25c6c530dc1da390ff3df3ba8526 100644 (file)
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -42,13 +42,13 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
 
        slave.src_id = dma_spec->args[0];
        slave.dst_id = dma_spec->args[0];
-       slave.src_master = dma_spec->args[1];
-       slave.dst_master = dma_spec->args[2];
+       slave.m_master = dma_spec->args[1];
+       slave.p_master = dma_spec->args[2];
 
        if (WARN_ON(slave.src_id >= DW_DMA_MAX_NR_REQUESTS ||
                    slave.dst_id >= DW_DMA_MAX_NR_REQUESTS ||
-                   slave.src_master >= dw->nr_masters ||
-                   slave.dst_master >= dw->nr_masters))
+                   slave.m_master >= dw->nr_masters ||
+                   slave.p_master >= dw->nr_masters))
                return NULL;
 
        dma_cap_zero(cap);
@@ -66,8 +66,8 @@ static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param)
                .dma_dev = dma_spec->dev,
                .src_id = dma_spec->slave_id,
                .dst_id = dma_spec->slave_id,
-               .src_master = 1,
-               .dst_master = 0,
+               .m_master = 0,
+               .p_master = 1,
        };
 
        return dw_dma_filter(chan, &slave);

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 0a50c18d85b8bbfb9c5574f61ebba50d57f2d617..a63d62bbffe2987ab347f2e6b00b83a28bd39fc8 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -249,8 +249,8 @@ struct dw_dma_chan {
        /* custom slave configuration */
        u8                      src_id;
        u8                      dst_id;
-       u8                      src_master;
-       u8                      dst_master;
+       u8                      m_master;
+       u8                      p_master;
 
        /* configuration passed via .device_config */
        struct dma_slave_config dma_sconfig;

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 520ed1dd57804320859bbef42fa5e15f6a487213..4fd7f9802f1b12fa1d21788f490aa185eb3cbd3e 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -144,16 +144,16 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
                struct dw_dma_slave *slave = c->tx_param;
 
                slave->dma_dev = &dma_dev->dev;
-               slave->src_master = 1;
-               slave->dst_master = 0;
+               slave->m_master = 0;
+               slave->p_master = 1;
        }
 
        if (c->rx_param) {
                struct dw_dma_slave *slave = c->rx_param;
 
                slave->dma_dev = &dma_dev->dev;
-               slave->src_master = 1;
-               slave->dst_master = 0;
+               slave->m_master = 0;
+               slave->p_master = 1;
        }
 
        spi_pdata.dma_filter = lpss_dma_filter;

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 98862aa5bb58c6cf51ac5b283cca61549a965a9e..5eea74d7f9f42ff9cc7850e629a6c86fce1a6a75 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1454,13 +1454,13 @@ byt_serial_setup(struct serial_private *priv,
                return -EINVAL;
        }
 
-       rx_param->src_master = 1;
-       rx_param->dst_master = 0;
+       rx_param->m_master = 0;
+       rx_param->p_master = 1;
 
        dma->rxconf.src_maxburst = 16;
 
-       tx_param->src_master = 1;
-       tx_param->dst_master = 0;
+       tx_param->m_master = 0;
+       tx_param->p_master = 1;
 
        dma->txconf.dst_maxburst = 16;
 

diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h
index 03b6095d3b18f5bda8cf330f412b0e4957f11d71..b881b978e4866ba86a79a44aeecac5b7d91f5f02 100644 (file)
--- a/include/linux/platform_data/dma-dw.h
+++ b/include/linux/platform_data/dma-dw.h
@@ -21,15 +21,15 @@
  * @dma_dev:   required DMA master device
  * @src_id:    src request line
  * @dst_id:    dst request line
- * @src_master: src master for transfers on allocated channel.
- * @dst_master: dest master for transfers on allocated channel.
+ * @m_master:  memory master for transfers on allocated channel
+ * @p_master:  peripheral master for transfers on allocated channel
  */
 struct dw_dma_slave {
        struct device           *dma_dev;
        u8                      src_id;
        u8                      dst_id;
-       u8                      src_master;
-       u8                      dst_master;
+       u8                      m_master;
+       u8                      p_master;
 };
 
 /**