net/iavf: fix pointer of meta data

[dpdk.git] / drivers / net / hinic / hinic_pmd_ethdev.h

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.h b/drivers/net/hinic/hinic_pmd_ethdev.h
index 3322fb9..8f1b3d5 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.h
+++ b/drivers/net/hinic/hinic_pmd_ethdev.h
@@ -7,6 +7,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
+#include <ethdev_driver.h>
 
 #include "base/hinic_compat.h"
 #include "base/hinic_pmd_cfg.h"
@@ -31,6 +32,23 @@
 #define HINIC_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
 #define HINIC_VFTA_SIZE            (4096 / HINIC_UINT32_BIT_SIZE)
 
+#define HINIC_MAX_MTU_SIZE              9600
+#define HINIC_MIN_MTU_SIZE              256
+
+#define HINIC_VLAN_TAG_SIZE             4
+#define HINIC_ETH_OVERHEAD \
+       (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + HINIC_VLAN_TAG_SIZE * 2)
+
+#define HINIC_MIN_FRAME_SIZE        (HINIC_MIN_MTU_SIZE + HINIC_ETH_OVERHEAD)
+#define HINIC_MAX_JUMBO_FRAME_SIZE  (HINIC_MAX_MTU_SIZE + HINIC_ETH_OVERHEAD)
+
+#define HINIC_MTU_TO_PKTLEN(mtu)    ((mtu) + HINIC_ETH_OVERHEAD)
+
+#define HINIC_PKTLEN_TO_MTU(pktlen) ((pktlen) - HINIC_ETH_OVERHEAD)
+
+/* The max frame size with default MTU */
+#define HINIC_ETH_MAX_LEN           (RTE_ETHER_MTU + HINIC_ETH_OVERHEAD)
+
 enum hinic_dev_status {
        HINIC_DEV_INIT,
        HINIC_DEV_CLOSE,
@@ -53,11 +71,13 @@ struct hinic_5tuple_filter_info {
         * used when more than one filter matches.
         */
        uint8_t priority;
-       uint8_t dst_ip_mask:1, /* if mask is 1b, do not compare dst ip. */
-               src_ip_mask:1, /* if mask is 1b, do not compare src ip. */
-               dst_port_mask:1, /* if mask is 1b, do not compare dst port. */
-               src_port_mask:1, /* if mask is 1b, do not compare src port. */
-               proto_mask:1; /* if mask is 1b, do not compare protocol. */
+
+       /* if mask is 1b, do not compare the response bit domain */
+       uint8_t dst_ip_mask:1,
+               src_ip_mask:1,
+               dst_port_mask:1,
+               src_port_mask:1,
+               proto_mask:1;
 };
 
 /* 5tuple filter structure */
@@ -99,6 +119,7 @@ struct hinic_hw_fdir_mask {
        uint16_t tunnel_flag;
        uint16_t tunnel_inner_src_port_mask;
        uint16_t tunnel_inner_dst_port_mask;
+       uint16_t dst_ipv6_mask;
 };
 
 /* Flow Director attribute */
@@ -111,6 +132,7 @@ struct hinic_atr_input {
        uint16_t tunnel_flag;
        uint16_t tunnel_inner_src_port;
        uint16_t tunnel_inner_dst_port;
+       uint8_t  dst_ipv6[16];
 };
 
 enum hinic_fdir_mode {
@@ -191,9 +213,60 @@ struct tag_tcam_key_mem {
 #endif
 };
 
+struct tag_tcam_key_ipv6_mem {
+#if (RTE_BYTE_ORDER == RTE_BIG_ENDIAN)
+               u32 rsvd0:16;
+               u32 ipv6_flag:1;
+               u32 protocol:7;
+               u32 function_id:8;
+
+               u32 dst_port:16;
+               u32 ipv6_key0:16;
+
+               u32 ipv6_key1:16;
+               u32 ipv6_key2:16;
+
+               u32 ipv6_key3:16;
+               u32 ipv6_key4:16;
+
+               u32 ipv6_key5:16;
+               u32 ipv6_key6:16;
+
+               u32 ipv6_key7:16;
+               u32 rsvd2:16;
+#else
+               u32 function_id:8;
+               u32 protocol:7;
+               u32 ipv6_flag:1;
+               u32 rsvd0:16;
+
+               u32 ipv6_key0:16;
+               u32 dst_port:16;
+
+               u32 ipv6_key2:16;
+               u32 ipv6_key1:16;
+
+               u32 ipv6_key4:16;
+               u32 ipv6_key3:16;
+
+               u32 ipv6_key6:16;
+               u32 ipv6_key5:16;
+
+               u32 rsvd2:16;
+               u32 ipv6_key7:16;
+#endif
+};
+
 struct tag_tcam_key {
-       struct tag_tcam_key_mem key_info;
-       struct tag_tcam_key_mem key_mask;
+       union {
+               struct tag_tcam_key_mem key_info;
+               struct tag_tcam_key_ipv6_mem key_info_ipv6;
+       };
+
+       union {
+               struct tag_tcam_key_mem key_mask;
+               struct tag_tcam_key_ipv6_mem key_mask_ipv6;
+       };
 };
 
 struct hinic_fdir_rule {
@@ -274,7 +347,8 @@ struct hinic_nic_dev {
        unsigned int flags;
        struct nic_service_cap nic_cap;
        u32 rx_mode_status;     /* promisc or allmulticast */
-       unsigned long dev_status;
+       pthread_mutex_t rx_mode_mutex;
+       u32 dev_status;
 
        char proc_dev_name[HINIC_DEV_NAME_LEN];
        /* PF0->COS4, PF1->COS5, PF2->COS6, PF3->COS7,