net/virtio: replace SMP barrier with IO barrier

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

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index bc09352..8374e9f 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -33,35 +33,21 @@
 #define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609
 #define BROADCOM_DEV_ID_STRATUS_NIC    0x1614
 #define BROADCOM_DEV_ID_57414_VF       0x16c1
-#define BROADCOM_DEV_ID_57301          0x16c8
-#define BROADCOM_DEV_ID_57302          0x16c9
-#define BROADCOM_DEV_ID_57304_PF       0x16ca
 #define BROADCOM_DEV_ID_57304_VF       0x16cb
 #define BROADCOM_DEV_ID_57417_MF       0x16cc
 #define BROADCOM_DEV_ID_NS2            0x16cd
-#define BROADCOM_DEV_ID_57311          0x16ce
-#define BROADCOM_DEV_ID_57312          0x16cf
-#define BROADCOM_DEV_ID_57402          0x16d0
-#define BROADCOM_DEV_ID_57404          0x16d1
-#define BROADCOM_DEV_ID_57406_PF       0x16d2
 #define BROADCOM_DEV_ID_57406_VF       0x16d3
-#define BROADCOM_DEV_ID_57402_MF       0x16d4
-#define BROADCOM_DEV_ID_57407_RJ45     0x16d5
 #define BROADCOM_DEV_ID_57412          0x16d6
 #define BROADCOM_DEV_ID_57414          0x16d7
 #define BROADCOM_DEV_ID_57416_RJ45     0x16d8
 #define BROADCOM_DEV_ID_57417_RJ45     0x16d9
 #define BROADCOM_DEV_ID_5741X_VF       0x16dc
 #define BROADCOM_DEV_ID_57412_MF       0x16de
-#define BROADCOM_DEV_ID_57314          0x16df
 #define BROADCOM_DEV_ID_57317_RJ45     0x16e0
 #define BROADCOM_DEV_ID_5731X_VF       0x16e1
 #define BROADCOM_DEV_ID_57417_SFP      0x16e2
 #define BROADCOM_DEV_ID_57416_SFP      0x16e3
 #define BROADCOM_DEV_ID_57317_SFP      0x16e4
-#define BROADCOM_DEV_ID_57404_MF       0x16e7
-#define BROADCOM_DEV_ID_57406_MF       0x16e8
-#define BROADCOM_DEV_ID_57407_SFP      0x16e9
 #define BROADCOM_DEV_ID_57407_MF       0x16ea
 #define BROADCOM_DEV_ID_57414_MF       0x16ec
 #define BROADCOM_DEV_ID_57416_MF       0x16ee
@@ -127,9 +113,9 @@
  */
 #ifdef RTE_EXEC_ENV_FREEBSD
 /* In FreeBSD OS, nic_uio driver does not support interrupts */
-#define BNXT_NUM_ASYNC_CPR(bp) 0
+#define BNXT_NUM_ASYNC_CPR(bp) 0U
 #else
-#define BNXT_NUM_ASYNC_CPR(bp) 1
+#define BNXT_NUM_ASYNC_CPR(bp) 1U
 #endif
 
 #define BNXT_MISC_VEC_ID               RTE_INTR_VEC_ZERO_OFFSET
@@ -583,6 +569,7 @@ struct bnxt_rep_info {
                                     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 | \
@@ -724,7 +711,13 @@ struct bnxt {
        void                            *hwrm_short_cmd_req_addr;
        rte_iova_t                      hwrm_short_cmd_req_dma_addr;
        rte_spinlock_t                  hwrm_lock;
+       /* synchronize between dev_configure_op and int handler */
        pthread_mutex_t                 def_cp_lock;
+       /* synchronize between dev_start_op and async evt handler
+        * Locking sequence in async evt handler will be
+        * def_cp_lock
+        * health_check_lock
+        */
        pthread_mutex_t                 health_check_lock;
        uint16_t                        max_req_len;
        uint16_t                        max_resp_len;
@@ -751,8 +744,7 @@ struct bnxt {
        uint16_t                max_cp_rings;
        uint16_t                max_tx_rings;
        uint16_t                max_rx_rings;
-#define MAX_STINGRAY_RINGS             128U
-
+#define MAX_STINGRAY_RINGS             236U
 #define BNXT_MAX_VF_REP_RINGS  8
 
        uint16_t                max_nq_rings;