bus/fslmc: sanitize device name parsing for clarity

[dpdk.git] / drivers / bus / fslmc / fslmc_bus.c

diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index a2f4825..b3e964a 100644 (file)
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2016,2018 NXP
+ *   Copyright 2016,2018-2019 NXP
  *
  */
 
@@ -10,7 +10,6 @@
 
 #include <rte_log.h>
 #include <rte_bus.h>
-#include <rte_eal_memconfig.h>
 #include <rte_malloc.h>
 #include <rte_devargs.h>
 #include <rte_memcpy.h>
@@ -191,6 +190,8 @@ scan_one_fslmc_device(char *dev_name)
                dev->dev_type = DPAA2_QDMA;
        else if (!strncmp("dpdmux", t_ptr, 6))
                dev->dev_type = DPAA2_MUX;
+       else if (!strncmp("dprtc", t_ptr, 5))
+               dev->dev_type = DPAA2_DPRTC;
        else
                dev->dev_type = DPAA2_UNKNOWN;
 
@@ -234,8 +235,9 @@ rte_fslmc_parse(const char *name, void *addr)
 {
        uint16_t dev_id;
        char *t_ptr;
-       char *sep = NULL;
+       const char *sep;
        uint8_t sep_exists = 0;
+       int ret = -1;
 
        DPAA2_BUS_DEBUG("Parsing dev=(%s)", name);
 
@@ -265,10 +267,11 @@ rte_fslmc_parse(const char *name, void *addr)
                } else {
                        DPAA2_BUS_DEBUG("Invalid device for matching (%s).",
                                        name);
+                       ret = -EINVAL;
                        goto err_out;
                }
        } else
-               sep = strdup(name);
+               sep = name;
 
 jump_out:
        /* Validate device name */
@@ -282,23 +285,23 @@ jump_out:
            strncmp("dpdmai", sep, 6) &&
            strncmp("dpdmux", sep, 6)) {
                DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", sep);
+               ret = -EINVAL;
                goto err_out;
        }
 
        t_ptr = strchr(sep, '.');
        if (!t_ptr || sscanf(t_ptr + 1, "%hu", &dev_id) != 1) {
                DPAA2_BUS_ERR("Missing device id in device name (%s)", sep);
+               ret = -EINVAL;
                goto err_out;
        }
 
        if (addr)
                strcpy(addr, sep);
 
-       return 0;
+       ret = 0;
 err_out:
-       if (!sep_exists && sep)
-               free(sep);
-       return -EINVAL;
+       return ret;
 }
 
 static int
@@ -323,8 +326,7 @@ rte_fslmc_scan(void)
                goto scan_fail;
 
        /* Scan devices on the group */
-       snprintf(fslmc_dirpath, sizeof(fslmc_dirpath), "%s/%d/devices",
-                       VFIO_IOMMU_GROUP_PATH, groupid);
+       sprintf(fslmc_dirpath, "%s/%s", SYSFS_FSL_MC_DEVICES, fslmc_container);
        dir = opendir(fslmc_dirpath);
        if (!dir) {
                DPAA2_BUS_ERR("Unable to open VFIO group directory");
@@ -332,7 +334,7 @@ rte_fslmc_scan(void)
        }
 
        while ((entry = readdir(dir)) != NULL) {
-               if (entry->d_name[0] == '.' || entry->d_type != DT_LNK)
+               if (entry->d_name[0] == '.' || entry->d_type != DT_DIR)
                        continue;
 
                ret = scan_one_fslmc_device(entry->d_name);
@@ -393,12 +395,15 @@ rte_fslmc_probe(void)
        /* Map existing segments as well as, in case of hotpluggable memory,
         * install callback handler.
         */
-       ret = rte_fslmc_vfio_dmamap();
-       if (ret) {
-               DPAA2_BUS_ERR("Unable to DMA map existing VAs: (%d)", ret);
-               /* Not continuing ahead */
-               DPAA2_BUS_ERR("FSLMC VFIO Mapping failed");
-               return 0;
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               ret = rte_fslmc_vfio_dmamap();
+               if (ret) {
+                       DPAA2_BUS_ERR("Unable to DMA map existing VAs: (%d)",
+                                     ret);
+                       /* Not continuing ahead */
+                       DPAA2_BUS_ERR("FSLMC VFIO Mapping failed");
+                       return 0;
+               }
        }
 
        ret = fslmc_vfio_process_group();
@@ -419,8 +424,11 @@ rte_fslmc_probe(void)
         *
         * Error is ignored as relevant logs are handled within dpaax and
         * handling for unavailable dpaax table too is transparent to caller.
+        *
+        * And, the IOVA table is only applicable in case of PA mode.
         */
-       dpaax_iova_table_populate();
+       if (rte_eal_iova_mode() == RTE_IOVA_PA)
+               dpaax_iova_table_populate();
 
        TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) {
                TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) {
@@ -517,7 +525,8 @@ rte_fslmc_driver_unregister(struct rte_dpaa2_driver *driver)
        /* Cleanup the PA->VA Translation table; From whereever this function
         * is called from.
         */
-       dpaax_iova_table_depopulate();
+       if (rte_eal_iova_mode() == RTE_IOVA_PA)
+               dpaax_iova_table_depopulate();
 
        TAILQ_REMOVE(&fslmc_bus->driver_list, driver, next);
        /* Update Bus references */