replace packed attributes

[dpdk.git] / drivers / net / dpaa / dpaa_rxtx.h

diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h
index 68d2c41..4f896fb 100644 (file)
--- a/drivers/net/dpaa/dpaa_rxtx.h
+++ b/drivers/net/dpaa/dpaa_rxtx.h
@@ -1,34 +1,8 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   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  Freescale Semiconductor, Inc 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 __DPDK_RXTX_H__
@@ -41,6 +15,22 @@
 
 /* IC offsets from buffer header address */
 #define DEFAULT_RX_ICEOF       16
+#define DEFAULT_TX_ICEOF       16
+
+/*
+ * Values for the L3R field of the FM Parse Results
+ */
+/* L3 Type field: First IP Present IPv4 */
+#define DPAA_L3_PARSE_RESULT_IPV4 0x80
+/* L3 Type field: First IP Present IPv6 */
+#define DPAA_L3_PARSE_RESULT_IPV6      0x40
+/* Values for the L4R field of the FM Parse Results
+ * See $8.8.4.7.20 - L4 HXS - L4 Results from DPAA-Rev2 Reference Manual.
+ */
+/* L4 Type field: UDP */
+#define DPAA_L4_PARSE_RESULT_UDP       0x40
+/* L4 Type field: TCP */
+#define DPAA_L4_PARSE_RESULT_TCP       0x20
 
 #define DPAA_MAX_DEQUEUE_NUM_FRAMES    63
        /** <Maximum number of frames to be dequeued in a single rx call*/
@@ -180,8 +170,8 @@ struct dpaa_eth_parse_results_t {
                        uint16_t      vlan:1;
                        uint16_t      ethernet:1;
 #endif
-               } __attribute__((__packed__));
-        } __attribute__((__packed__));
+               } __rte_packed;
+        } __rte_packed;
         union {
                uint16_t              l3r;      /**< Layer 3 result */
                struct {
@@ -208,8 +198,8 @@ struct dpaa_eth_parse_results_t {
                        uint16_t      first_ipv6:1;
                        uint16_t      first_ipv4:1;
 #endif
-               } __attribute__((__packed__));
-        } __attribute__((__packed__));
+               } __rte_packed;
+        } __rte_packed;
         union {
                uint8_t               l4r;      /**< Layer 4 result */
                struct{
@@ -224,8 +214,8 @@ struct dpaa_eth_parse_results_t {
                        uint8_t        l4_info_err:1;
                        uint8_t        l4_type:3;
 #endif
-               } __attribute__((__packed__));
-        } __attribute__((__packed__));
+               } __rte_packed;
+        } __rte_packed;
         uint8_t     cplan;              /**< Classification plan id */
         uint16_t    nxthdr;             /**< Next Header  */
         uint16_t    cksum;              /**< Checksum */
@@ -241,7 +231,7 @@ struct dpaa_eth_parse_results_t {
         uint8_t     gre_off;            /**< GRE offset */
         uint8_t     l4_off;             /**< Layer 4 offset */
         uint8_t     nxthdr_off;         /**< Parser end point */
-} __attribute__ ((__packed__));
+} __rte_packed;
 
 /* The structure is the Prepended Data to the Frame which is used by FMAN */
 struct annotations_t {
@@ -255,7 +245,12 @@ struct annotations_t {
        (struct annotations_t *)(_buf)
 
 #define GET_RX_PRS(_buf) \
-       (struct dpaa_eth_parse_results_t *)((uint8_t *)_buf + DEFAULT_RX_ICEOF)
+       (struct dpaa_eth_parse_results_t *)((uint8_t *)(_buf) + \
+       DEFAULT_RX_ICEOF)
+
+#define GET_TX_PRS(_buf) \
+       (struct dpaa_eth_parse_results_t *)((uint8_t *)(_buf) + \
+       DEFAULT_TX_ICEOF)
 
 uint16_t dpaa_eth_queue_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs);
 
@@ -264,4 +259,18 @@ uint16_t dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs);
 uint16_t dpaa_eth_tx_drop_all(void *q  __rte_unused,
                              struct rte_mbuf **bufs __rte_unused,
                              uint16_t nb_bufs __rte_unused);
+
+struct rte_mbuf *dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid);
+
+int dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
+                          struct qm_fd *fd,
+                          uint32_t bpid);
+
+void dpaa_rx_cb(struct qman_fq **fq,
+               struct qm_dqrr_entry **dqrr, void **bufs, int num_bufs);
+
+void dpaa_rx_cb_prepare(struct qm_dqrr_entry *dq, void **bufs);
+
+void dpaa_rx_cb_no_prefetch(struct qman_fq **fq,
+                   struct qm_dqrr_entry **dqrr, void **bufs, int num_bufs);
 #endif