log: redefine logtype values

[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 1194419..12a2286 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -32,6 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 #include <sys/queue.h>
@@ -40,12 +41,16 @@
 #include <rte_devargs.h>
 #include <rte_debug.h>
 #include <rte_devargs.h>
+#include <rte_log.h>
 
 #include "eal_private.h"
 
 /** Global list of device drivers. */
 static struct rte_driver_list dev_driver_list =
        TAILQ_HEAD_INITIALIZER(dev_driver_list);
+/** Global list of device drivers. */
+static struct rte_device_list dev_device_list =
+       TAILQ_HEAD_INITIALIZER(dev_device_list);
 
 /* register a driver */
 void
@@ -61,71 +66,63 @@ rte_eal_driver_unregister(struct rte_driver *driver)
        TAILQ_REMOVE(&dev_driver_list, driver, next);
 }
 
-int
-rte_eal_dev_init(uint8_t init_pri)
+void rte_eal_device_insert(struct rte_device *dev)
+{
+       RTE_VERIFY(dev->name);
+       RTE_VERIFY(dev->name[0] != '\0');
+
+       TAILQ_INSERT_TAIL(&dev_device_list, dev, next);
+}
+
+void rte_eal_device_remove(struct rte_device *dev)
 {
-       struct rte_devargs *devargs;
-       struct rte_driver *driver;
-
-       /*
-        * Note that the dev_driver_list is populated here
-        * from calls made to rte_eal_driver_register from constructor functions
-        * embedded into PMD modules via the PMD_REGISTER_DRIVER macro
-        */
-
-       /* call the init function for each virtual device */
-       TAILQ_FOREACH(devargs, &devargs_list, next) {
-
-               if (devargs->type != RTE_DEVTYPE_VIRTUAL)
-                       continue;
-
-               TAILQ_FOREACH(driver, &dev_driver_list, next) {
-                       /* RTE_DEVTYPE_VIRTUAL can only be a virtual or bonded device,
-                        * virtual devices are initialized pre PCI probing and bonded
-                        * device are post pci probing */
-                       if ((driver->type == PMD_VDEV && init_pri ==
-                                       PMD_INIT_PRE_PCI_PROBE) ||
-                               (driver->type == PMD_BDEV && init_pri ==
-                                               PMD_INIT_POST_PCI_PROBE)) {
-
-                               /* search a driver prefix in virtual device name */
-                               if (!strncmp(driver->name, devargs->virtual.drv_name,
-                                               strlen(driver->name))) {
-                                       printf("init (%u) %s\n", init_pri, devargs->virtual.drv_name);
-                                       driver->init(devargs->virtual.drv_name,
-                                               devargs->args);
-                                       break;
-                               }
-                       }
-               }
-
-               /* If initializing pre PCI probe, then we don't expect a bonded driver
-                * to be found */
-               if (init_pri == PMD_INIT_PRE_PCI_PROBE &&
-                               strncmp(PMD_BOND_NAME, devargs->virtual.drv_name,
-                                       strlen(PMD_BOND_NAME)) != 0) {
-                       if (driver == NULL) {
-                               rte_panic("no driver found for virtual device %s\n",
-                                       devargs->virtual.drv_name);
-                       }
-               } else if (init_pri == PMD_INIT_POST_PCI_PROBE &&
-                               strncmp(PMD_BOND_NAME, devargs->virtual.drv_name,
-                                       strlen(PMD_BOND_NAME)) == 0) {
-                       if (driver == NULL) {
-                               rte_panic("no driver found for bonded device %s\n",
-                                       devargs->virtual.drv_name);
-                       }
-               }
+       TAILQ_REMOVE(&dev_device_list, dev, next);
+}
+
+int rte_eal_dev_attach(const char *name, const char *devargs)
+{
+       struct rte_pci_addr addr;
+
+       if (name == NULL || devargs == NULL) {
+               RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
+               return -EINVAL;
        }
 
-       /* Once the vdevs are initialized, start calling all the pdev drivers */
-       if (init_pri == PMD_INIT_PRE_PCI_PROBE) {
-               TAILQ_FOREACH(driver, &dev_driver_list, next) {
-                       if (driver->type != PMD_PDEV)
-                               continue;
-                       /* PDEV drivers don't get passed any parameters */
-                       driver->init(NULL, NULL);
-               }
+       if (eal_parse_pci_DomBDF(name, &addr) == 0) {
+               if (rte_eal_pci_probe_one(&addr) < 0)
+                       goto err;
+
+       } else {
+               if (rte_eal_vdev_init(name, devargs))
+                       goto err;
        }
+
        return 0;
+
+err:
+       RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n", name);
+       return -EINVAL;
+}
+
+int rte_eal_dev_detach(const char *name)
+{
+       struct rte_pci_addr addr;
+
+       if (name == NULL) {
+               RTE_LOG(ERR, EAL, "Invalid device provided.\n");
+               return -EINVAL;
+       }
+
+       if (eal_parse_pci_DomBDF(name, &addr) == 0) {
+               if (rte_eal_pci_detach(&addr) < 0)
+                       goto err;
+       } else {
+               if (rte_eal_vdev_uninit(name))
+                       goto err;
+       }
+       return 0;
+
+err:
+       RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", name);
+       return -EINVAL;
 }