doc: add af_packet PMD guide

[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 2b85c9e..204a50b 100644 (file)
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -34,6 +34,7 @@
 
 #include <rte_dpaa_bus.h>
 #include <rte_dpaa_logs.h>
+#include <dpaax_iova_table.h>
 
 #include <fsl_usd.h>
 #include <fsl_qman.h>
@@ -46,11 +47,11 @@ int dpaa_logtype_mempool;
 int dpaa_logtype_pmd;
 int dpaa_logtype_eventdev;
 
-struct rte_dpaa_bus rte_dpaa_bus;
+static struct rte_dpaa_bus rte_dpaa_bus;
 struct netcfg_info *dpaa_netcfg;
 
 /* define a variable to hold the portal_key, once created.*/
-pthread_key_t dpaa_portal_key;
+static pthread_key_t dpaa_portal_key;
 
 unsigned int dpaa_svr_family;
 
@@ -165,6 +166,8 @@ dpaa_create_device_list(void)
                        goto cleanup;
                }
 
+               dev->device.bus = &rte_dpaa_bus.bus;
+
                cfg = &dpaa_netcfg->port_cfg[i];
                fman_intf = cfg->fman_if;
 
@@ -178,7 +181,7 @@ dpaa_create_device_list(void)
                memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN);
                sprintf(dev->name, "fm%d-mac%d", (fman_intf->fman_idx + 1),
                        fman_intf->mac_idx);
-               DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name);
+               DPAA_BUS_LOG(INFO, "%s netdev added", dev->name);
                dev->device.name = dev->name;
                dev->device.devargs = dpaa_devargs_lookup(dev);
 
@@ -216,7 +219,7 @@ dpaa_create_device_list(void)
                 */
                memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN);
                sprintf(dev->name, "dpaa-sec%d", i);
-               DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name);
+               DPAA_BUS_LOG(INFO, "%s cryptodev added", dev->name);
                dev->device.name = dev->name;
                dev->device.devargs = dpaa_devargs_lookup(dev);
 
@@ -461,14 +464,11 @@ rte_dpaa_bus_scan(void)
                return 0;
        }
 
-       DPAA_BUS_LOG(DEBUG, "Bus: Address of netcfg=%p, Ethports=%d",
-                    dpaa_netcfg, dpaa_netcfg->num_ethports);
-
 #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
        dump_netcfg(dpaa_netcfg);
 #endif
 
-       DPAA_BUS_LOG(DEBUG, "Number of devices = %d\n",
+       DPAA_BUS_LOG(DEBUG, "Number of ethernet devices = %d",
                     dpaa_netcfg->num_ethports);
        ret = dpaa_create_device_list();
        if (ret) {
@@ -486,9 +486,6 @@ rte_dpaa_bus_scan(void)
                return ret;
        }
 
-       DPAA_BUS_LOG(DEBUG, "dpaa_portal_key=%u, ret=%d\n",
-                   (unsigned int)dpaa_portal_key, ret);
-
        return 0;
 }
 
@@ -545,6 +542,20 @@ rte_dpaa_bus_probe(void)
        unsigned int svr_ver;
        int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST;
 
+       /* If DPAA bus is not present nothing needs to be done */
+       if (TAILQ_EMPTY(&rte_dpaa_bus.device_list))
+               return 0;
+
+       svr_file = fopen(DPAA_SOC_ID_FILE, "r");
+       if (svr_file) {
+               if (fscanf(svr_file, "svr:%x", &svr_ver) > 0)
+                       dpaa_svr_family = svr_ver & SVR_MASK;
+               fclose(svr_file);
+       }
+
+       /* And initialize the PA->VA translation table */
+       dpaax_iova_table_populate();
+
        /* For each registered driver, and device, call the driver->probe */
        TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) {
                TAILQ_FOREACH(drv, &rte_dpaa_bus.driver_list, next) {
@@ -552,6 +563,9 @@ rte_dpaa_bus_probe(void)
                        if (ret)
                                continue;
 
+                       if (rte_dev_is_probed(&dev->device))
+                               continue;
+
                        if (!drv->probe ||
                            (dev->device.devargs &&
                            dev->device.devargs->policy == RTE_DEV_BLACKLISTED))
@@ -562,8 +576,12 @@ rte_dpaa_bus_probe(void)
                            dev->device.devargs->policy ==
                            RTE_DEV_WHITELISTED)) {
                                ret = drv->probe(drv, dev);
-                               if (ret)
+                               if (ret) {
                                        DPAA_BUS_ERR("Unable to probe.\n");
+                               } else {
+                                       dev->driver = drv;
+                                       dev->device.driver = &drv->driver;
+                               }
                        }
                        break;
                }
@@ -572,15 +590,7 @@ rte_dpaa_bus_probe(void)
        /* Register DPAA mempool ops only if any DPAA device has
         * been detected.
         */
-       if (!TAILQ_EMPTY(&rte_dpaa_bus.device_list))
-               rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME);
-
-       svr_file = fopen(DPAA_SOC_ID_FILE, "r");
-       if (svr_file) {
-               if (fscanf(svr_file, "svr:%x", &svr_ver) > 0)
-                       dpaa_svr_family = svr_ver & SVR_MASK;
-               fclose(svr_file);
-       }
+       rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME);
 
        return 0;
 }
@@ -617,7 +627,7 @@ rte_dpaa_get_iommu_class(void)
        return RTE_IOVA_PA;
 }
 
-struct rte_dpaa_bus rte_dpaa_bus = {
+static struct rte_dpaa_bus rte_dpaa_bus = {
        .bus = {
                .scan = rte_dpaa_bus_scan,
                .probe = rte_dpaa_bus_probe,
@@ -632,9 +642,7 @@ struct rte_dpaa_bus rte_dpaa_bus = {
 
 RTE_REGISTER_BUS(FSL_DPAA_BUS_NAME, rte_dpaa_bus.bus);
 
-RTE_INIT(dpaa_init_log);
-static void
-dpaa_init_log(void)
+RTE_INIT(dpaa_init_log)
 {
        dpaa_logtype_bus = rte_log_register("bus.dpaa");
        if (dpaa_logtype_bus >= 0)
@@ -644,11 +652,11 @@ dpaa_init_log(void)
        if (dpaa_logtype_mempool >= 0)
                rte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE);
 
-       dpaa_logtype_pmd = rte_log_register("pmd.dpaa");
+       dpaa_logtype_pmd = rte_log_register("pmd.net.dpaa");
        if (dpaa_logtype_pmd >= 0)
                rte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);
 
-       dpaa_logtype_eventdev = rte_log_register("eventdev.dpaa");
+       dpaa_logtype_eventdev = rte_log_register("pmd.event.dpaa");
        if (dpaa_logtype_eventdev >= 0)
                rte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);
 }