net/hns3: use existing macro to get array size

[dpdk.git] / drivers / net / hns3 / hns3_ethdev.h

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index aef3043..a6622a6 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -5,6 +5,7 @@
 #ifndef _HNS3_ETHDEV_H_
 #define _HNS3_ETHDEV_H_
 
+#include <pthread.h>
 #include <sys/time.h>
 #include <ethdev_driver.h>
 #include <rte_byteorder.h>
@@ -41,6 +42,9 @@
 #define HNS3_PF_FUNC_ID                        0
 #define HNS3_1ST_VF_FUNC_ID            1
 
+#define HNS3_DEFAULT_PORT_CONF_BURST_SIZE      32
+#define HNS3_DEFAULT_PORT_CONF_QUEUES_NUM      1
+
 #define HNS3_SW_SHIFT_AND_DISCARD_MODE         0
 #define HNS3_HW_SHIFT_AND_DISCARD_MODE         1
 
@@ -624,6 +628,9 @@ struct hns3_hw {
        uint8_t udp_cksum_mode;
 
        struct hns3_port_base_vlan_config port_base_vlan_cfg;
+
+       pthread_mutex_t flows_lock; /* rte_flow ops lock */
+
        /*
         * PMD setup and configuration is not thread safe. Since it is not
         * performance sensitive, it is better to guarantee thread-safety
@@ -851,17 +858,17 @@ enum {
 
 #define HNS3_DEVARG_DEV_CAPS_MASK      "dev_caps_mask"
 
-#define HNS3_DEV_SUPPORT_DCB_B                 0x0
-#define HNS3_DEV_SUPPORT_COPPER_B              0x1
-#define HNS3_DEV_SUPPORT_UDP_GSO_B             0x2
-#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B     0x3
-#define HNS3_DEV_SUPPORT_PTP_B                 0x4
-#define HNS3_DEV_SUPPORT_TX_PUSH_B             0x5
-#define HNS3_DEV_SUPPORT_INDEP_TXRX_B          0x6
-#define HNS3_DEV_SUPPORT_STASH_B               0x7
-#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B      0x9
-#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B     0xA
-#define HNS3_DEV_SUPPORT_RAS_IMP_B             0xB
+enum {
+       HNS3_DEV_SUPPORT_DCB_B,
+       HNS3_DEV_SUPPORT_COPPER_B,
+       HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
+       HNS3_DEV_SUPPORT_PTP_B,
+       HNS3_DEV_SUPPORT_INDEP_TXRX_B,
+       HNS3_DEV_SUPPORT_STASH_B,
+       HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
+       HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
+       HNS3_DEV_SUPPORT_RAS_IMP_B,
+};
 
 #define hns3_dev_dcb_supported(hw) \
        hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_DCB_B)
@@ -870,10 +877,6 @@ enum {
 #define hns3_dev_copper_supported(hw) \
        hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_COPPER_B)
 
-/* Support UDP GSO offload */
-#define hns3_dev_udp_gso_supported(hw) \
-       hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_UDP_GSO_B)
-
 /* Support the queue region action rule of flow directory */
 #define hns3_dev_fd_queue_region_supported(hw) \
        hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B)
@@ -882,9 +885,6 @@ enum {
 #define hns3_dev_ptp_supported(hw) \
        hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_PTP_B)
 
-#define hns3_dev_tx_push_supported(hw) \
-       hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_TX_PUSH_B)
-
 /* Support to Independently enable/disable/reset Tx or Rx queues */
 #define hns3_dev_indep_txrx_supported(hw) \
        hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_INDEP_TXRX_B)
@@ -980,13 +980,13 @@ static inline void hns3_write_reg(void *base, uint32_t reg, uint32_t value)
 }
 
 /*
- * The optimized function for writing registers used in the '.rx_pkt_burst' and
- * '.tx_pkt_burst' ops implementation function.
+ * The optimized function for writing registers reduces one address addition
+ * calculation, it was used in the '.rx_pkt_burst' and '.tx_pkt_burst' ops
+ * implementation function.
  */
 static inline void hns3_write_reg_opt(volatile void *addr, uint32_t value)
 {
-       rte_io_wmb();
-       rte_write32_relaxed(rte_cpu_to_le_32(value), addr);
+       rte_write32(rte_cpu_to_le_32(value), addr);
 }
 
 static inline uint32_t hns3_read_reg(void *base, uint32_t reg)
@@ -1001,8 +1001,6 @@ static inline uint32_t hns3_read_reg(void *base, uint32_t reg)
 #define hns3_read_dev(a, reg) \
        hns3_read_reg((a)->io_base, (reg))
 
-#define ARRAY_SIZE(x) RTE_DIM(x)
-
 #define NEXT_ITEM_OF_ACTION(act, actions, index)                        \
        do {                                                            \
                act = (actions) + (index);                              \
@@ -1015,15 +1013,9 @@ static inline uint32_t hns3_read_reg(void *base, uint32_t reg)
 #define MSEC_PER_SEC              1000L
 #define USEC_PER_MSEC             1000L
 
-static inline uint64_t
-get_timeofday_ms(void)
-{
-       struct timeval tv;
-
-       (void)gettimeofday(&tv, NULL);
-
-       return (uint64_t)tv.tv_sec * MSEC_PER_SEC + tv.tv_usec / USEC_PER_MSEC;
-}
+void hns3_clock_gettime(struct timeval *tv);
+uint64_t hns3_clock_calctime_ms(struct timeval *tv);
+uint64_t hns3_clock_gettime_ms(void);
 
 static inline uint64_t
 hns3_atomic_test_bit(unsigned int nr, volatile uint64_t *addr)