bus/fslmc: set the dpaa2 device name
authorHemant Agrawal <hemant.agrawal@nxp.com>
Tue, 11 Jul 2017 14:55:56 +0000 (20:25 +0530)
committerThomas Monjalon <thomas@monjalon.net>
Fri, 14 Jul 2017 13:55:18 +0000 (15:55 +0200)
rte_eth_dev_allocated expect the device name to be filled.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
drivers/bus/fslmc/fslmc_vfio.c
drivers/bus/fslmc/rte_fslmc.h
drivers/net/dpaa2/dpaa2_ethdev.c

index 725faab..edd9a73 100644 (file)
@@ -551,10 +551,11 @@ int fslmc_vfio_process_group(void)
                        dev->dev_type = (strcmp(object_type, "dpseci")) ?
                                DPAA2_MC_DPNI_DEVID : DPAA2_MC_DPSECI_DEVID;
 
-                       FSLMC_VFIO_LOG(DEBUG, "DPAA2: Added [%s-%d]",
-                                     object_type, object_id);
+                       sprintf(dev->name, "%s.%d", object_type, object_id);
+                       dev->device.name = dev->name;
 
                        fslmc_bus_add_device(dev);
+                       FSLMC_VFIO_LOG(DEBUG, "DPAA2: Added %s", dev->name);
                } else {
                        /* Parse all other objects */
                        struct rte_dpaa2_object *object;
index 4b69d38..e60d6eb 100644 (file)
@@ -78,6 +78,7 @@ struct rte_dpaa2_device {
        uint16_t object_id;             /**< DPAA2 Object ID */
        struct rte_intr_handle intr_handle; /**< Interrupt handle */
        struct rte_dpaa2_driver *driver;    /**< Associated driver */
+       char name[32];          /**< DPAA2 Object name*/
 };
 
 typedef int (*rte_dpaa2_probe_t)(struct rte_dpaa2_driver *dpaa2_drv,
index acedc7c..9666d9d 100644 (file)
@@ -1531,13 +1531,9 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
                struct rte_dpaa2_device *dpaa2_dev)
 {
        struct rte_eth_dev *eth_dev;
-       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
-
        int diag;
 
-       sprintf(ethdev_name, "dpni-%d", dpaa2_dev->object_id);
-
-       eth_dev = rte_eth_dev_allocate(ethdev_name);
+       eth_dev = rte_eth_dev_allocate(dpaa2_dev->device.name);
        if (eth_dev == NULL)
                return -ENOMEM;