dmaengine: Add metadata_ops for dma_async_tx_descriptor

[rpmsg/hwspinlock.git] / drivers / dma / dmaengine.c

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 272bed6c8ba79d17cff68cf54d9b0aae20a28546..27b6d7c2d8a07aab4e10aff4e3a6aac5066bfd41 100644 (file)
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev)
 
        chan_dev = container_of(dev, typeof(*chan_dev), device);
        if (atomic_dec_and_test(chan_dev->idr_ref)) {
-               mutex_lock(&dma_list_mutex);
-               ida_remove(&dma_ida, chan_dev->dev_id);
-               mutex_unlock(&dma_list_mutex);
+               ida_free(&dma_ida, chan_dev->dev_id);
                kfree(chan_dev->idr_ref);
        }
        kfree(chan_dev);
@@ -898,17 +896,12 @@ static bool device_has_all_tx_types(struct dma_device *device)
 
 static int get_dma_id(struct dma_device *device)
 {
-       int rc;
-
-       do {
-               if (!ida_pre_get(&dma_ida, GFP_KERNEL))
-                       return -ENOMEM;
-               mutex_lock(&dma_list_mutex);
-               rc = ida_get_new(&dma_ida, &device->dev_id);
-               mutex_unlock(&dma_list_mutex);
-       } while (rc == -EAGAIN);
+       int rc = ida_alloc(&dma_ida, GFP_KERNEL);
 
-       return rc;
+       if (rc < 0)
+               return rc;
+       device->dev_id = rc;
+       return 0;
 }
 
 /**
@@ -1092,9 +1085,7 @@ int dma_async_device_register(struct dma_device *device)
 err_out:
        /* if we never registered a channel just release the idr */
        if (atomic_read(idr_ref) == 0) {
-               mutex_lock(&dma_list_mutex);
-               ida_remove(&dma_ida, device->dev_id);
-               mutex_unlock(&dma_list_mutex);
+               ida_free(&dma_ida, device->dev_id);
                kfree(idr_ref);
                return rc;
        }
@@ -1315,6 +1306,79 @@ void dma_async_tx_descriptor_init(struct dma_async_tx_descriptor *tx,
 }
 EXPORT_SYMBOL(dma_async_tx_descriptor_init);
 
+static inline int desc_check_and_set_metadata_mode(
+       struct dma_async_tx_descriptor *desc, enum dma_desc_metadata_mode mode)
+{
+       /* Make sure that the metadata mode is not mixed */
+       if (!desc->desc_metadata_mode) {
+               if (dmaengine_is_metadata_mode_supported(desc->chan, mode))
+                       desc->desc_metadata_mode = mode;
+               else
+                       return -ENOTSUPP;
+       } else if (desc->desc_metadata_mode != mode) {
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+int dmaengine_desc_attach_metadata(struct dma_async_tx_descriptor *desc,
+                                  void *data, size_t len)
+{
+       int ret;
+
+       if (!desc)
+               return -EINVAL;
+
+       ret = desc_check_and_set_metadata_mode(desc, DESC_METADATA_CLIENT);
+       if (ret)
+               return ret;
+
+       if (!desc->metadata_ops || !desc->metadata_ops->attach)
+               return -ENOTSUPP;
+
+       return desc->metadata_ops->attach(desc, data, len);
+}
+EXPORT_SYMBOL_GPL(dmaengine_desc_attach_metadata);
+
+void *dmaengine_desc_get_metadata_ptr(struct dma_async_tx_descriptor *desc,
+                                     size_t *payload_len, size_t *max_len)
+{
+       int ret;
+
+       if (!desc)
+               return ERR_PTR(-EINVAL);
+
+       ret = desc_check_and_set_metadata_mode(desc, DESC_METADATA_ENGINE);
+       if (ret)
+               return ERR_PTR(ret);
+
+       if (!desc->metadata_ops || !desc->metadata_ops->get_ptr)
+               return ERR_PTR(-ENOTSUPP);
+
+       return desc->metadata_ops->get_ptr(desc, payload_len, max_len);
+}
+EXPORT_SYMBOL_GPL(dmaengine_desc_get_metadata_ptr);
+
+int dmaengine_desc_set_metadata_len(struct dma_async_tx_descriptor *desc,
+                                   size_t payload_len)
+{
+       int ret;
+
+       if (!desc)
+               return -EINVAL;
+
+       ret = desc_check_and_set_metadata_mode(desc, DESC_METADATA_ENGINE);
+       if (ret)
+               return ret;
+
+       if (!desc->metadata_ops || !desc->metadata_ops->set_len)
+               return -ENOTSUPP;
+
+       return desc->metadata_ops->set_len(desc, payload_len);
+}
+EXPORT_SYMBOL_GPL(dmaengine_desc_set_metadata_len);
+
 /* dma_wait_for_async_tx - spin wait for a transaction to complete
  * @tx: in-flight transaction to wait on
  */