event/dpaa2: fix default queue configuration

[dpdk.git] / drivers / event / dpaa2 / dpaa2_eventdev.c

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index a89d1be..b8cb437 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+ * Copyright 2017,2019 NXP
  */
 
 #include <assert.h>
@@ -35,7 +33,9 @@
 #include <dpaa2_hw_mempool.h>
 #include <dpaa2_hw_dpio.h>
 #include <dpaa2_ethdev.h>
+#ifdef RTE_LIBRTE_SECURITY
 #include <dpaa2_sec_event.h>
+#endif
 #include "dpaa2_eventdev.h"
 #include "dpaa2_eventdev_logs.h"
 #include <portal/dpaa2_hw_pvt.h>
@@ -468,8 +468,7 @@ dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,
        RTE_SET_USED(queue_conf);
 
        queue_conf->nb_atomic_flows = DPAA2_EVENT_QUEUE_ATOMIC_FLOWS;
-       queue_conf->schedule_type = RTE_SCHED_TYPE_ATOMIC |
-                                     RTE_SCHED_TYPE_PARALLEL;
+       queue_conf->schedule_type = RTE_SCHED_TYPE_PARALLEL;
        queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
 }
 
@@ -638,7 +637,7 @@ dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns,
        EVENTDEV_INIT_FUNC_TRACE();
 
        RTE_SET_USED(dev);
-       *timeout_ticks = ns * scale;
+       *timeout_ticks = ns / scale;
 
        return 0;
 }
@@ -795,6 +794,7 @@ dpaa2_eventdev_eth_stop(const struct rte_eventdev *dev,
        return 0;
 }
 
+#ifdef RTE_LIBRTE_SECURITY
 static int
 dpaa2_eventdev_crypto_caps_get(const struct rte_eventdev *dev,
                            const struct rte_cryptodev *cdev,
@@ -937,6 +937,7 @@ dpaa2_eventdev_crypto_stop(const struct rte_eventdev *dev,
 
        return 0;
 }
+#endif
 
 static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .dev_infos_get    = dpaa2_eventdev_info_get,
@@ -959,11 +960,13 @@ static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .eth_rx_adapter_queue_del = dpaa2_eventdev_eth_queue_del,
        .eth_rx_adapter_start = dpaa2_eventdev_eth_start,
        .eth_rx_adapter_stop = dpaa2_eventdev_eth_stop,
+#ifdef RTE_LIBRTE_SECURITY
        .crypto_adapter_caps_get        = dpaa2_eventdev_crypto_caps_get,
        .crypto_adapter_queue_pair_add  = dpaa2_eventdev_crypto_queue_add,
        .crypto_adapter_queue_pair_del  = dpaa2_eventdev_crypto_queue_del,
        .crypto_adapter_start           = dpaa2_eventdev_crypto_start,
        .crypto_adapter_stop            = dpaa2_eventdev_crypto_stop,
+#endif
 };
 
 static int