summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cfdbd65)
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
+static int
+bus_name_cmp(const struct rte_bus *bus, const void *name)
+{
+ return strncmp(bus->name, name, strlen(bus->name));
+}
+
/* store a whitelist parameter for later parsing */
int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
struct rte_devargs *devargs = NULL;
/* store a whitelist parameter for later parsing */
int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
struct rte_devargs *devargs = NULL;
+ struct rte_bus *bus = NULL;
+ char *dev = NULL;
+ const char *devname;
int ret;
/* use malloc instead of rte_malloc as it's called early at init */
int ret;
/* use malloc instead of rte_malloc as it's called early at init */
memset(devargs, 0, sizeof(*devargs));
devargs->type = devtype;
memset(devargs, 0, sizeof(*devargs));
devargs->type = devtype;
- if (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))
+ if (rte_eal_parse_devargs_str(devargs_str, &dev, &devargs->args))
+ devname = dev;
+ do {
+ bus = rte_bus_find(bus, bus_name_cmp, dev);
+ if (bus == NULL)
+ break;
+ devname = dev + strlen(bus->name) + 1;
+ if (rte_bus_find_by_device_name(devname) == bus)
+ break;
+ devname = dev;
+ } while (1);
+ if (bus == NULL) {
+ bus = rte_bus_find_by_device_name(devname);
+ if (bus == NULL) {
+ fprintf(stderr, "ERROR: failed to parse bus info from device declaration\n");
+ goto fail;
+ }
+ }
+ devargs->bus = bus;
switch (devargs->type) {
case RTE_DEVTYPE_WHITELISTED_PCI:
case RTE_DEVTYPE_BLACKLISTED_PCI:
/* try to parse pci identifier */
switch (devargs->type) {
case RTE_DEVTYPE_WHITELISTED_PCI:
case RTE_DEVTYPE_BLACKLISTED_PCI:
/* try to parse pci identifier */
- if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
- eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0)
+ if (bus->parse(devname, &devargs->pci.addr) != 0)
goto fail;
break;
case RTE_DEVTYPE_VIRTUAL:
/* save driver name */
ret = snprintf(devargs->virt.drv_name,
goto fail;
break;
case RTE_DEVTYPE_VIRTUAL:
/* save driver name */
ret = snprintf(devargs->virt.drv_name,
- sizeof(devargs->virt.drv_name), "%s", buf);
+ sizeof(devargs->virt.drv_name), "%s", devname);
if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
goto fail;
break;
}
if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
goto fail;
break;
}
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
fail:
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
fail:
if (devargs) {
free(devargs->args);
free(devargs);
if (devargs) {
free(devargs->args);
free(devargs);
return NULL;
devargs->type = RTE_DEVTYPE_VIRTUAL;
return NULL;
devargs->type = RTE_DEVTYPE_VIRTUAL;
+ devargs->bus = rte_bus_find_by_name("vdev");
if (args)
devargs->args = strdup(args);
if (args)
devargs->args = strdup(args);
{
struct rte_vdev_device *dev;
struct rte_devargs *devargs;
{
struct rte_vdev_device *dev;
struct rte_devargs *devargs;
/* for virtual devices we scan the devargs_list populated via cmdline */
/* for virtual devices we scan the devargs_list populated via cmdline */
+ vbus = rte_bus_find_by_name("vdev");
TAILQ_FOREACH(devargs, &devargs_list, next) {
TAILQ_FOREACH(devargs, &devargs_list, next) {
- if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+ if (devargs->bus != vbus)
continue;
dev = find_vdev(devargs->virt.drv_name);
continue;
dev = find_vdev(devargs->virt.drv_name);
#include <stdio.h>
#include <sys/queue.h>
#include <rte_pci.h>
#include <stdio.h>
#include <sys/queue.h>
#include <rte_pci.h>
/**
* Type of generic device
/**
* Type of generic device
char drv_name[RTE_DEV_NAME_MAX_LEN];
} virt;
};
char drv_name[RTE_DEV_NAME_MAX_LEN];
} virt;
};
+ /** Bus handle for the device. */
+ struct rte_bus *bus;
/** Arguments string as given by user or "" for no argument. */
char *args;
};
/** Arguments string as given by user or "" for no argument. */
char *args;
};