bus/dpaa: enable link state interrupt

[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 591e28c..32e872d 100644 (file)
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2017-2019 NXP
+ *   Copyright 2017-2020 NXP
  *
  */
 /* System headers */
@@ -13,6 +13,7 @@
 #include <pthread.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
+#include <sys/eventfd.h>
 
 #include <rte_byteorder.h>
 #include <rte_common.h>
@@ -42,8 +43,6 @@
 #include <fsl_bman.h>
 #include <netcfg.h>
 
-int dpaa_logtype_bus;
-
 static struct rte_dpaa_bus rte_dpaa_bus;
 struct netcfg_info *dpaa_netcfg;
 
@@ -54,8 +53,7 @@ unsigned int dpaa_svr_family;
 
 #define FSL_DPAA_BUS_NAME      dpaa_bus
 
-RTE_DEFINE_PER_LCORE(bool, dpaa_io);
-RTE_DEFINE_PER_LCORE(struct dpaa_portal_dqrr, held_bufs);
+RTE_DEFINE_PER_LCORE(struct dpaa_portal *, dpaa_io);
 
 struct fm_eth_port_cfg *
 dpaa_get_eth_port_cfg(int dev_id)
@@ -255,7 +253,6 @@ int rte_dpaa_portal_init(void *arg)
 {
        unsigned int cpu, lcore = rte_lcore_id();
        int ret;
-       struct dpaa_portal *dpaa_io_portal;
 
        BUS_INIT_FUNC_TRACE();
 
@@ -290,20 +287,21 @@ int rte_dpaa_portal_init(void *arg)
        DPAA_BUS_LOG(DEBUG, "QMAN thread initialized - CPU=%d lcore=%d",
                     cpu, lcore);
 
-       dpaa_io_portal = rte_malloc(NULL, sizeof(struct dpaa_portal),
+       DPAA_PER_LCORE_PORTAL = rte_malloc(NULL, sizeof(struct dpaa_portal),
                                    RTE_CACHE_LINE_SIZE);
-       if (!dpaa_io_portal) {
+       if (!DPAA_PER_LCORE_PORTAL) {
                DPAA_BUS_LOG(ERR, "Unable to allocate memory");
                bman_thread_finish();
                qman_thread_finish();
                return -ENOMEM;
        }
 
-       dpaa_io_portal->qman_idx = qman_get_portal_index();
-       dpaa_io_portal->bman_idx = bman_get_portal_index();
-       dpaa_io_portal->tid = syscall(SYS_gettid);
+       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);
 
-       ret = pthread_setspecific(dpaa_portal_key, (void *)dpaa_io_portal);
+       ret = pthread_setspecific(dpaa_portal_key,
+                                 (void *)DPAA_PER_LCORE_PORTAL);
        if (ret) {
                DPAA_BUS_LOG(ERR, "pthread_setspecific failed on core %u"
                             " (lcore=%u) with ret: %d", cpu, lcore, ret);
@@ -312,8 +310,6 @@ int rte_dpaa_portal_init(void *arg)
                return ret;
        }
 
-       RTE_PER_LCORE(dpaa_io) = true;
-
        DPAA_BUS_LOG(DEBUG, "QMAN thread initialized");
 
        return 0;
@@ -326,7 +322,7 @@ rte_dpaa_portal_fq_init(void *arg, struct qman_fq *fq)
        u32 sdqcr;
        int ret;
 
-       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
                ret = rte_dpaa_portal_init(arg);
                if (ret < 0) {
                        DPAA_BUS_LOG(ERR, "portal initialization failure");
@@ -369,8 +365,7 @@ dpaa_portal_finish(void *arg)
 
        rte_free(dpaa_io_portal);
        dpaa_io_portal = NULL;
-
-       RTE_PER_LCORE(dpaa_io) = false;
+       DPAA_PER_LCORE_PORTAL = NULL;
 }
 
 static int
@@ -548,6 +543,23 @@ rte_dpaa_bus_dev_build(void)
        return 0;
 }
 
+static int rte_dpaa_setup_intr(struct rte_intr_handle *intr_handle)
+{
+       int fd;
+
+       fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+       if (fd < 0) {
+               DPAA_BUS_ERR("Cannot set up eventfd, error %i (%s)",
+                            errno, strerror(errno));
+               return errno;
+       }
+
+       intr_handle->fd = fd;
+       intr_handle->type = RTE_INTR_HANDLE_EXT;
+
+       return 0;
+}
+
 static int
 rte_dpaa_bus_probe(void)
 {
@@ -595,6 +607,14 @@ rte_dpaa_bus_probe(void)
                fclose(svr_file);
        }
 
+       TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) {
+               if (dev->device_type == FSL_DPAA_ETH) {
+                       ret = rte_dpaa_setup_intr(&dev->intr_handle);
+                       if (ret)
+                               DPAA_BUS_ERR("Error setting up interrupt.\n");
+               }
+       }
+
        /* And initialize the PA->VA translation table */
        dpaax_iova_table_populate();
 
@@ -754,10 +774,4 @@ static struct rte_dpaa_bus rte_dpaa_bus = {
 };
 
 RTE_REGISTER_BUS(FSL_DPAA_BUS_NAME, rte_dpaa_bus.bus);
-
-RTE_INIT(dpaa_init_log)
-{
-       dpaa_logtype_bus = rte_log_register("bus.dpaa");
-       if (dpaa_logtype_bus >= 0)
-               rte_log_set_level(dpaa_logtype_bus, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(dpaa_logtype_bus, bus.dpaa, NOTICE);