net/i40e: remove duplicate tunnel type check

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

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h
index 96524fa..785e520 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -1,8 +1,5 @@
-/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 NXP
  */
 
 #ifndef __DPAA2_EVENTDEV_H__
@@ -16,23 +13,12 @@
 
 #define EVENTDEV_NAME_DPAA2_PMD                event_dpaa2
 
-#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV_DEBUG
-#define PMD_DRV_LOG(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>")
-#else
-#define PMD_DRV_LOG(level, fmt, args...) do { } while (0)
-#define PMD_DRV_FUNC_TRACE() do { } while (0)
-#endif
-
-#define PMD_DRV_ERR(fmt, args...) \
-       RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ## args)
-
 #define DPAA2_EVENT_DEFAULT_DPCI_PRIO 0
 
 #define DPAA2_EVENT_MAX_QUEUES                 16
 #define DPAA2_EVENT_MIN_DEQUEUE_TIMEOUT                1
 #define DPAA2_EVENT_MAX_DEQUEUE_TIMEOUT                (UINT32_MAX - 1)
+#define DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS    100UL
 #define DPAA2_EVENT_MAX_QUEUE_FLOWS            2048
 #define DPAA2_EVENT_MAX_QUEUE_PRIORITY_LEVELS  8
 #define DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS  0
@@ -52,34 +38,42 @@ enum {
 #define RTE_EVENT_ETH_RX_ADAPTER_DPAA2_CAP \
                (RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT | \
                RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ | \
-               RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID)
+               RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID | \
+               RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT)
+
+/**< Crypto Rx adapter cap to return If the packet transfers from
+ * the cryptodev to eventdev with DPAA2 devices.
+ */
+#define RTE_EVENT_CRYPTO_ADAPTER_DPAA2_CAP \
+               (RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW | \
+               RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND | \
+               RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA)
+
 /**< Ethernet Rx adapter cap to return If the packet transfers from
  * the ethdev to eventdev with DPAA2 devices.
  */
 
-struct dpaa2_dpcon_dev {
-       TAILQ_ENTRY(dpaa2_dpcon_dev) next;
-       struct fsl_mc_io dpcon;
-       uint16_t token;
-       rte_atomic16_t in_use;
-       uint32_t dpcon_id;
-       uint16_t qbman_ch_id;
-       uint8_t num_priorities;
-       uint8_t channel_index;
-};
-
-struct evq_info_t {
+struct dpaa2_eventq {
        /* DPcon device */
        struct dpaa2_dpcon_dev *dpcon;
        /* Attached DPCI device */
        struct dpaa2_dpci_dev *dpci;
+       /* Mapped event port */
+       struct dpaa2_io_portal_t *event_port;
        /* Configuration provided by the user */
        uint32_t event_queue_cfg;
-       uint8_t link;
+       uint32_t event_queue_id;
+};
+
+struct dpaa2_port {
+       struct dpaa2_eventq evq_info[DPAA2_EVENT_MAX_QUEUES];
+       uint8_t num_linked_evq;
+       uint8_t is_port_linked;
+       uint64_t timeout_us;
 };
 
 struct dpaa2_eventdev {
-       struct evq_info_t evq_info[DPAA2_EVENT_MAX_QUEUES];
+       struct dpaa2_eventq evq_info[DPAA2_EVENT_MAX_QUEUES];
        uint32_t dequeue_timeout_ns;
        uint8_t max_event_queues;
        uint8_t nb_event_queues;
@@ -94,4 +88,6 @@ struct dpaa2_eventdev {
 struct dpaa2_dpcon_dev *rte_dpaa2_alloc_dpcon_dev(void);
 void rte_dpaa2_free_dpcon_dev(struct dpaa2_dpcon_dev *dpcon);
 
+int test_eventdev_dpaa2(void);
+
 #endif /* __DPAA2_EVENTDEV_H__ */