dmaengine: qcom-adm: stop abusing slave_id config

The slave_id was previously used to pick one DMA slave instead of another,
but this is now done through the DMA descriptors in device tree.

For the qcom_adm driver, the configuration is documented in the DT
binding to contain a tuple of device identifier and a "crci" field,
but the implementation ends up using only a single cell for identifying
the slave, with the crci getting passed in nonstandard properties of
the device, and passed through the dma driver using the old slave_id
field. Part of the problem apparently is that the nand driver ends up
using only a single DMA request ID, but requires distinct values for
"crci" depending on the type of transfer.

Change both the dmaengine driver and the two slave drivers to allow
the documented binding to work in addition to the ad-hoc passing
of crci values. In order to no longer abuse the slave_id field, pass
the data using the "peripheral_config" mechanism instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20211122222203.4103644-9-arnd@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/qcom/qcom_adm.c b/drivers/dma/qcom/qcom_adm.c
index ee78bed8d60d2b817505303d4cfb25c11e3c2693..facdacf8aede6a0f5fc2138edc2c39843addf69d 100644 (file)
--- a/drivers/dma/qcom/qcom_adm.c
+++ b/drivers/dma/qcom/qcom_adm.c
@@ -8,6 +8,7 @@
 #include <linux/device.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
+#include <linux/dma/qcom_adm.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -140,6 +141,8 @@ struct adm_chan {
 
        struct adm_async_desc *curr_txd;
        struct dma_slave_config slave;
+       u32 crci;
+       u32 mux;
        struct list_head node;
 
        int error;
@@ -379,8 +382,8 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan,
                        return ERR_PTR(-EINVAL);
                }
 
-               crci = achan->slave.slave_id & 0xf;
-               if (!crci || achan->slave.slave_id > 0x1f) {
+               crci = achan->crci & 0xf;
+               if (!crci || achan->crci > 0x1f) {
                        dev_err(adev->dev, "invalid crci value\n");
                        return ERR_PTR(-EINVAL);
                }
@@ -403,9 +406,7 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan,
        if (!async_desc)
                return ERR_PTR(-ENOMEM);
 
-       if (crci)
-               async_desc->mux = achan->slave.slave_id & ADM_CRCI_MUX_SEL ?
-                                       ADM_CRCI_CTL_MUX_SEL : 0;
+       async_desc->mux = achan->mux ? ADM_CRCI_CTL_MUX_SEL : 0;
        async_desc->crci = crci;
        async_desc->blk_size = blk_size;
        async_desc->dma_len = single_count * sizeof(struct adm_desc_hw_single) +
@@ -488,10 +489,13 @@ static int adm_terminate_all(struct dma_chan *chan)
 static int adm_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)
 {
        struct adm_chan *achan = to_adm_chan(chan);
+       struct qcom_adm_peripheral_config *config = cfg->peripheral_config;
        unsigned long flag;
 
        spin_lock_irqsave(&achan->vc.lock, flag);
        memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config));
+       if (cfg->peripheral_size == sizeof(config))
+               achan->crci = config->crci;
        spin_unlock_irqrestore(&achan->vc.lock, flag);
 
        return 0;
@@ -694,6 +698,45 @@ static void adm_channel_init(struct adm_device *adev, struct adm_chan *achan,
        achan->vc.desc_free = adm_dma_free_desc;
 }
 
+/**
+ * adm_dma_xlate
+ * @dma_spec:  pointer to DMA specifier as found in the device tree
+ * @ofdma:     pointer to DMA controller data
+ *
+ * This can use either 1-cell or 2-cell formats, the first cell
+ * identifies the slave device, while the optional second cell
+ * contains the crci value.
+ *
+ * Returns pointer to appropriate dma channel on success or NULL on error.
+ */
+static struct dma_chan *adm_dma_xlate(struct of_phandle_args *dma_spec,
+                              struct of_dma *ofdma)
+{
+       struct dma_device *dev = ofdma->of_dma_data;
+       struct dma_chan *chan, *candidate = NULL;
+       struct adm_chan *achan;
+
+       if (!dev || dma_spec->args_count > 2)
+               return NULL;
+
+       list_for_each_entry(chan, &dev->channels, device_node)
+               if (chan->chan_id == dma_spec->args[0]) {
+                       candidate = chan;
+                       break;
+               }
+
+       if (!candidate)
+               return NULL;
+
+       achan = to_adm_chan(candidate);
+       if (dma_spec->args_count == 2)
+               achan->crci = dma_spec->args[1];
+       else
+               achan->crci = 0;
+
+       return dma_get_slave_channel(candidate);
+}
+
 static int adm_dma_probe(struct platform_device *pdev)
 {
        struct adm_device *adev;
@@ -838,8 +881,7 @@ static int adm_dma_probe(struct platform_device *pdev)
                goto err_disable_clks;
        }
 
