doc: add Meson coding style to contributors guide

[dpdk.git] / lib / librte_eal / common / eal_common_dev.c

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 1fdc9ab..148a238 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -76,7 +76,7 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name)
        return strcmp(dev->name, name);
 }
 
-int __rte_experimental
+int
 rte_dev_is_probed(const struct rte_device *dev)
 {
        /* The field driver should be set only when the probe is successful. */
@@ -166,24 +166,27 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)
                ret = -ENODEV;
                goto err_devarg;
        }
+       /* Since there is a matching device, it is now its responsibility
+        * to manage the devargs we've just inserted. From this point
+        * those devargs shouldn't be removed manually anymore.
+        */
 
        ret = dev->bus->plug(dev);
-       if (ret) {
-               if (rte_dev_is_probed(dev)) /* if already succeeded earlier */
-                       return ret; /* no rollback */
+       if (ret > 0)
+               ret = -ENOTSUP;
+
+       if (ret && !rte_dev_is_probed(dev)) { /* if hasn't ever succeeded */
                RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
                        dev->name);
-               goto err_devarg;
+               return ret;
        }
 
        *new_dev = dev;
-       return 0;
+       return ret;
 
 err_devarg:
-       if (rte_devargs_remove(da) != 0) {
-               free(da->args);
-               free(da);
-       }
+       if (rte_devargs_remove(da) != 0)
+               rte_devargs_reset(da);
        return ret;
 }
 
@@ -317,7 +320,7 @@ local_dev_remove(struct rte_device *dev)
        if (ret) {
                RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
                        dev->name);
-               return ret;
+               return (ret < 0) ? ret : -ENOENT;
        }
 
        return 0;
@@ -420,7 +423,7 @@ rollback:
        return ret;
 }
 
-int __rte_experimental
+int
 rte_dev_event_callback_register(const char *device_name,
                                rte_dev_event_cb_fn cb_fn,
                                void *cb_arg)
@@ -475,7 +478,9 @@ rte_dev_event_callback_register(const char *device_name,
                RTE_LOG(ERR, EAL,
                        "The callback is already exist, no need "
                        "to register again.\n");
+               event_cb = NULL;
                ret = -EEXIST;
+               goto error;
        }
 
        rte_spinlock_unlock(&dev_event_lock);
@@ -486,7 +491,7 @@ error:
        return ret;
 }
 
-int __rte_experimental
+int
 rte_dev_event_callback_unregister(const char *device_name,
                                  rte_dev_event_cb_fn cb_fn,
                                  void *cb_arg)
@@ -521,17 +526,24 @@ rte_dev_event_callback_unregister(const char *device_name,
                 */
                if (event_cb->active == 0) {
                        TAILQ_REMOVE(&dev_event_cbs, event_cb, next);
+                       free(event_cb->dev_name);
                        free(event_cb);
                        ret++;
                } else {
-                       continue;
+                       ret = -EAGAIN;
+                       break;
                }
        }
+
+       /* this callback is not be registered */
+       if (ret == 0)
+               ret = -ENOENT;
+
        rte_spinlock_unlock(&dev_event_lock);
        return ret;
 }
 
-void __rte_experimental
+void
 rte_dev_event_callback_process(const char *device_name,
                               enum rte_dev_event_type event)
 {
@@ -557,7 +569,6 @@ rte_dev_event_callback_process(const char *device_name,
        rte_spinlock_unlock(&dev_event_lock);
 }
 
-__rte_experimental
 int
 rte_dev_iterator_init(struct rte_dev_iterator *it,
                      const char *dev_str)
@@ -573,7 +584,8 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,
        it->bus_str = NULL;
        it->cls_str = NULL;
 
-       devargs.data = dev_str;
+       /* Setting data field implies no malloc in parsing. */
+       devargs.data = (void *)(intptr_t)dev_str;
        if (rte_devargs_layers_parse(&devargs, dev_str))
                goto get_out;
 
@@ -710,7 +722,6 @@ end:
        it->device = dev;
        return dev == NULL;
 }
-__rte_experimental
 struct rte_device *
 rte_dev_iterator_next(struct rte_dev_iterator *it)
 {
@@ -754,3 +765,37 @@ out:
        free(cls_str);
        return it->device;
 }
+
+int
+rte_dev_dma_map(struct rte_device *dev, void *addr, uint64_t iova,
+               size_t len)
+{
+       if (dev->bus->dma_map == NULL || len == 0) {
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+       /* Memory must be registered through rte_extmem_* APIs */
+       if (rte_mem_virt2memseg_list(addr) == NULL) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+
+       return dev->bus->dma_map(dev, addr, iova, len);
+}
+
+int
+rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova,
+                 size_t len)
+{
+       if (dev->bus->dma_unmap == NULL || len == 0) {
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+       /* Memory must be registered through rte_extmem_* APIs */
+       if (rte_mem_virt2memseg_list(addr) == NULL) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+
+       return dev->bus->dma_unmap(dev, addr, iova, len);
+}