net/hns3: fix timing in resetting queues

[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 d666b1a..72d718c 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 HiSilicon Limited.
+ * Copyright(c) 2018-2021 HiSilicon Limited.
  */
 
 #ifndef _HNS3_ETHDEV_H_
@@ -439,7 +439,6 @@ struct hns3_hw {
        struct hns3_cmq cmq;
        struct hns3_mbx_resp_status mbx_resp; /* mailbox response */
        struct hns3_mbx_arq_ring arq;         /* mailbox async rx queue */
-       pthread_t irq_thread_id;
        struct hns3_mac mac;
        unsigned int secondary_cnt; /* Number of secondary processes init'd. */
        struct hns3_tqp_stats tqp_stats;
@@ -683,12 +682,10 @@ struct hns3_ptype_table {
         * The next fields used to calc packet-type by the
         * L3_ID/L4_ID/OL3_ID/OL4_ID from the Rx descriptor.
         */
-       uint32_t l2l3table[HNS3_L2TBL_NUM][HNS3_L3TBL_NUM];
+       uint32_t l3table[HNS3_L3TBL_NUM];
        uint32_t l4table[HNS3_L4TBL_NUM];
-       uint32_t inner_l2table[HNS3_L2TBL_NUM];
        uint32_t inner_l3table[HNS3_L3TBL_NUM];
        uint32_t inner_l4table[HNS3_L4TBL_NUM];
-       uint32_t ol2table[HNS3_OL2TBL_NUM];
        uint32_t ol3table[HNS3_OL3TBL_NUM];
        uint32_t ol4table[HNS3_OL4TBL_NUM];
 
@@ -764,8 +761,26 @@ struct hns3_pf {
        struct hns3_tm_conf tm_conf;
 };
 
+enum {
+       HNS3_PF_PUSH_LSC_CAP_NOT_SUPPORTED,
+       HNS3_PF_PUSH_LSC_CAP_SUPPORTED,
+       HNS3_PF_PUSH_LSC_CAP_UNKNOWN
+};
+
 struct hns3_vf {
        struct hns3_adapter *adapter;
+
+       /* Whether PF support push link status change to VF */
+       uint16_t pf_push_lsc_cap;
+
+       /*
+        * If PF support push link status change, VF still need send request to
+        * get link status in some cases (such as reset recover stage), so use
+        * the req_link_info_cnt to control max request count.
+        */
+       uint16_t req_link_info_cnt;
+
+       uint16_t poll_job_started; /* whether poll job is started */
 };
 
 struct hns3_adapter {
@@ -778,11 +793,6 @@ struct hns3_adapter {
                struct hns3_vf vf;
        };
 
-       bool rx_simple_allowed;
-       bool rx_vec_allowed;
-       bool tx_simple_allowed;
-       bool tx_vec_allowed;
-
        uint32_t rx_func_hint;
        uint32_t tx_func_hint;
 
@@ -850,6 +860,8 @@ enum {
        (&((struct hns3_adapter *)adapter)->hw)
 #define HNS3_DEV_PRIVATE_TO_PF(adapter) \
        (&((struct hns3_adapter *)adapter)->pf)
+#define HNS3_DEV_PRIVATE_TO_VF(adapter) \
+       (&((struct hns3_adapter *)adapter)->vf)
 #define HNS3_DEV_HW_TO_ADAPTER(hw) \
        container_of(hw, struct hns3_adapter, hw)
 
@@ -859,6 +871,12 @@ static inline struct hns3_pf *HNS3_DEV_HW_TO_PF(struct hns3_hw *hw)
        return &adapter->pf;
 }
 
+static inline struct hns3_vf *HNS3_DEV_HW_TO_VF(struct hns3_hw *hw)
+{
+       struct hns3_adapter *adapter = HNS3_DEV_HW_TO_ADAPTER(hw);
+       return &adapter->vf;
+}
+
 #define hns3_set_field(origin, mask, shift, val) \
        do { \
                (origin) &= (~(mask)); \
@@ -996,7 +1014,7 @@ int hns3_dev_flow_ops_get(struct rte_eth_dev *dev,
                          const struct rte_flow_ops **ops);
 bool hns3_is_reset_pending(struct hns3_adapter *hns);
 bool hns3vf_is_reset_pending(struct hns3_adapter *hns);
-void hns3_update_link_status_and_event(struct hns3_hw *hw);
+void hns3_update_linkstatus_and_event(struct hns3_hw *hw, bool query);
 void hns3_ether_format_addr(char *buf, uint16_t size,
                        const struct rte_ether_addr *ether_addr);
 int hns3_dev_infos_get(struct rte_eth_dev *eth_dev,
@@ -1004,6 +1022,7 @@ int hns3_dev_infos_get(struct rte_eth_dev *eth_dev,
 void hns3vf_update_link_status(struct hns3_hw *hw, uint8_t link_status,
                          uint32_t link_speed, uint8_t link_duplex);
 void hns3_parse_devargs(struct rte_eth_dev *dev);
+void hns3vf_update_push_lsc_cap(struct hns3_hw *hw, bool supported);
 int hns3_restore_ptp(struct hns3_adapter *hns);
 int hns3_mbuf_dyn_rx_timestamp_register(struct rte_eth_dev *dev,
                                    struct rte_eth_conf *conf);