-       ret = of_dma_controller_register(pdev->dev.of_node,
-                                        of_dma_xlate_by_chan_id,
+       ret = of_dma_controller_register(pdev->dev.of_node, adm_dma_xlate,
                                         &adev->common);
        if (ret)
                goto err_unregister_dma;

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 04e6f7b26706482883fb3fe681200febc23fc92e..7c6efa3b625575eb875892dea798c951e20cbcc1 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -6,6 +6,7 @@
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/bitops.h>
+#include <linux/dma/qcom_adm.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
@@ -952,6 +953,7 @@ static int prep_adm_dma_desc(struct qcom_nand_controller *nandc, bool read,
        struct dma_async_tx_descriptor *dma_desc;
        struct scatterlist *sgl;
        struct dma_slave_config slave_conf;
+       struct qcom_adm_peripheral_config periph_conf = {};
        enum dma_transfer_direction dir_eng;
        int ret;
 
@@ -983,11 +985,19 @@ static int prep_adm_dma_desc(struct qcom_nand_controller *nandc, bool read,
        if (read) {
                slave_conf.src_maxburst = 16;
                slave_conf.src_addr = nandc->base_dma + reg_off;
-               slave_conf.slave_id = nandc->data_crci;
+               if (nandc->data_crci) {
+                       periph_conf.crci = nandc->data_crci;
+                       slave_conf.peripheral_config = &periph_conf;
+                       slave_conf.peripheral_size = sizeof(periph_conf);
+               }
        } else {
                slave_conf.dst_maxburst = 16;
                slave_conf.dst_addr = nandc->base_dma + reg_off;
-               slave_conf.slave_id = nandc->cmd_crci;
+               if (nandc->cmd_crci) {
+                       periph_conf.crci = nandc->cmd_crci;
+                       slave_conf.peripheral_config = &periph_conf;
+                       slave_conf.peripheral_size = sizeof(periph_conf);
+               }
        }
 
        ret = dmaengine_slave_config(nandc->chan, &slave_conf);

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index fcef7a961430b37aa5a4b0f7940912f575f52fb6..c6be09f44dc16b454d222c6f302159d91b2a99b2 100644 (file)
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -9,6 +9,7 @@
 
 #include <linux/kernel.h>
 #include <linux/atomic.h>
+#include <linux/dma/qcom_adm.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
@@ -290,6 +291,7 @@ static void msm_request_tx_dma(struct msm_port *msm_port, resource_size_t base)
 {
        struct device *dev = msm_port->uart.dev;
        struct dma_slave_config conf;
+       struct qcom_adm_peripheral_config periph_conf = {};
        struct msm_dma *dma;
        u32 crci = 0;
        int ret;
@@ -308,7 +310,11 @@ static void msm_request_tx_dma(struct msm_port *msm_port, resource_size_t base)
        conf.device_fc = true;
        conf.dst_addr = base + UARTDM_TF;
        conf.dst_maxburst = UARTDM_BURST_SIZE;
-       conf.slave_id = crci;
+       if (crci) {
+               conf.peripheral_config = &periph_conf;
+               conf.peripheral_size = sizeof(periph_conf);
+               periph_conf.crci = crci;
+       }
 
        ret = dmaengine_slave_config(dma->chan, &conf);
        if (ret)
@@ -333,6 +339,7 @@ static void msm_request_rx_dma(struct msm_port *msm_port, resource_size_t base)
 {
        struct device *dev = msm_port->uart.dev;
        struct dma_slave_config conf;
+       struct qcom_adm_peripheral_config periph_conf = {};
        struct msm_dma *dma;
        u32 crci = 0;
        int ret;
@@ -355,7 +362,11 @@ static void msm_request_rx_dma(struct msm_port *msm_port, resource_size_t base)
        conf.device_fc = true;
        conf.src_addr = base + UARTDM_RF;
        conf.src_maxburst = UARTDM_BURST_SIZE;
-       conf.slave_id = crci;
+       if (crci) {
+               conf.peripheral_config = &periph_conf;
+               conf.peripheral_size = sizeof(periph_conf);
+               periph_conf.crci = crci;
+       }
 
        ret = dmaengine_slave_config(dma->chan, &conf);
        if (ret)

diff --git a/include/linux/dma/qcom_adm.h b/include/linux/dma/qcom_adm.h
new file mode 100644 (file)
index 0000000..af20df6
--- /dev/null
+++ b/include/linux/dma/qcom_adm.h
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#ifndef __LINUX_DMA_QCOM_ADM_H
+#define __LINUX_DMA_QCOM_ADM_H
+
+#include <linux/types.h>
+
+struct qcom_adm_peripheral_config {
+       u32 crci;
+       u32 mux;
+};
+
+#endif /* __LINUX_DMA_QCOM_ADM_H */