Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine update from Vinod Koul:
 "This time we have a new dmaengine driver from the tegra folks.  Also
  we have Guennadi's cleanup of sh drivers which incudes a library for
  sh drivers.  And the usual odd fixes in bunch of drivers and some nice
  cleanup of dw_dmac from Andy."

Fix up conflicts in drivers/mmc/host/sh_mmcif.c

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Cleanup logging messages
  mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
  dma: sh: provide a migration path for slave drivers to stop using .private
  dma: sh: use an integer slave ID to improve API compatibility
  dmaengine: shdma: prepare to stop using struct dma_chan::private
  sh: remove unused DMA device pointer from SIU platform data
  ASoC: siu: don't use DMA device for channel filtering
  dmaengine: shdma: (cosmetic) simplify a static function
  dmaengine: at_hdmac: add a few const qualifiers
  dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
  dw_dmac: mark dwc_dump_lli inline
  dma: mxs-dma: Export missing symbols from mxs-dma.c
  dma: shdma: convert to the shdma base library
  ASoC: fsi: prepare for conversion to the shdma base library
  usb: renesas_usbhs: prepare for conversion to the shdma base library
  ASoC: siu: prepare for conversion to the shdma base library
  serial: sh-sci: prepare for conversion to the shdma base library
  mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
  mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
  dma: shdma: prepare for conversion to the shdma base library
  ...

