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. */
return dev->driver != NULL;
}
-int rte_eal_dev_attach(const char *name, const char *devargs)
-{
- struct rte_bus *bus;
-
- if (name == NULL || devargs == NULL) {
- RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
- return -EINVAL;
- }
-
- bus = rte_bus_find_by_device_name(name);
- if (bus == NULL) {
- RTE_LOG(ERR, EAL, "Unable to find a bus for the device '%s'\n",
- name);
- return -EINVAL;
- }
- if (strcmp(bus->name, "pci") == 0 || strcmp(bus->name, "vdev") == 0)
- return rte_eal_hotplug_add(bus->name, name, devargs);
-
- RTE_LOG(ERR, EAL,
- "Device attach is only supported for PCI and vdev devices.\n");
-
- return -ENOTSUP;
-}
-
-int rte_eal_dev_detach(struct rte_device *dev)
-{
- struct rte_bus *bus;
- int ret;
-
- if (dev == NULL) {
- RTE_LOG(ERR, EAL, "Invalid device provided.\n");
- return -EINVAL;
- }
-
- bus = rte_bus_find_by_device(dev);
- if (bus == NULL) {
- RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
- dev->name);
- return -EINVAL;
- }
-
- if (bus->unplug == NULL) {
- RTE_LOG(ERR, EAL, "Bus function not supported\n");
- return -ENOTSUP;
- }
-
- ret = bus->unplug(dev);
- if (ret)
- RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
- dev->name);
- return ret;
-}
-
/* helper function to build devargs, caller should free the memory */
static int
build_devargs(const char *busname, const char *devname,
goto err_devarg;
}
- ret = rte_devargs_insert(da);
+ ret = rte_devargs_insert(&da);
if (ret)
goto err_devarg;
+ /* the rte_devargs will be referenced in the matching rte_device */
ret = da->bus->scan();
if (ret)
goto err_devarg;
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;
}
-int __rte_experimental
+int
rte_dev_probe(const char *devargs)
{
struct eal_dev_mp_req req;
if (ret) {
RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
dev->name);
- return ret;
+ return (ret < 0) ? ret : -ENOENT;
}
return 0;
}
-int __rte_experimental
+int
rte_dev_remove(struct rte_device *dev)
{
struct eal_dev_mp_req req;
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)
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);
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)
*/
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)
{
rte_spinlock_unlock(&dev_event_lock);
}
-__rte_experimental
int
rte_dev_iterator_init(struct rte_dev_iterator *it,
const char *dev_str)
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;
it->device = dev;
return dev == NULL;
}
-__rte_experimental
struct rte_device *
rte_dev_iterator_next(struct rte_dev_iterator *it)
{
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);
+}
git.droids-corp.org / dpdk.git / blobdiff