mbuf: add namespace to offload flags

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

diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index 6a6477a..6fdd57d 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -9,7 +9,7 @@
 
 /* System headers */
 #include <stdbool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_event_eth_rx_adapter.h>
 
 #include <fsl_usd.h>
@@ -22,13 +22,6 @@
 #define DPAA_MBUF_HW_ANNOTATION                64
 #define DPAA_FD_PTA_SIZE               64
 
-/* mbuf->seqn will be used to store event entry index for
- * driver specific usage. For parallel mode queues, invalid
- * index will be set and for atomic mode queues, valid value
- * ranging from 1 to 16.
- */
-#define DPAA_INVALID_MBUF_SEQN  0
-
 /* we will re-use the HEADROOM for annotation in RX */
 #define DPAA_HW_BUF_RESERVE    0
 #define DPAA_PACKET_LAYOUT_ALIGN       64
@@ -58,11 +51,15 @@
 #define VLAN_TAG_SIZE   4 /** < Vlan Header Length */
 #endif
 
+#define DPAA_ETH_MAX_LEN (RTE_ETHER_MTU + \
+                         RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \
+                         VLAN_TAG_SIZE)
+
 /* PCD frame queues */
-#define DPAA_PCD_FQID_START            0x400
-#define DPAA_PCD_FQID_MULTIPLIER       0x100
 #define DPAA_DEFAULT_NUM_PCD_QUEUES    1
-#define DPAA_MAX_NUM_PCD_QUEUES                4
+#define DPAA_VSP_PROFILE_MAX_NUM       8
+#define DPAA_MAX_NUM_PCD_QUEUES        DPAA_VSP_PROFILE_MAX_NUM
+/*Same as VSP profile number*/
 
 #define DPAA_IF_TX_PRIORITY            3
 #define DPAA_IF_RX_PRIORITY            0
@@ -77,16 +74,15 @@
 #define DPAA_DEBUG_FQ_TX_ERROR   1
 
 #define DPAA_RSS_OFFLOAD_ALL ( \
-       ETH_RSS_L2_PAYLOAD | \
-       ETH_RSS_IP | \
-       ETH_RSS_UDP | \
-       ETH_RSS_TCP | \
-       ETH_RSS_SCTP)
+       RTE_ETH_RSS_L2_PAYLOAD | \
+       RTE_ETH_RSS_IP | \
+       RTE_ETH_RSS_UDP | \
+       RTE_ETH_RSS_TCP | \
+       RTE_ETH_RSS_SCTP)
 
-#define DPAA_TX_CKSUM_OFFLOAD_MASK (             \
-               PKT_TX_IP_CKSUM |                \
-               PKT_TX_TCP_CKSUM |               \
-               PKT_TX_UDP_CKSUM)
+#define DPAA_TX_CKSUM_OFFLOAD_MASK (RTE_MBUF_F_TX_IP_CKSUM |                \
+               RTE_MBUF_F_TX_TCP_CKSUM |               \
+               RTE_MBUF_F_TX_UDP_CKSUM)
 
 /* DPAA Frame descriptor macros */
 
@@ -103,6 +99,10 @@
 #define DPAA_FD_CMD_CFQ                        0x00ffffff
 /**< Confirmation Frame Queue */
 
+#define DPAA_DEFAULT_RXQ_VSP_ID                1
+
+#define FMC_FILE "/tmp/fmc.bin"
+
 /* Each network interface is represented by one of these */
 struct dpaa_if {
        int valid;
@@ -111,13 +111,20 @@ struct dpaa_if {
        struct qman_fq *rx_queues;
        struct qman_cgr *cgr_rx;
        struct qman_fq *tx_queues;
+       struct qman_cgr *cgr_tx;
        struct qman_fq debug_queues[2];
        uint16_t nb_rx_queues;
        uint16_t nb_tx_queues;
        uint32_t ifid;
-       struct fman_if *fif;
        struct dpaa_bp_info *bp_info;
        struct rte_eth_fc_conf *fc_conf;
+       void *port_handle;
+       void *netenv_handle;
+       void *scheme_handle[2];
+       uint32_t scheme_count;
+
+       void *vsp_handle[DPAA_VSP_PROFILE_MAX_NUM];
+       uint32_t vsp_bpid[DPAA_VSP_PROFILE_MAX_NUM];
 };
 
 struct dpaa_if_stats {