dmaengine: Add dma_client parameter to device_alloc_chan_resources

A DMA controller capable of doing slave transfers may need to know a
few things about the slave when preparing the channel. We don't want
to add this information to struct dma_channel since the channel hasn't
yet been bound to a client at this point.

Instead, pass a reference to the client requesting the channel to the
driver's device_alloc_chan_resources hook so that it can pick the
necessary information from the dma_client struct by itself.

[dan.j.williams@intel.com: fixed up fsldma and mv_xor]
Acked-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

6 files changed, 19 insertions, 13 deletions

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 10de69eb1a3..7344f5dbd50 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -174,7 +174,8 @@ static void dma_client_chan_alloc(struct dma_client *client)
                         if (!dma_chan_satisfies_mask(chan, client->cap_mask))
                                 continue;
 
-                        desc = chan->device->device_alloc_chan_resources(chan);
+                        desc = chan->device->device_alloc_chan_resources(
+                                        chan, client);
                         if (desc >= 0) {
                                 ack = client->event_callback(client,
                                                 chan,
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 724f6fdd0af..c0059ca5834 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -366,7 +366,8 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
  *
  * Return - The number of descriptors allocated.
  */
-static int fsl_dma_alloc_chan_resources(struct dma_chan *chan)
+static int fsl_dma_alloc_chan_resources(struct dma_chan *chan,
+                                        struct dma_client *client)
 {
         struct fsl_dma_chan *fsl_chan = to_fsl_chan(chan);
         LIST_HEAD(tmp_list);
@@ -819,7 +820,7 @@ static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
 
         chan = &fsl_chan->common;
 
-        if (fsl_dma_alloc_chan_resources(chan) < 1) {
+        if (fsl_dma_alloc_chan_resources(chan, NULL) < 1) {
                 dev_err(fsl_chan->dev,
                                 "selftest: Cannot alloc resources for DMA\n");
                 err = -ENODEV;
@@ -847,7 +848,7 @@ static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
         /* Test free and re-alloc channel resources */
         fsl_dma_free_chan_resources(chan);
 
-        if (fsl_dma_alloc_chan_resources(chan) < 1) {
+        if (fsl_dma_alloc_chan_resources(chan, NULL) < 1) {
                 dev_err(fsl_chan->dev,
                                 "selftest: Cannot alloc resources for DMA\n");
                 err = -ENODEV;
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 318e8a22d81..90e5b0a28cb 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -452,7 +452,8 @@ static void ioat2_dma_massage_chan_desc(struct ioat_dma_chan *ioat_chan)
  * ioat_dma_alloc_chan_resources - returns the number of allocated descriptors
  * @chan: the channel to be filled out
  */
-static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
+static int ioat_dma_alloc_chan_resources(struct dma_chan *chan,
+                                         struct dma_client *client)
 {
         struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);
         struct ioat_desc_sw *desc;
@@ -1049,7 +1050,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         dma_chan = container_of(device->common.channels.next,
                                 struct dma_chan,
                                 device_node);
-        if (device->common.device_alloc_chan_resources(dma_chan) < 1) {
+        if (device->common.device_alloc_chan_resources(dma_chan, NULL) < 1) {
                 dev_err(&device->pdev->dev,
                         "selftest cannot allocate chan resource\n");
                 err = -ENODEV;
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 4e6b052c065..b57564dd023 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -444,7 +444,8 @@ static void iop_chan_start_null_memcpy(struct iop_adma_chan *iop_chan);
 static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan);
 
 /* returns the number of allocated descriptors */
-static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
+static int iop_adma_alloc_chan_resources(struct dma_chan *chan,
+                                         struct dma_client *client)
 {
         char *hw_desc;
         int idx;
@@ -838,7 +839,7 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
         dma_chan = container_of(device->common.channels.next,
                                 struct dma_chan,
                                 device_node);
-        if (iop_adma_alloc_chan_resources(dma_chan) < 1) {
+        if (iop_adma_alloc_chan_resources(dma_chan, NULL) < 1) {
                 err = -ENODEV;
                 goto out;
         }
@@ -936,7 +937,7 @@ iop_adma_xor_zero_sum_self_test(struct iop_adma_device *device)
         dma_chan = container_of(device->common.channels.next,
                                 struct dma_chan,
                                 device_node);
-        if (iop_adma_alloc_chan_resources(dma_chan) < 1) {
+        if (iop_adma_alloc_chan_resources(dma_chan, NULL) < 1) {
                 err = -ENODEV;
                 goto out;
         }
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index f0c123ce8ae..8239cfdbc2e 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -588,7 +588,8 @@ submit_done:
 }
 
 /* returns the number of allocated descriptors */
-static int mv_xor_alloc_chan_resources(struct dma_chan *chan)
+static int mv_xor_alloc_chan_resources(struct dma_chan *chan,
+                                       struct dma_client *client)
 {
         char *hw_desc;
         int idx;
@@ -938,7 +939,7 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
         dma_chan = container_of(device->common.channels.next,
                                 struct dma_chan,
                                 device_node);
-        if (mv_xor_alloc_chan_resources(dma_chan) < 1) {
+        if (mv_xor_alloc_chan_resources(dma_chan, NULL) < 1) {
                 err = -ENODEV;
                 goto out;
         }
@@ -1033,7 +1034,7 @@ mv_xor_xor_self_test(struct mv_xor_device *device)
         dma_chan = container_of(device->common.channels.next,
                                 struct dma_chan,
                                 device_node);
-        if (mv_xor_alloc_chan_resources(dma_chan) < 1) {
+        if (mv_xor_alloc_chan_resources(dma_chan, NULL) < 1) {
                 err = -ENODEV;
                 goto out;
         }
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 6432b834322..ba89b0f5056 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -281,7 +281,8 @@ struct dma_device {
         int dev_id;
         struct device *dev;
 
-        int (*device_alloc_chan_resources)(struct dma_chan *chan);
+        int (*device_alloc_chan_resources)(struct dma_chan *chan,
+                        struct dma_client *client);
         void (*device_free_chan_resources)(struct dma_chan *chan);
 
         struct dma_async_tx_descriptor *(*device_prep_dma_memcpy)(