net/ice: save rule on switch filter creation

[dpdk.git] / drivers / net / bnxt / bnxt.h

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 494a1ef..39bd739 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -501,9 +501,9 @@ struct bnxt_ctx_mem_buf_info {
 struct bnxt_error_recovery_info {
        /* All units in milliseconds */
        uint32_t        driver_polling_freq;
-       uint32_t        master_func_wait_period;
+       uint32_t        primary_func_wait_period;
        uint32_t        normal_func_wait_period;
-       uint32_t        master_func_wait_period_after_reset;
+       uint32_t        primary_func_wait_period_after_reset;
        uint32_t        max_bailout_time_after_reset;
 #define BNXT_FW_STATUS_REG             0
 #define BNXT_FW_HEARTBEAT_CNT_REG      1
@@ -520,7 +520,7 @@ struct bnxt_error_recovery_info {
        uint8_t         delay_after_reset[BNXT_NUM_RESET_REG];
 #define BNXT_FLAG_ERROR_RECOVERY_HOST  BIT(0)
 #define BNXT_FLAG_ERROR_RECOVERY_CO_CPU        BIT(1)
-#define BNXT_FLAG_MASTER_FUNC          BIT(2)
+#define BNXT_FLAG_PRIMARY_FUNC         BIT(2)
 #define BNXT_FLAG_RECOVERY_ENABLED     BIT(3)
        uint32_t        flags;
 
@@ -569,40 +569,37 @@ struct bnxt_rep_info {
 #define BNXT_FW_STATUS_SHUTDOWN                0x100000
 
 #define BNXT_ETH_RSS_SUPPORT ( \
-       ETH_RSS_IPV4 |          \
-       ETH_RSS_NONFRAG_IPV4_TCP |      \
-       ETH_RSS_NONFRAG_IPV4_UDP |      \
-       ETH_RSS_IPV6 |          \
-       ETH_RSS_NONFRAG_IPV6_TCP |      \
-       ETH_RSS_NONFRAG_IPV6_UDP |      \
-       ETH_RSS_LEVEL_MASK)
-
-#define BNXT_DEV_TX_OFFLOAD_SUPPORT (DEV_TX_OFFLOAD_VLAN_INSERT | \
-                                    DEV_TX_OFFLOAD_IPV4_CKSUM | \
-                                    DEV_TX_OFFLOAD_TCP_CKSUM | \
-                                    DEV_TX_OFFLOAD_UDP_CKSUM | \
-                                    DEV_TX_OFFLOAD_TCP_TSO | \
-                                    DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
-                                    DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
-                                    DEV_TX_OFFLOAD_GRE_TNL_TSO | \
-                                    DEV_TX_OFFLOAD_IPIP_TNL_TSO | \
-                                    DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \
-                                    DEV_TX_OFFLOAD_QINQ_INSERT | \
-                                    DEV_TX_OFFLOAD_MULTI_SEGS)
-
-#define BNXT_DEV_RX_OFFLOAD_SUPPORT (DEV_RX_OFFLOAD_VLAN_FILTER | \
-                                    DEV_RX_OFFLOAD_VLAN_STRIP | \
-                                    DEV_RX_OFFLOAD_IPV4_CKSUM | \
-                                    DEV_RX_OFFLOAD_UDP_CKSUM | \
-                                    DEV_RX_OFFLOAD_TCP_CKSUM | \
-                                    DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
-                                    DEV_RX_OFFLOAD_OUTER_UDP_CKSUM | \
-                                    DEV_RX_OFFLOAD_JUMBO_FRAME | \
-                                    DEV_RX_OFFLOAD_KEEP_CRC | \
-                                    DEV_RX_OFFLOAD_VLAN_EXTEND | \
-                                    DEV_RX_OFFLOAD_TCP_LRO | \
-                                    DEV_RX_OFFLOAD_SCATTER | \
-                                    DEV_RX_OFFLOAD_RSS_HASH)
+       RTE_ETH_RSS_IPV4 |              \
+       RTE_ETH_RSS_NONFRAG_IPV4_TCP |  \
+       RTE_ETH_RSS_NONFRAG_IPV4_UDP |  \
+       RTE_ETH_RSS_IPV6 |              \
+       RTE_ETH_RSS_NONFRAG_IPV6_TCP |  \
+       RTE_ETH_RSS_NONFRAG_IPV6_UDP |  \
+       RTE_ETH_RSS_LEVEL_MASK)
+
+#define BNXT_DEV_TX_OFFLOAD_SUPPORT (RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \
+                                    RTE_ETH_TX_OFFLOAD_TCP_CKSUM | \
+                                    RTE_ETH_TX_OFFLOAD_UDP_CKSUM | \
+                                    RTE_ETH_TX_OFFLOAD_TCP_TSO | \
+                                    RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
+                                    RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | \
+                                    RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | \
+                                    RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | \
+                                    RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | \
+                                    RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \
+                                    RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
+
+#define BNXT_DEV_RX_OFFLOAD_SUPPORT (RTE_ETH_RX_OFFLOAD_VLAN_FILTER | \
+                                    RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \
+                                    RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \
+                                    RTE_ETH_RX_OFFLOAD_TCP_CKSUM | \
+                                    RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
+                                    RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM | \
+                                    RTE_ETH_RX_OFFLOAD_KEEP_CRC | \
+                                    RTE_ETH_RX_OFFLOAD_VLAN_EXTEND | \
+                                    RTE_ETH_RX_OFFLOAD_TCP_LRO | \
+                                    RTE_ETH_RX_OFFLOAD_SCATTER | \
+                                    RTE_ETH_RX_OFFLOAD_RSS_HASH)
 
 #define BNXT_HWRM_SHORT_REQ_LEN                sizeof(struct hwrm_short_input)
 
@@ -737,6 +734,7 @@ struct bnxt {
 #define BNXT_FW_CAP_ADV_FLOW_COUNTERS  BIT(6)
 #define BNXT_FW_CAP_LINK_ADMIN         BIT(7)
 #define BNXT_FW_CAP_TRUFLOW_EN         BIT(8)
+#define BNXT_FW_CAP_VLAN_TX_INSERT     BIT(9)
 #define BNXT_TRUFLOW_EN(bp)    ((bp)->fw_cap & BNXT_FW_CAP_TRUFLOW_EN)
 
        pthread_mutex_t         flow_lock;
@@ -745,6 +743,8 @@ struct bnxt {
 #define BNXT_VNIC_CAP_COS_CLASSIFY     BIT(0)
 #define BNXT_VNIC_CAP_OUTER_RSS                BIT(1)
 #define BNXT_VNIC_CAP_RX_CMPL_V2       BIT(2)
+#define BNXT_VNIC_CAP_VLAN_RX_STRIP    BIT(3)
+#define BNXT_RX_VLAN_STRIP_EN(bp)      ((bp)->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
        unsigned int            rx_nr_rings;
        unsigned int            rx_cp_nr_rings;
        unsigned int            rx_num_qs_per_vnic;