bus/dpaa: reduce thread ID syscall usage

[dpdk.git] / drivers / bus / dpaa / dpaa_bus.c

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 3098e23..e499305 100644 (file)
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -12,7 +12,6 @@
 #include <signal.h>
 #include <pthread.h>
 #include <sys/types.h>
-#include <sys/syscall.h>
 #include <sys/eventfd.h>
 
 #include <rte_byteorder.h>
@@ -27,7 +26,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_bus.h>
@@ -314,7 +313,7 @@ int rte_dpaa_portal_init(void *arg)
 
        DPAA_PER_LCORE_PORTAL->qman_idx = qman_get_portal_index();
        DPAA_PER_LCORE_PORTAL->bman_idx = bman_get_portal_index();
-       DPAA_PER_LCORE_PORTAL->tid = syscall(SYS_gettid);
+       DPAA_PER_LCORE_PORTAL->tid = rte_gettid();
 
        ret = pthread_setspecific(dpaa_portal_key,
                                  (void *)DPAA_PER_LCORE_PORTAL);
@@ -385,12 +384,10 @@ dpaa_portal_finish(void *arg)
 }
 
 static int
-rte_dpaa_bus_parse(const char *name, void *out_name)
+rte_dpaa_bus_parse(const char *name, void *out)
 {
-       int i, j;
-       int max_fman = 2, max_macs = 16;
-       char *dup_name;
-       char *sep = NULL;
+       unsigned int i, j;
+       size_t delta;
 
        /* There are two ways of passing device name, with and without
         * separator. "dpaa_bus:fm1-mac3" with separator, and "fm1-mac3"
@@ -399,46 +396,36 @@ rte_dpaa_bus_parse(const char *name, void *out_name)
         */
        DPAA_BUS_DEBUG("Parse device name (%s)", name);
 
-       /* Check for dpaa_bus:fm1-mac3 style */
-       dup_name = strdup(name);
-       sep = strchr(dup_name, ':');
-       if (!sep)
-               /* If not, check for name=fm1-mac3 style */
-               sep = strchr(dup_name, '=');
+       delta = 0;
+       if (strncmp(name, "dpaa_bus:", 9) == 0) {
+               delta = 9;
+       } else if (strncmp(name, "name=", 5) == 0) {
+               delta = 5;
+       }
 
-       if (sep)
-               /* jump over the seprator */
-               sep = (char *) (sep + 1);
-       else
-               sep = dup_name;
-
-       for (i = 0; i < max_fman; i++) {
-               for (j = 0; j < max_macs; j++) {
-                       char fm_name[16];
-                       snprintf(fm_name, 16, "fm%d-mac%d", i, j);
-                       if (strcmp(fm_name, sep) == 0) {
-                               if (out_name)
-                                       strcpy(out_name, sep);
-                               free(dup_name);
-                               return 0;
-                       }
-               }
+       if (sscanf(&name[delta], "fm%u-mac%u", &i, &j) != 2 ||
+           i >= 2 || j >= 16) {
+               return -EINVAL;
        }
 
-       for (i = 0; i < RTE_LIBRTE_DPAA_MAX_CRYPTODEV; i++) {
-               char sec_name[16];
-
-               snprintf(sec_name, 16, "dpaa_sec-%d", i+1);
-               if (strcmp(sec_name, sep) == 0) {
-                       if (out_name)
-                               strcpy(out_name, sep);
-                       free(dup_name);
-                       return 0;
-               }
+       if (out != NULL) {
+               char *out_name = out;
+               const size_t max_name_len = sizeof("fm.-mac..") - 1;
+
+               /* Do not check for truncation, either name ends with
+                * '\0' or the device name is followed by parameters and there
+                * will be a ',' instead. Not copying past this comma is not an
+                * error.
+                */
+               strlcpy(out_name, &name[delta], max_name_len + 1);
+
+               /* Second digit of mac%u could instead be ','. */
+               if ((strlen(out_name) == max_name_len) &&
+                   out_name[max_name_len] == ',')
+                       out_name[max_name_len] = '\0';
        }
 
-       free(dup_name);
-       return -EINVAL;
+       return 0;
 }
 
 #define DPAA_DEV_PATH1 "/sys/devices/platform/soc/soc:fsl,dpaa"
@@ -533,16 +520,18 @@ rte_dpaa_bus_dev_build(void)
        /* Get the interface configurations from device-tree */
        dpaa_netcfg = netcfg_acquire();
        if (!dpaa_netcfg) {
-               DPAA_BUS_LOG(ERR, "netcfg_acquire failed");
+               DPAA_BUS_LOG(ERR,
+                       "netcfg failed: /dev/fsl_usdpaa device not available");
+               DPAA_BUS_WARN(
+                       "Check if you are using USDPAA based device tree");
                return -EINVAL;
        }
 
        RTE_LOG(NOTICE, EAL, "DPAA Bus Detected\n");
 
        if (!dpaa_netcfg->num_ethports) {
-               DPAA_BUS_LOG(INFO, "no network interfaces available");
+               DPAA_BUS_LOG(INFO, "NO DPDK mapped net interfaces available");
                /* This is not an error */
-               return 0;
        }
 
 #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
@@ -594,20 +583,18 @@ rte_dpaa_bus_probe(void)
        /* Device list creation is only done once */
        if (!process_once) {
                rte_dpaa_bus_dev_build();
-               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-                       /* One time load of Qman/Bman drivers */
-                       ret = qman_global_init();
-                       if (ret) {
-                               DPAA_BUS_ERR("QMAN initialization failed: %d",
-                                            ret);
-                               return ret;
-                       }
-                       ret = bman_global_init();
-                       if (ret) {
-                               DPAA_BUS_ERR("BMAN initialization failed: %d",
-                                            ret);
-                               return ret;
-                       }
+               /* One time load of Qman/Bman drivers */
+               ret = qman_global_init();
+               if (ret) {
+                       DPAA_BUS_ERR("QMAN initialization failed: %d",
+                                    ret);
+                       return ret;
+               }
+               ret = bman_global_init();
+               if (ret) {
+                       DPAA_BUS_ERR("BMAN initialization failed: %d",
+                                    ret);
+                       return ret;
                }
        }
        process_once = 1;
@@ -789,4 +776,4 @@ static struct rte_dpaa_bus rte_dpaa_bus = {
 };
 
 RTE_REGISTER_BUS(FSL_DPAA_BUS_NAME, rte_dpaa_bus.bus);
-RTE_LOG_REGISTER(dpaa_logtype_bus, bus.dpaa, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(dpaa_logtype_bus, NOTICE);