New upstream version 18.11-rc1

[deb_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 ae8e07e..c847b3e 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -1,33 +1,8 @@
 /*
- *   BSD LICENSE
+ * SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2017 NXP.
+ *   Copyright 2017 NXP
  *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of NXP nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef __DPAA2_EVENTDEV_H__
@@ -41,23 +16,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
@@ -78,6 +42,15 @@ enum {
                (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)
+
+/**< 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.
  */
@@ -93,18 +66,27 @@ struct dpaa2_dpcon_dev {
        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;