bus/fslmc: refactor scan and probe functions
[dpdk.git] / drivers / bus / fslmc / fslmc_bus.c
index f71598d..d50c303 100644 (file)
 #include <rte_memcpy.h>
 #include <rte_ethdev.h>
 
-#include "rte_fslmc.h"
-#include "fslmc_vfio.h"
+#include <rte_fslmc.h>
+#include <fslmc_vfio.h>
 
 #define FSLMC_BUS_LOG(level, fmt, args...) \
-       RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args)
+       RTE_LOG(level, EAL, fmt "\n", ##args)
+
+#define VFIO_IOMMU_GROUP_PATH "/sys/kernel/iommu_groups"
 
 struct rte_fslmc_bus rte_fslmc_bus;
 
+static void
+cleanup_fslmc_device_list(void)
+{
+       struct rte_dpaa2_device *dev;
+       struct rte_dpaa2_device *t_dev;
+
+       TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, t_dev) {
+               TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
+               free(dev);
+               dev = NULL;
+       }
+}
+
+static int
+scan_one_fslmc_device(char *dev_name)
+{
+       char *dup_dev_name, *t_ptr;
+       struct rte_dpaa2_device *dev;
+
+       if (!dev_name)
+               return -1;
+
+       /* Ignore the Container name itself */
+       if (!strncmp("dprc", dev_name, 4))
+               return 0;
+
+       /* Creating a temporary copy to perform cut-parse over string */
+       dup_dev_name = strdup(dev_name);
+       if (!dup_dev_name) {
+               FSLMC_BUS_LOG(ERR, "Out of memory.");
+               return -ENOMEM;
+       }
+
+       /* For all other devices, we allocate rte_dpaa2_device.
+        * For those devices where there is no driver, probe would release
+        * the memory associated with the rte_dpaa2_device after necessary
+        * initialization.
+        */
+       dev = calloc(1, sizeof(struct rte_dpaa2_device));
+       if (!dev) {
+               FSLMC_BUS_LOG(ERR, "Out of memory.");
+               free(dup_dev_name);
+               return -ENOMEM;
+       }
+
+       /* Parse the device name and ID */
+       t_ptr = strtok(dup_dev_name, ".");
+       if (!t_ptr) {
+               FSLMC_BUS_LOG(ERR, "Incorrect device string observed.");
+               goto cleanup;
+       }
+       if (!strncmp("dpni", t_ptr, 4))
+               dev->dev_type = DPAA2_ETH;
+       else if (!strncmp("dpseci", t_ptr, 6))
+               dev->dev_type = DPAA2_CRYPTO;
+       else if (!strncmp("dpcon", t_ptr, 5))
+               dev->dev_type = DPAA2_CON;
+       else if (!strncmp("dpbp", t_ptr, 4))
+               dev->dev_type = DPAA2_BPOOL;
+       else if (!strncmp("dpio", t_ptr, 4))
+               dev->dev_type = DPAA2_IO;
+       else if (!strncmp("dpci", t_ptr, 5))
+               dev->dev_type = DPAA2_CI;
+       else if (!strncmp("dpmcp", t_ptr, 5))
+               dev->dev_type = DPAA2_MPORTAL;
+       else
+               dev->dev_type = DPAA2_UNKNOWN;
+
+       t_ptr = strtok(NULL, ".");
+       if (!t_ptr) {
+               FSLMC_BUS_LOG(ERR, "Incorrect device string observed (%s).",
+                             t_ptr);
+               goto cleanup;
+       }
+
+       sscanf(t_ptr, "%hu", &dev->object_id);
+       dev->device.name = strdup(dev_name);
+       if (!dev->device.name) {
+               FSLMC_BUS_LOG(ERR, "Out of memory.");
+               goto cleanup;
+       }
+
+       /* Add device in the fslmc device list */
+       TAILQ_INSERT_TAIL(&rte_fslmc_bus.device_list, dev, next);
+
+       /* Don't need the duplicated device filesystem entry anymore */
+       if (dup_dev_name)
+               free(dup_dev_name);
+
+       return 0;
+cleanup:
+       if (dup_dev_name)
+               free(dup_dev_name);
+       if (dev)
+               free(dev);
+       return -1;
+}
+
 static int
 rte_fslmc_scan(void)
 {
        int ret;
+       int device_count = 0;
+       char fslmc_dirpath[PATH_MAX];
+       DIR *dir;
+       struct dirent *entry;
+       static int process_once;
+       int groupid;
 
-       ret = fslmc_vfio_setup_group();
-       if (ret) {
-               FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup VFIO");
-               return ret;
+       if (process_once) {
+               FSLMC_BUS_LOG(DEBUG,
+                             "Fslmc bus already scanned. Not rescanning");
+               return 0;
        }
+       process_once = 1;
 
-       ret = fslmc_vfio_process_group();
-       if (ret) {
-               FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup devices");
-               return -1;
+       ret = fslmc_get_container_group(&groupid);
+       if (ret != 0)
+               goto scan_fail;
+
+       /* Scan devices on the group */
+       sprintf(fslmc_dirpath, "%s/%d/devices", VFIO_IOMMU_GROUP_PATH,
+               groupid);
+       dir = opendir(fslmc_dirpath);
+       if (!dir) {
+               FSLMC_BUS_LOG(ERR, "Unable to open VFIO group dir.");
+               goto scan_fail;
        }
 
-       RTE_LOG(INFO, EAL, "fslmc: Bus scan completed\n");
+       while ((entry = readdir(dir)) != NULL) {
+               if (entry->d_name[0] == '.' || entry->d_type != DT_LNK)
+                       continue;
+
+               ret = scan_one_fslmc_device(entry->d_name);
+               if (ret != 0) {
+                       /* Error in parsing directory - exit gracefully */
+                       goto scan_fail_cleanup;
+               }
+               device_count += 1;
+       }
+
+       FSLMC_BUS_LOG(INFO, "fslmc: Bus scan completed");
+
+       closedir(dir);
+       return 0;
+
+scan_fail_cleanup:
+       closedir(dir);
+
+       /* Remove all devices in the list */
+       cleanup_fslmc_device_list();
+scan_fail:
+       FSLMC_BUS_LOG(DEBUG, "FSLMC Bus Not Available. Skipping.");
+       /* Irrespective of failure, scan only return success */
        return 0;
 }
 
@@ -88,6 +226,21 @@ rte_fslmc_probe(void)
        struct rte_dpaa2_device *dev;
        struct rte_dpaa2_driver *drv;
 
+       if (TAILQ_EMPTY(&rte_fslmc_bus.device_list))
+               return 0;
+
+       ret = fslmc_vfio_setup_group();
+       if (ret) {
+               FSLMC_BUS_LOG(ERR, "Unable to setup VFIO %d", ret);
+               return 0;
+       }
+
+       ret = fslmc_vfio_process_group();
+       if (ret) {
+               FSLMC_BUS_LOG(ERR, "Unable to setup devices %d", ret);
+               return 0;
+       }
+
        TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) {
                TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) {
                        ret = rte_fslmc_match(drv, dev);
@@ -103,7 +256,8 @@ rte_fslmc_probe(void)
                        break;
                }
        }
-       return ret;
+
+       return 0;
 }
 
 static struct rte_device *