4 files changed, 145 insertions, 32 deletions

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index cc0756a35ae3..9c02a4508b25 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -338,6 +338,9 @@ enum dma_slave_buswidth {
  * @device_fc: Flow Controller Settings. Only valid for slave channels. Fill
  * with 'true' if peripheral should be flow controller. Direction will be
  * selected at Runtime.
+ * @slave_id: Slave requester id. Only valid for slave channels. The dma
+ * slave peripheral will have unique id as dma requester which need to be
+ * pass as slave config.
  *
  * This struct is passed in as configuration data to a DMA engine
  * in order to set up a certain channel for DMA transport at runtime.
@@ -365,6 +368,7 @@ struct dma_slave_config {
         u32 src_maxburst;
         u32 dst_maxburst;
         bool device_fc;
+        unsigned int slave_id;
 };
 
 static inline const char *dma_chan_name(struct dma_chan *chan)
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index c2f73cbb4d5c..e7d5dd67bb74 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -32,17 +32,11 @@
  * 1111 : Peripheral clock (sup_pclk set '1')
  */
 
-struct sh_mmcif_dma {
-        struct sh_dmae_slave chan_priv_tx;
-        struct sh_dmae_slave chan_priv_rx;
-};
-
 struct sh_mmcif_plat_data {
         void (*set_pwr)(struct platform_device *pdev, int state);
         void (*down_pwr)(struct platform_device *pdev);
         int (*get_cd)(struct platform_device *pdef);
-        struct sh_mmcif_dma     *dma;           /* Deprecated. Instead */
-        unsigned int            slave_id_tx;    /* use embedded slave_id_[tr]x */
+        unsigned int            slave_id_tx;    /* embedded slave_id_[tr]x */
         unsigned int            slave_id_rx;
         bool                    use_cd_gpio : 1;
         unsigned int            cd_gpio;
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 425450b980b8..b64d6bec6f90 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -10,38 +10,27 @@
 #ifndef SH_DMA_H
 #define SH_DMA_H
 
-#include <linux/list.h>
 #include <linux/dmaengine.h>
+#include <linux/list.h>
+#include <linux/shdma-base.h>
+#include <linux/types.h>
+
+struct device;
 
 /* Used by slave DMA clients to request DMA to/from a specific peripheral */
 struct sh_dmae_slave {
-        unsigned int                    slave_id; /* Set by the platform */
-        struct device                   *dma_dev; /* Set by the platform */
-        const struct sh_dmae_slave_config       *config;  /* Set by the driver */
-};
-
-struct sh_dmae_regs {
-        u32 sar; /* SAR / source address */
-        u32 dar; /* DAR / destination address */
-        u32 tcr; /* TCR / transfer count */
-};
-
-struct sh_desc {
-        struct sh_dmae_regs hw;
-        struct list_head node;
-        struct dma_async_tx_descriptor async_tx;
-        enum dma_transfer_direction direction;
-        dma_cookie_t cookie;
-        size_t partial;
-        int chunks;
-        int mark;
+        struct shdma_slave              shdma_slave;    /* Set by the platform */
 };
 
+/*
+ * Supplied by platforms to specify, how a DMA channel has to be configured for
+ * a certain peripheral
+ */
 struct sh_dmae_slave_config {
-        unsigned int                    slave_id;
-        dma_addr_t                      addr;
-        u32                             chcr;
-        char                            mid_rid;
+        int             slave_id;
+        dma_addr_t      addr;
+        u32             chcr;
+        char            mid_rid;
 };
 
 struct sh_dmae_channel {
@@ -110,4 +99,6 @@ struct sh_dmae_pdata {
 #define CHCR_TE 0x00000002
 #define CHCR_IE 0x00000004
 
+bool shdma_chan_filter(struct dma_chan *chan, void *arg);
+
 #endif
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h
new file mode 100644
index 000000000000..93f9821554b6
--- /dev/null
+++ b/include/linux/shdma-base.h
@@ -0,0 +1,124 @@
+/*
+ * Dmaengine driver base library for DMA controllers, found on SH-based SoCs
+ *
+ * extracted from shdma.c and headers
+ *
+ * Copyright (C) 2011-2012 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef SHDMA_BASE_H
+#define SHDMA_BASE_H
+
+#include <linux/dmaengine.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/types.h>
+
+/**
+ * shdma_pm_state - DMA channel PM state
+ * SHDMA_PM_ESTABLISHED:        either idle or during data transfer
+ * SHDMA_PM_BUSY:               during the transfer preparation, when we have to
+ *                              drop the lock temporarily
+ * SHDMA_PM_PENDING:    transfers pending
+ */
+enum shdma_pm_state {
+        SHDMA_PM_ESTABLISHED,
+        SHDMA_PM_BUSY,
+        SHDMA_PM_PENDING,
+};
+
+struct device;
+
+/*
+ * Drivers, using this library are expected to embed struct shdma_dev,
+ * struct shdma_chan, struct shdma_desc, and struct shdma_slave
+ * in their respective device, channel, descriptor and slave objects.
+ */
+
+struct shdma_slave {
+        int slave_id;
+};
+
+struct shdma_desc {
+        struct list_head node;
+        struct dma_async_tx_descriptor async_tx;
+        enum dma_transfer_direction direction;
+        dma_cookie_t cookie;
+        int chunks;
+        int mark;
+};
+
+struct shdma_chan {
+        spinlock_t chan_lock;           /* Channel operation lock */
+        struct list_head ld_queue;      /* Link descriptors queue */
+        struct list_head ld_free;       /* Free link descriptors */
+        struct dma_chan dma_chan;       /* DMA channel */
+        struct device *dev;             /* Channel device */
+        void *desc;                     /* buffer for descriptor array */
+        int desc_num;                   /* desc count */
+        size_t max_xfer_len;            /* max transfer length */
+        int id;                         /* Raw id of this channel */
+        int irq;                        /* Channel IRQ */
+        int slave_id;                   /* Client ID for slave DMA */
+        enum shdma_pm_state pm_state;
+};
+
+/**
+ * struct shdma_ops - simple DMA driver operations
+ * desc_completed:      return true, if this is the descriptor, that just has
+ *                      completed (atomic)
+ * halt_channel:        stop DMA channel operation (atomic)
+ * channel_busy:        return true, if the channel is busy (atomic)
+ * slave_addr:          return slave DMA address
+ * desc_setup:          set up the hardware specific descriptor portion (atomic)
+ * set_slave:           bind channel to a slave
+ * setup_xfer:          configure channel hardware for operation (atomic)
+ * start_xfer:          start the DMA transfer (atomic)
+ * embedded_desc:       return Nth struct shdma_desc pointer from the
+ *                      descriptor array
+ * chan_irq:            process channel IRQ, return true if a transfer has
+ *                      completed (atomic)
+ */
+struct shdma_ops {
+        bool (*desc_completed)(struct shdma_chan *, struct shdma_desc *);
+        void (*halt_channel)(struct shdma_chan *);
+        bool (*channel_busy)(struct shdma_chan *);
+        dma_addr_t (*slave_addr)(struct shdma_chan *);
+        int (*desc_setup)(struct shdma_chan *, struct shdma_desc *,
+                          dma_addr_t, dma_addr_t, size_t *);
+        int (*set_slave)(struct shdma_chan *, int, bool);
+        void (*setup_xfer)(struct shdma_chan *, int);
+        void (*start_xfer)(struct shdma_chan *, struct shdma_desc *);
+        struct shdma_desc *(*embedded_desc)(void *, int);
+        bool (*chan_irq)(struct shdma_chan *, int);
+};
+
+struct shdma_dev {
+        struct dma_device dma_dev;
+        struct shdma_chan **schan;
+        const struct shdma_ops *ops;
+        size_t desc_size;
+};
+
+#define shdma_for_each_chan(c, d, i) for (i = 0, c = (d)->schan[0]; \
+                                i < (d)->dma_dev.chancnt; c = (d)->schan[++i])
+
+int shdma_request_irq(struct shdma_chan *, int,
+                           unsigned long, const char *);
+void shdma_free_irq(struct shdma_chan *);
+bool shdma_reset(struct shdma_dev *sdev);
+void shdma_chan_probe(struct shdma_dev *sdev,
+                           struct shdma_chan *schan, int id);
+void shdma_chan_remove(struct shdma_chan *schan);
+int shdma_init(struct device *dev, struct shdma_dev *sdev,
+                    int chan_num);
+void shdma_cleanup(struct shdma_dev *sdev);
+
+#endif