ethdev: add device type

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index b702039..b5e476f 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -227,7 +227,7 @@ rte_eth_dev_find_free_port(void)
 }
 
 struct rte_eth_dev *
-rte_eth_dev_allocate(const char *name)
+rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type)
 {
        uint8_t port_id;
        struct rte_eth_dev *eth_dev;
@@ -251,10 +251,40 @@ rte_eth_dev_allocate(const char *name)
        snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name);
        eth_dev->data->port_id = port_id;
        eth_dev->attached = DEV_ATTACHED;
+       eth_dev->dev_type = type;
        nb_ports++;
        return eth_dev;
 }
 
+static inline int
+rte_eth_dev_create_unique_device_name(char *name, size_t size,
+               struct rte_pci_device *pci_dev)
+{
+       int ret;
+
+       if ((name == NULL) || (pci_dev == NULL))
+               return -EINVAL;
+
+       ret = snprintf(name, size, "%d:%d.%d",
+                       pci_dev->addr.bus, pci_dev->addr.devid,
+                       pci_dev->addr.function);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+int
+rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
+{
+       if (eth_dev == NULL)
+               return -EINVAL;
+
+       eth_dev->attached = 0;
+       nb_ports--;
+       return 0;
+}
+
 static int
 rte_eth_dev_init(struct rte_pci_driver *pci_drv,
                 struct rte_pci_device *pci_dev)
@@ -268,10 +298,10 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_drv = (struct eth_driver *)pci_drv;
 
        /* Create unique Ethernet device name using PCI address */
-       snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "%d:%d.%d",
-                       pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
 
-       eth_dev = rte_eth_dev_allocate(ethdev_name);
+       eth_dev = rte_eth_dev_allocate(ethdev_name, RTE_ETH_DEV_PCI);
        if (eth_dev == NULL)
                return -ENOMEM;
 
@@ -310,6 +340,47 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        return diag;
 }
 
+static int
+rte_eth_dev_uninit(struct rte_pci_device *pci_dev)
+{
+       const struct eth_driver *eth_drv;
+       struct rte_eth_dev *eth_dev;
+       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       /* Create unique Ethernet device name using PCI address */
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
+
+       eth_dev = rte_eth_dev_allocated(ethdev_name);
+       if (eth_dev == NULL)
+               return -ENODEV;
+
+       eth_drv = (const struct eth_driver *)pci_dev->driver;
+
+       /* Invoke PMD device uninit function */
+       if (*eth_drv->eth_dev_uninit) {
+               ret = (*eth_drv->eth_dev_uninit)(eth_drv, eth_dev);
+               if (ret)
+                       return ret;
+       }
+
+       /* free ether device */
+       rte_eth_dev_release_port(eth_dev);
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               rte_free(eth_dev->data->dev_private);
+
+       eth_dev->pci_dev = NULL;
+       eth_dev->driver = NULL;
+       eth_dev->data = NULL;
+
+       return 0;
+}
+
 /**
  * Register an Ethernet [Poll Mode] driver.
  *
@@ -328,6 +399,7 @@ void
 rte_eth_driver_register(struct eth_driver *eth_drv)
 {
        eth_drv->pci_drv.devinit = rte_eth_dev_init;
+       eth_drv->pci_drv.devuninit = rte_eth_dev_uninit;
        rte_eal_pci_register(&eth_drv->pci_drv);
 }