net/hns3: fix rollback after setting PVID failure
[dpdk.git] / drivers / net / hns3 / hns3_ethdev.c
index 221e008..56b3032 100644 (file)
@@ -1,11 +1,12 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2021 HiSilicon Limited.
  */
 
 #include <rte_alarm.h>
 #include <rte_bus_pci.h>
 #include <ethdev_pci.h>
 #include <rte_pci.h>
+#include <rte_kvargs.h>
 
 #include "hns3_ethdev.h"
 #include "hns3_logs.h"
@@ -57,6 +58,7 @@ enum hns3_evt_cause {
        HNS3_VECTOR0_EVENT_RST,
        HNS3_VECTOR0_EVENT_MBX,
        HNS3_VECTOR0_EVENT_ERR,
+       HNS3_VECTOR0_EVENT_PTP,
        HNS3_VECTOR0_EVENT_OTHER,
 };
 
@@ -93,7 +95,7 @@ static enum hns3_reset_level hns3_get_reset_level(struct hns3_adapter *hns,
 static int hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
 static int hns3_vlan_pvid_configure(struct hns3_adapter *hns, uint16_t pvid,
                                    int on);
-static int hns3_update_speed_duplex(struct rte_eth_dev *eth_dev);
+static int hns3_update_link_info(struct rte_eth_dev *eth_dev);
 static bool hns3_update_link_status(struct hns3_hw *hw);
 
 static int hns3_add_mc_addr(struct hns3_hw *hw,
@@ -102,6 +104,7 @@ static int hns3_remove_mc_addr(struct hns3_hw *hw,
                            struct rte_ether_addr *mac_addr);
 static int hns3_restore_fec(struct hns3_hw *hw);
 static int hns3_query_dev_fec_info(struct hns3_hw *hw);
+static int hns3_do_stop(struct hns3_adapter *hns);
 
 void hns3_ether_format_addr(char *buf, uint16_t size,
                            const struct rte_ether_addr *ether_addr)
@@ -130,7 +133,7 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay,
 {
        struct hns3_hw *hw = &hns->hw;
 
-       rte_atomic16_set(&hw->reset.disable_cmd, 1);
+       __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
        hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending);
        *vec_val = BIT(HNS3_VECTOR0_IMPRESET_INT_B);
        if (!is_delay) {
@@ -150,7 +153,7 @@ hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay,
 {
        struct hns3_hw *hw = &hns->hw;
 
-       rte_atomic16_set(&hw->reset.disable_cmd, 1);
+       __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
        hns3_atomic_set_bit(HNS3_GLOBAL_RESET, &hw->reset.pending);
        *vec_val = BIT(HNS3_VECTOR0_GLOBALRESET_INT_B);
        if (!is_delay) {
@@ -200,6 +203,13 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
                goto out;
        }
 
+       /* Check for vector0 1588 event source */
+       if (BIT(HNS3_VECTOR0_1588_INT_B) & vector0_int_stats) {
+               val = BIT(HNS3_VECTOR0_1588_INT_B);
+               ret = HNS3_VECTOR0_EVENT_PTP;
+               goto out;
+       }
+
        /* check for vector0 msix event source */
        if (vector0_int_stats & HNS3_VECTOR0_REG_MSIX_MASK ||
            hw_err_src_reg & HNS3_RAS_REG_NFE_MASK) {
@@ -216,9 +226,6 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
                goto out;
        }
 
-       if (clearval && (vector0_int_stats || cmdq_src_val || hw_err_src_reg))
-               hns3_warn(hw, "vector0_int_stats:0x%x cmdq_src_val:0x%x hw_err_src_reg:0x%x",
-                         vector0_int_stats, cmdq_src_val, hw_err_src_reg);
        val = vector0_int_stats;
        ret = HNS3_VECTOR0_EVENT_OTHER;
 out:
@@ -228,10 +235,17 @@ out:
        return ret;
 }
 
+static bool
+hns3_is_1588_event_type(uint32_t event_type)
+{
+       return (event_type == HNS3_VECTOR0_EVENT_PTP);
+}
+
 static void
 hns3_clear_event_cause(struct hns3_hw *hw, uint32_t event_type, uint32_t regclr)
 {
-       if (event_type == HNS3_VECTOR0_EVENT_RST)
+       if (event_type == HNS3_VECTOR0_EVENT_RST ||
+           hns3_is_1588_event_type(event_type))
                hns3_write_dev(hw, HNS3_MISC_RESET_STS_REG, regclr);
        else if (event_type == HNS3_VECTOR0_EVENT_MBX)
                hns3_write_dev(hw, HNS3_VECTOR0_CMDQ_SRC_REG, regclr);
@@ -254,6 +268,36 @@ hns3_clear_all_event_cause(struct hns3_hw *hw)
                               BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) |
                               BIT(HNS3_VECTOR0_CORERESET_INT_B));
        hns3_clear_event_cause(hw, HNS3_VECTOR0_EVENT_MBX, 0);
+       hns3_clear_event_cause(hw, HNS3_VECTOR0_EVENT_PTP,
+                               BIT(HNS3_VECTOR0_1588_INT_B));
+}
+
+static void
+hns3_handle_mac_tnl(struct hns3_hw *hw)
+{
+       struct hns3_cmd_desc desc;
+       uint32_t status;
+       int ret;
+
+       /* query and clear mac tnl interruptions */
+       hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_MAC_TNL_INT, true);
+       ret = hns3_cmd_send(hw, &desc, 1);
+       if (ret) {
+               hns3_err(hw, "failed to query mac tnl int, ret = %d.", ret);
+               return;
+       }
+
+       status = rte_le_to_cpu_32(desc.data[0]);
+       if (status) {
+               hns3_warn(hw, "mac tnl int occurs, status = 0x%x.", status);
+               hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_CLEAR_MAC_TNL_INT,
+                                         false);
+               desc.data[0] = rte_cpu_to_le_32(HNS3_MAC_TNL_INT_CLR);
+               ret = hns3_cmd_send(hw, &desc, 1);
+               if (ret)
+                       hns3_err(hw, "failed to clear mac tnl int, ret = %d.",
+                                ret);
+       }
 }
 
 static void
@@ -264,24 +308,36 @@ hns3_interrupt_handler(void *param)
        struct hns3_hw *hw = &hns->hw;
        enum hns3_evt_cause event_cause;
        uint32_t clearval = 0;
+       uint32_t vector0_int;
+       uint32_t ras_int;
+       uint32_t cmdq_int;
 
        /* Disable interrupt */
        hns3_pf_disable_irq0(hw);
 
        event_cause = hns3_check_event_cause(hns, &clearval);
+       vector0_int = hns3_read_dev(hw, HNS3_VECTOR0_OTHER_INT_STS_REG);
+       ras_int = hns3_read_dev(hw, HNS3_RAS_PF_OTHER_INT_STS_REG);
+       cmdq_int = hns3_read_dev(hw, HNS3_VECTOR0_CMDQ_SRC_REG);
        /* vector 0 interrupt is shared with reset and mailbox source events. */
        if (event_cause == HNS3_VECTOR0_EVENT_ERR) {
-               hns3_warn(hw, "Received err interrupt");
+               hns3_warn(hw, "received interrupt: vector0_int_stat:0x%x "
+                         "ras_int_stat:0x%x cmdq_int_stat:0x%x",
+                         vector0_int, ras_int, cmdq_int);
                hns3_handle_msix_error(hns, &hw->reset.request);
                hns3_handle_ras_error(hns, &hw->reset.request);
+               hns3_handle_mac_tnl(hw);
                hns3_schedule_reset(hns);
        } else if (event_cause == HNS3_VECTOR0_EVENT_RST) {
-               hns3_warn(hw, "Received reset interrupt");
+               hns3_warn(hw, "received reset interrupt");
                hns3_schedule_reset(hns);
-       } else if (event_cause == HNS3_VECTOR0_EVENT_MBX)
+       } else if (event_cause == HNS3_VECTOR0_EVENT_MBX) {
                hns3_dev_handle_mbx_msg(hw);
-       else
-               hns3_err(hw, "Received unknown event");
+       } else {
+               hns3_warn(hw, "received unknown event: vector0_int_stat:0x%x "
+                         "ras_int_stat:0x%x cmdq_int_stat:0x%x",
+                         vector0_int, ras_int, cmdq_int);
+       }
 
        hns3_clear_event_cause(hw, event_cause, clearval);
        /* Enable interrupt if it is not cause by reset */
@@ -925,7 +981,7 @@ hns3_vlan_pvid_configure(struct hns3_adapter *hns, uint16_t pvid, int on)
 {
        struct hns3_hw *hw = &hns->hw;
        uint16_t port_base_vlan_state;
-       int ret;
+       int ret, err;
 
        if (on == 0 && pvid != hw->port_base_vlan_cfg.pvid) {
                if (hw->port_base_vlan_cfg.pvid != HNS3_INVALID_PVID)
@@ -948,7 +1004,7 @@ hns3_vlan_pvid_configure(struct hns3_adapter *hns, uint16_t pvid, int on)
        if (ret) {
                hns3_err(hw, "failed to config rx vlan strip for pvid, "
                         "ret = %d", ret);
-               return ret;
+               goto pvid_vlan_strip_fail;
        }
 
        if (pvid == HNS3_INVALID_PVID)
@@ -957,13 +1013,27 @@ hns3_vlan_pvid_configure(struct hns3_adapter *hns, uint16_t pvid, int on)
        if (ret) {
                hns3_err(hw, "failed to update vlan filter entries, ret = %d",
                         ret);
-               return ret;
+               goto vlan_filter_set_fail;
        }
 
 out:
        hw->port_base_vlan_cfg.state = port_base_vlan_state;
        hw->port_base_vlan_cfg.pvid = on ? pvid : HNS3_INVALID_PVID;
        return ret;
+
+vlan_filter_set_fail:
+       err = hns3_en_pvid_strip(hns, hw->port_base_vlan_cfg.state ==
+                                       HNS3_PORT_BASE_VLAN_ENABLE);
+       if (err)
+               hns3_err(hw, "fail to rollback pvid strip, ret = %d", err);
+
+pvid_vlan_strip_fail:
+       err = hns3_vlan_txvlan_cfg(hns, hw->port_base_vlan_cfg.state,
+                                       hw->port_base_vlan_cfg.pvid);
+       if (err)
+               hns3_err(hw, "fail to rollback txvlan status, ret = %d", err);
+
+       return ret;
 }
 
 static int
@@ -2333,6 +2403,41 @@ hns3_init_ring_with_vector(struct hns3_hw *hw)
        return 0;
 }
 
+static int
+hns3_refresh_mtu(struct rte_eth_dev *dev, struct rte_eth_conf *conf)
+{
+       struct hns3_adapter *hns = dev->data->dev_private;
+       struct hns3_hw *hw = &hns->hw;
+       uint32_t max_rx_pkt_len;
+       uint16_t mtu;
+       int ret;
+
+       if (!(conf->rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME))
+               return 0;
+
+       /*
+        * If jumbo frames are enabled, MTU needs to be refreshed
+        * according to the maximum RX packet length.
+        */
+       max_rx_pkt_len = conf->rxmode.max_rx_pkt_len;
+       if (max_rx_pkt_len > HNS3_MAX_FRAME_LEN ||
+           max_rx_pkt_len <= HNS3_DEFAULT_FRAME_LEN) {
+               hns3_err(hw, "maximum Rx packet length must be greater than %u "
+                        "and no more than %u when jumbo frame enabled.",
+                        (uint16_t)HNS3_DEFAULT_FRAME_LEN,
+                        (uint16_t)HNS3_MAX_FRAME_LEN);
+               return -EINVAL;
+       }
+
+       mtu = (uint16_t)HNS3_PKTLEN_TO_MTU(max_rx_pkt_len);
+       ret = hns3_dev_mtu_set(dev, mtu);
+       if (ret)
+               return ret;
+       dev->data->mtu = mtu;
+
+       return 0;
+}
+
 static int
 hns3_dev_configure(struct rte_eth_dev *dev)
 {
@@ -2343,7 +2448,6 @@ hns3_dev_configure(struct rte_eth_dev *dev)
        uint16_t nb_rx_q = dev->data->nb_rx_queues;
        uint16_t nb_tx_q = dev->data->nb_tx_queues;
        struct rte_eth_rss_conf rss_conf;
-       uint16_t mtu;
        bool gro_en;
        int ret;
 
@@ -2391,22 +2495,13 @@ hns3_dev_configure(struct rte_eth_dev *dev)
                        goto cfg_err;
        }
 
-       /*
-        * If jumbo frames are enabled, MTU needs to be refreshed
-        * according to the maximum RX packet length.
-        */
-       if (conf->rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
-               /*
-                * Security of max_rx_pkt_len is guaranteed in dpdk frame.
-                * Maximum value of max_rx_pkt_len is HNS3_MAX_FRAME_LEN, so it
-                * can safely assign to "uint16_t" type variable.
-                */
-               mtu = (uint16_t)HNS3_PKTLEN_TO_MTU(conf->rxmode.max_rx_pkt_len);
-               ret = hns3_dev_mtu_set(dev, mtu);
-               if (ret)
-                       goto cfg_err;
-               dev->data->mtu = mtu;
-       }
+       ret = hns3_refresh_mtu(dev, conf);
+       if (ret)
+               goto cfg_err;
+
+       ret = hns3_mbuf_dyn_rx_timestamp_register(dev, conf);
+       if (ret)
+               goto cfg_err;
 
        ret = hns3_dev_configure_vlan(dev);
        if (ret)
@@ -2453,17 +2548,33 @@ hns3_set_mac_mtu(struct hns3_hw *hw, uint16_t new_mps)
 static int
 hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
 {
+       struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
+       uint16_t original_mps = hns->pf.mps;
+       int err;
        int ret;
 
        ret = hns3_set_mac_mtu(hw, mps);
        if (ret) {
-               hns3_err(hw, "Failed to set mtu, ret = %d", ret);
+               hns3_err(hw, "failed to set mtu, ret = %d", ret);
                return ret;
        }
 
+       hns->pf.mps = mps;
        ret = hns3_buffer_alloc(hw);
-       if (ret)
-               hns3_err(hw, "Failed to allocate buffer, ret = %d", ret);
+       if (ret) {
+               hns3_err(hw, "failed to allocate buffer, ret = %d", ret);
+               goto rollback;
+       }
+
+       return 0;
+
+rollback:
+       err = hns3_set_mac_mtu(hw, original_mps);
+       if (err) {
+               hns3_err(hw, "fail to rollback MTU, err = %d", err);
+               return ret;
+       }
+       hns->pf.mps = original_mps;
 
        return ret;
 }
@@ -2498,7 +2609,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
                         dev->data->port_id, mtu, ret);
                return ret;
        }
-       hns->pf.mps = (uint16_t)frame_size;
+
        if (is_jumbo_frame)
                dev->data->dev_conf.rxmode.offloads |=
                                                DEV_RX_OFFLOAD_JUMBO_FRAME;
@@ -2558,10 +2669,16 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
                                 DEV_TX_OFFLOAD_MBUF_FAST_FREE |
                                 hns3_txvlan_cap_get(hw));
 
+       if (hns3_dev_outer_udp_cksum_supported(hw))
+               info->tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_UDP_CKSUM;
+
        if (hns3_dev_indep_txrx_supported(hw))
                info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
                                 RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
 
+       if (hns3_dev_ptp_supported(hw))
+               info->rx_offload_capa |= DEV_RX_OFFLOAD_TIMESTAMP;
+
        info->rx_desc_lim = (struct rte_eth_desc_lim) {
                .nb_max = HNS3_MAX_RING_DESC,
                .nb_min = HNS3_MIN_RING_DESC,
@@ -2593,7 +2710,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 
        info->vmdq_queue_num = 0;
 
-       info->reta_size = HNS3_RSS_IND_TBL_SIZE;
+       info->reta_size = hw->rss_ind_tbl_size;
        info->hash_key_size = HNS3_RSS_KEY_SIZE;
        info->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT;
 
@@ -2633,20 +2750,22 @@ hns3_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
 }
 
 static int
-hns3_dev_link_update(struct rte_eth_dev *eth_dev,
-                    __rte_unused int wait_to_complete)
+hns3_update_port_link_info(struct rte_eth_dev *eth_dev)
 {
-       struct hns3_adapter *hns = eth_dev->data->dev_private;
-       struct hns3_hw *hw = &hns->hw;
-       struct hns3_mac *mac = &hw->mac;
-       struct rte_eth_link new_link;
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
-       if (!hns3_is_reset_pending(hns)) {
-               hns3_update_speed_duplex(eth_dev);
-               hns3_update_link_status(hw);
-       }
+       (void)hns3_update_link_status(hw);
+
+       return hns3_update_link_info(eth_dev);
+}
+
+static void
+hns3_setup_linkstatus(struct rte_eth_dev *eth_dev,
+                     struct rte_eth_link *new_link)
+{
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       struct hns3_mac *mac = &hw->mac;
 
-       memset(&new_link, 0, sizeof(new_link));
        switch (mac->link_speed) {
        case ETH_SPEED_NUM_10M:
        case ETH_SPEED_NUM_100M:
@@ -2657,17 +2776,51 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev,
        case ETH_SPEED_NUM_50G:
        case ETH_SPEED_NUM_100G:
        case ETH_SPEED_NUM_200G:
-               new_link.link_speed = mac->link_speed;
+               new_link->link_speed = mac->link_speed;
                break;
        default:
-               new_link.link_speed = ETH_SPEED_NUM_100M;
+               if (mac->link_status)
+                       new_link->link_speed = ETH_SPEED_NUM_UNKNOWN;
+               else
+                       new_link->link_speed = ETH_SPEED_NUM_NONE;
                break;
        }
 
-       new_link.link_duplex = mac->link_duplex;
-       new_link.link_status = mac->link_status ? ETH_LINK_UP : ETH_LINK_DOWN;
-       new_link.link_autoneg =
+       new_link->link_duplex = mac->link_duplex;
+       new_link->link_status = mac->link_status ? ETH_LINK_UP : ETH_LINK_DOWN;
+       new_link->link_autoneg =
            !(eth_dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED);
+}
+
+static int
+hns3_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
+{
+#define HNS3_LINK_CHECK_INTERVAL 100  /* 100ms */
+#define HNS3_MAX_LINK_CHECK_TIMES 20  /* 2s (100 * 20ms) in total */
+
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       uint32_t retry_cnt = HNS3_MAX_LINK_CHECK_TIMES;
+       struct hns3_mac *mac = &hw->mac;
+       struct rte_eth_link new_link;
+       int ret;
+
+       do {
+               ret = hns3_update_port_link_info(eth_dev);
+               if (ret) {
+                       mac->link_status = ETH_LINK_DOWN;
+                       hns3_err(hw, "failed to get port link info, ret = %d.",
+                                ret);
+                       break;
+               }
+
+               if (!wait_to_complete || mac->link_status == ETH_LINK_UP)
+                       break;
+
+               rte_delay_ms(HNS3_LINK_CHECK_INTERVAL);
+       } while (retry_cnt--);
+
+       memset(&new_link, 0, sizeof(new_link));
+       hns3_setup_linkstatus(eth_dev, &new_link);
 
        return rte_eth_linkstatus_set(eth_dev, &new_link);
 }
@@ -2983,6 +3136,20 @@ hns3_parse_dev_specifications(struct hns3_hw *hw, struct hns3_cmd_desc *desc)
        hw->intr.int_ql_max = rte_le_to_cpu_16(req0->intr_ql_max);
 }
 
+static int
+hns3_check_dev_specifications(struct hns3_hw *hw)
+{
+       if (hw->rss_ind_tbl_size == 0 ||
+           hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) {
+               hns3_err(hw, "the size of hash lookup table configured (%u)"
+                             " exceeds the maximum(%u)", hw->rss_ind_tbl_size,
+                             HNS3_RSS_IND_TBL_SIZE_MAX);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int
 hns3_query_dev_specifications(struct hns3_hw *hw)
 {
@@ -3003,7 +3170,7 @@ hns3_query_dev_specifications(struct hns3_hw *hw)
 
        hns3_parse_dev_specifications(hw, desc);
 
-       return 0;
+       return hns3_check_dev_specifications(hw);
 }
 
 static int
@@ -3043,9 +3210,11 @@ hns3_get_capability(struct hns3_hw *hw)
                hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_2US;
                hw->tso_mode = HNS3_TSO_SW_CAL_PSEUDO_H_CSUM;
                hw->vlan_mode = HNS3_SW_SHIFT_AND_DISCARD_MODE;
+               hw->drop_stats_mode = HNS3_PKTS_DROP_STATS_MODE1;
                hw->min_tx_pkt_len = HNS3_HIP08_MIN_TX_PKT_LEN;
                pf->tqp_config_mode = HNS3_FIXED_MAX_TQP_NUM_MODE;
                hw->rss_info.ipv6_sctp_offload_supported = false;
+               hw->udp_cksum_mode = HNS3_SPECIAL_PORT_SW_CKSUM_MODE;
                return 0;
        }
 
@@ -3061,13 +3230,46 @@ hns3_get_capability(struct hns3_hw *hw)
        hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_1US;
        hw->tso_mode = HNS3_TSO_HW_CAL_PSEUDO_H_CSUM;
        hw->vlan_mode = HNS3_HW_SHIFT_AND_DISCARD_MODE;
+       hw->drop_stats_mode = HNS3_PKTS_DROP_STATS_MODE2;
        hw->min_tx_pkt_len = HNS3_HIP09_MIN_TX_PKT_LEN;
        pf->tqp_config_mode = HNS3_FLEX_MAX_TQP_NUM_MODE;
        hw->rss_info.ipv6_sctp_offload_supported = true;
+       hw->udp_cksum_mode = HNS3_SPECIAL_PORT_HW_CKSUM_MODE;
 
        return 0;
 }
 
+static int
+hns3_check_media_type(struct hns3_hw *hw, uint8_t media_type)
+{
+       int ret;
+
+       switch (media_type) {
+       case HNS3_MEDIA_TYPE_COPPER:
+               if (!hns3_dev_copper_supported(hw)) {
+                       PMD_INIT_LOG(ERR,
+                                    "Media type is copper, not supported.");
+                       ret = -EOPNOTSUPP;
+               } else {
+                       ret = 0;
+               }
+               break;
+       case HNS3_MEDIA_TYPE_FIBER:
+               ret = 0;
+               break;
+       case HNS3_MEDIA_TYPE_BACKPLANE:
+               PMD_INIT_LOG(ERR, "Media type is Backplane, not supported.");
+               ret = -EOPNOTSUPP;
+               break;
+       default:
+               PMD_INIT_LOG(ERR, "Unknown media type = %u!", media_type);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
 static int
 hns3_get_board_configuration(struct hns3_hw *hw)
 {
@@ -3082,11 +3284,9 @@ hns3_get_board_configuration(struct hns3_hw *hw)
                return ret;
        }
 
-       if (cfg.media_type == HNS3_MEDIA_TYPE_COPPER &&
-           !hns3_dev_copper_supported(hw)) {
-               PMD_INIT_LOG(ERR, "media type is copper, not supported.");
-               return -EOPNOTSUPP;
-       }
+       ret = hns3_check_media_type(hw, cfg.media_type);
+       if (ret)
+               return ret;
 
        hw->mac.media_type = cfg.media_type;
        hw->rss_size_max = cfg.rss_size_max;
@@ -3918,6 +4118,28 @@ hns3_buffer_alloc(struct hns3_hw *hw)
        return ret;
 }
 
+static int
+hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init)
+{
+       struct hns3_firmware_compat_cmd *req;
+       struct hns3_cmd_desc desc;
+       uint32_t compat = 0;
+
+       hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_FIRMWARE_COMPAT_CFG, false);
+       req = (struct hns3_firmware_compat_cmd *)desc.data;
+
+       if (is_init) {
+               hns3_set_bit(compat, HNS3_LINK_EVENT_REPORT_EN_B, 1);
+               hns3_set_bit(compat, HNS3_NCSI_ERROR_REPORT_EN_B, 0);
+               if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER)
+                       hns3_set_bit(compat, HNS3_FIRMWARE_PHY_DRIVER_EN_B, 1);
+       }
+
+       req->compat = rte_cpu_to_le_32(compat);
+
+       return hns3_cmd_send(hw, &desc, 1);
+}
+
 static int
 hns3_mac_init(struct hns3_hw *hw)
 {
@@ -4343,7 +4565,6 @@ static int
 hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
 {
        struct hns3_mac *mac = &hw->mac;
-       uint32_t cur_speed = mac->link_speed;
        int ret;
 
        duplex = hns3_check_speed_dup(duplex, speed);
@@ -4354,25 +4575,20 @@ hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
        if (ret)
                return ret;
 
-       mac->link_speed = speed;
-       ret = hns3_dcb_port_shaper_cfg(hw);
-       if (ret) {
-               hns3_err(hw, "failed to configure port shaper, ret = %d.", ret);
-               mac->link_speed = cur_speed;
+       ret = hns3_port_shaper_update(hw, speed);
+       if (ret)
                return ret;
-       }
 
+       mac->link_speed = speed;
        mac->link_duplex = duplex;
 
        return 0;
 }
 
 static int
-hns3_update_speed_duplex(struct rte_eth_dev *eth_dev)
+hns3_update_fiber_link_info(struct hns3_hw *hw)
 {
-       struct hns3_adapter *hns = eth_dev->data->dev_private;
-       struct hns3_hw *hw = &hns->hw;
-       struct hns3_pf *pf = &hns->pf;
+       struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw);
        uint32_t speed;
        int ret;
 
@@ -4394,6 +4610,93 @@ hns3_update_speed_duplex(struct rte_eth_dev *eth_dev)
        return hns3_cfg_mac_speed_dup(hw, speed, ETH_LINK_FULL_DUPLEX);
 }
 
+static void
+hns3_parse_copper_phy_params(struct hns3_cmd_desc *desc, struct hns3_mac *mac)
+{
+       struct hns3_phy_params_bd0_cmd *req;
+
+       req = (struct hns3_phy_params_bd0_cmd *)desc[0].data;
+       mac->link_speed = rte_le_to_cpu_32(req->speed);
+       mac->link_duplex = hns3_get_bit(req->duplex,
+                                          HNS3_PHY_DUPLEX_CFG_B);
+       mac->link_autoneg = hns3_get_bit(req->autoneg,
+                                          HNS3_PHY_AUTONEG_CFG_B);
+       mac->supported_capa = rte_le_to_cpu_32(req->supported);
+       mac->advertising = rte_le_to_cpu_32(req->advertising);
+       mac->lp_advertising = rte_le_to_cpu_32(req->lp_advertising);
+       mac->support_autoneg = !!(mac->supported_capa &
+                               HNS3_PHY_LINK_MODE_AUTONEG_BIT);
+}
+
+static int
+hns3_get_copper_phy_params(struct hns3_hw *hw, struct hns3_mac *mac)
+{
+       struct hns3_cmd_desc desc[HNS3_PHY_PARAM_CFG_BD_NUM];
+       uint16_t i;
+       int ret;
+
+       for (i = 0; i < HNS3_PHY_PARAM_CFG_BD_NUM - 1; i++) {
+               hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_PHY_PARAM_CFG,
+                                         true);
+               desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT);
+       }
+       hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_PHY_PARAM_CFG, true);
+
+       ret = hns3_cmd_send(hw, desc, HNS3_PHY_PARAM_CFG_BD_NUM);
+       if (ret) {
+               hns3_err(hw, "get phy parameters failed, ret = %d.", ret);
+               return ret;
+       }
+
+       hns3_parse_copper_phy_params(desc, mac);
+
+       return 0;
+}
+
+static int
+hns3_update_copper_link_info(struct hns3_hw *hw)
+{
+       struct hns3_mac *mac = &hw->mac;
+       struct hns3_mac mac_info;
+       int ret;
+
+       memset(&mac_info, 0, sizeof(struct hns3_mac));
+       ret = hns3_get_copper_phy_params(hw, &mac_info);
+       if (ret)
+               return ret;
+
+       if (mac_info.link_speed != mac->link_speed) {
+               ret = hns3_port_shaper_update(hw, mac_info.link_speed);
+               if (ret)
+                       return ret;
+       }
+
+       mac->link_speed = mac_info.link_speed;
+       mac->link_duplex = mac_info.link_duplex;
+       mac->link_autoneg = mac_info.link_autoneg;
+       mac->supported_capa = mac_info.supported_capa;
+       mac->advertising = mac_info.advertising;
+       mac->lp_advertising = mac_info.lp_advertising;
+       mac->support_autoneg = mac_info.support_autoneg;
+
+       return 0;
+}
+
+static int
+hns3_update_link_info(struct rte_eth_dev *eth_dev)
+{
+       struct hns3_adapter *hns = eth_dev->data->dev_private;
+       struct hns3_hw *hw = &hns->hw;
+       int ret = 0;
+
+       if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER)
+               ret = hns3_update_copper_link_info(hw);
+       else if (hw->mac.media_type == HNS3_MEDIA_TYPE_FIBER)
+               ret = hns3_update_fiber_link_info(hw);
+
+       return ret;
+}
+
 static int
 hns3_cfg_mac_mode(struct hns3_hw *hw, bool enable)
 {
@@ -4469,6 +4772,8 @@ hns3_update_link_status(struct hns3_hw *hw)
        if (state != hw->mac.link_status) {
                hw->mac.link_status = state;
                hns3_warn(hw, "Link status change to %s!", state ? "up" : "down");
+               hns3_config_mac_tnl_int(hw,
+                                       state == ETH_LINK_UP ? true : false);
                return true;
        }
 
@@ -4509,8 +4814,8 @@ hns3_service_handler(void *param)
        struct hns3_hw *hw = &hns->hw;
 
        if (!hns3_is_reset_pending(hns)) {
-               hns3_update_speed_duplex(eth_dev);
                hns3_update_link_status_and_event(hw);
+               hns3_update_link_info(eth_dev);
        } else {
                hns3_warn(hw, "Cancel the query when reset is pending");
        }
@@ -4597,6 +4902,15 @@ hns3_init_hardware(struct hns3_adapter *hns)
                goto err_mac_init;
        }
 
+       /*
+        * Requiring firmware to enable some features, driver can
+        * still work without it.
+        */
+       ret = hns3_firmware_compat_config(hw, true);
+       if (ret)
+               PMD_INIT_LOG(WARNING, "firmware compatible features not "
+                            "supported, ret = %d.", ret);
+
        return 0;
 
 err_mac_init:
@@ -4679,6 +4993,13 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
                goto err_cmd_init;
        }
 
+       /* Hardware statistics of imissed registers cleared. */
+       ret = hns3_update_imissed_stats(hw, true);
+       if (ret) {
+               hns3_err(hw, "clear imissed stats failed, ret = %d", ret);
+               return ret;
+       }
+
        hns3_config_all_msix_error(hw, true);
 
        ret = rte_intr_callback_register(&pci_dev->intr_handle,
@@ -4689,6 +5010,10 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
                goto err_intr_callback_register;
        }
 
+       ret = hns3_ptp_init(hw);
+       if (ret)
+               goto err_get_config;
+
        /* Enable interrupt */
        rte_intr_enable(&pci_dev->intr_handle);
        hns3_pf_enable_irq0(hw);
@@ -4733,6 +5058,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
 err_enable_intr:
        hns3_fdir_filter_uninit(hns);
 err_fdir:
+       (void)hns3_firmware_compat_config(hw, false);
        hns3_uninit_umv_space(hw);
 err_init_hw:
        hns3_tqp_stats_uninit(hw);
@@ -4767,8 +5093,10 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)
        (void)hns3_config_gro(hw, false);
        hns3_promisc_uninit(hw);
        hns3_fdir_filter_uninit(hns);
+       (void)hns3_firmware_compat_config(hw, false);
        hns3_uninit_umv_space(hw);
        hns3_tqp_stats_uninit(hw);
+       hns3_config_mac_tnl_int(hw, false);
        hns3_pf_disable_irq0(hw);
        rte_intr_disable(&pci_dev->intr_handle);
        hns3_intr_unregister(&pci_dev->intr_handle, hns3_interrupt_handler,
@@ -4799,6 +5127,8 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
                return ret;
        }
 
+       hns3_enable_rxd_adv_layout(hw);
+
        ret = hns3_init_queues(hns, reset_queue);
        if (ret) {
                PMD_INIT_LOG(ERR, "failed to init queues, ret = %d.", ret);
@@ -4944,11 +5274,8 @@ hns3_dev_start(struct rte_eth_dev *dev)
                return ret;
        }
        ret = hns3_map_rx_interrupt(dev);
-       if (ret) {
-               hw->adapter_state = HNS3_NIC_CONFIGURED;
-               rte_spinlock_unlock(&hw->lock);
-               return ret;
-       }
+       if (ret)
+               goto map_rx_inter_err;
 
        /*
         * There are three register used to control the status of a TQP
@@ -4962,19 +5289,12 @@ hns3_dev_start(struct rte_eth_dev *dev)
         * status of queue in the dpdk framework.
         */
        ret = hns3_start_all_txqs(dev);
-       if (ret) {
-               hw->adapter_state = HNS3_NIC_CONFIGURED;
-               rte_spinlock_unlock(&hw->lock);
-               return ret;
-       }
+       if (ret)
+               goto map_rx_inter_err;
 
        ret = hns3_start_all_rxqs(dev);
-       if (ret) {
-               hns3_stop_all_txqs(dev);
-               hw->adapter_state = HNS3_NIC_CONFIGURED;
-               rte_spinlock_unlock(&hw->lock);
-               return ret;
-       }
+       if (ret)
+               goto start_all_rxqs_fail;
 
        hw->adapter_state = HNS3_NIC_STARTED;
        rte_spinlock_unlock(&hw->lock);
@@ -4998,7 +5318,17 @@ hns3_dev_start(struct rte_eth_dev *dev)
        hns3_tm_dev_start_proc(hw);
 
        hns3_info(hw, "hns3 dev start successful!");
+
        return 0;
+
+start_all_rxqs_fail:
+       hns3_stop_all_txqs(dev);
+map_rx_inter_err:
+       (void)hns3_do_stop(hns);
+       hw->adapter_state = HNS3_NIC_CONFIGURED;
+       rte_spinlock_unlock(&hw->lock);
+
+       return ret;
 }
 
 static int
@@ -5007,12 +5337,23 @@ hns3_do_stop(struct hns3_adapter *hns)
        struct hns3_hw *hw = &hns->hw;
        int ret;
 
+       /*
+        * The "hns3_do_stop" function will also be called by .stop_service to
+        * prepare reset. At the time of global or IMP reset, the command cannot
+        * be sent to stop the tx/rx queues. The mbuf in Tx/Rx queues may be
+        * accessed during the reset process. So the mbuf can not be released
+        * during reset and is required to be released after the reset is
+        * completed.
+        */
+       if (__atomic_load_n(&hw->reset.resetting,  __ATOMIC_RELAXED) == 0)
+               hns3_dev_release_mbufs(hns);
+
        ret = hns3_cfg_mac_mode(hw, false);
        if (ret)
                return ret;
        hw->mac.link_status = ETH_LINK_DOWN;
 
-       if (rte_atomic16_read(&hw->reset.disable_cmd) == 0) {
+       if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED) == 0) {
                hns3_configure_all_mac_addr(hns, true);
                ret = hns3_reset_all_tqps(hns);
                if (ret) {
@@ -5081,10 +5422,10 @@ hns3_dev_stop(struct rte_eth_dev *dev)
        rte_spinlock_lock(&hw->lock);
        if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {
                hns3_tm_dev_stop_proc(hw);
+               hns3_config_mac_tnl_int(hw, false);
                hns3_stop_tqps(hw);
                hns3_do_stop(hns);
                hns3_unmap_rx_interrupt(dev);
-               hns3_dev_release_mbufs(hns);
                hw->adapter_state = HNS3_NIC_CONFIGURED;
        }
        hns3_rx_scattered_reset(dev);
@@ -5523,14 +5864,12 @@ hns3_record_imp_error(struct hns3_adapter *hns)
        reg_val = hns3_read_dev(hw, HNS3_VECTOR0_OTER_EN_REG);
        if (hns3_get_bit(reg_val, HNS3_VECTOR0_IMP_RD_POISON_B)) {
                hns3_warn(hw, "Detected IMP RD poison!");
-               hns3_error_int_stats_add(hns, "IMP_RD_POISON_INT_STS");
                hns3_set_bit(reg_val, HNS3_VECTOR0_IMP_RD_POISON_B, 0);
                hns3_write_dev(hw, HNS3_VECTOR0_OTER_EN_REG, reg_val);
        }
 
        if (hns3_get_bit(reg_val, HNS3_VECTOR0_IMP_CMDQ_ERR_B)) {
                hns3_warn(hw, "Detected IMP CMDQ error!");
-               hns3_error_int_stats_add(hns, "CMDQ_MEM_ECC_INT_STS");
                hns3_set_bit(reg_val, HNS3_VECTOR0_IMP_CMDQ_ERR_B, 0);
                hns3_write_dev(hw, HNS3_VECTOR0_OTER_EN_REG, reg_val);
        }
@@ -5555,7 +5894,7 @@ hns3_prepare_reset(struct hns3_adapter *hns)
                 * any mailbox handling or command to firmware is only valid
                 * after hns3_cmd_init is called.
                 */
-               rte_atomic16_set(&hw->reset.disable_cmd, 1);
+               __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
                hw->reset.stats.request_cnt++;
                break;
        case HNS3_IMP_RESET:
@@ -5615,7 +5954,7 @@ hns3_stop_service(struct hns3_adapter *hns)
         * from table space. Hence, for function reset software intervention is
         * required to delete the entries
         */
-       if (rte_atomic16_read(&hw->reset.disable_cmd) == 0)
+       if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED) == 0)
                hns3_configure_all_mc_mac_addr(hns, true);
        rte_spinlock_unlock(&hw->lock);
 
@@ -5692,6 +6031,10 @@ hns3_restore_conf(struct hns3_adapter *hns)
        if (ret)
                goto err_promisc;
 
+       ret = hns3_restore_ptp(hns);
+       if (ret)
+               goto err_promisc;
+
        ret = hns3_restore_rx_interrupt(hw);
        if (ret)
                goto err_promisc;
@@ -5737,8 +6080,10 @@ hns3_reset_service(void *param)
         * The interrupt may have been lost. It is necessary to handle
         * the interrupt to recover from the error.
         */
-       if (rte_atomic16_read(&hns->hw.reset.schedule) == SCHEDULE_DEFERRED) {
-               rte_atomic16_set(&hns->hw.reset.schedule, SCHEDULE_REQUESTED);
+       if (__atomic_load_n(&hw->reset.schedule, __ATOMIC_RELAXED) ==
+                           SCHEDULE_DEFERRED) {
+               __atomic_store_n(&hw->reset.schedule, SCHEDULE_REQUESTED,
+                                 __ATOMIC_RELAXED);
                hns3_err(hw, "Handling interrupts in delayed tasks");
                hns3_interrupt_handler(&rte_eth_devices[hw->data->port_id]);
                reset_level = hns3_get_reset_level(hns, &hw->reset.pending);
@@ -5747,7 +6092,7 @@ hns3_reset_service(void *param)
                        hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending);
                }
        }
-       rte_atomic16_set(&hns->hw.reset.schedule, SCHEDULE_NONE);
+       __atomic_store_n(&hw->reset.schedule, SCHEDULE_NONE, __ATOMIC_RELAXED);
 
        /*
         * Check if there is any ongoing reset in the hardware. This status can
@@ -6105,6 +6450,235 @@ hns3_query_dev_fec_info(struct hns3_hw *hw)
        return ret;
 }
 
+static bool
+hns3_optical_module_existed(struct hns3_hw *hw)
+{
+       struct hns3_cmd_desc desc;
+       bool existed;
+       int ret;
+
+       hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_GET_SFP_EXIST, true);
+       ret = hns3_cmd_send(hw, &desc, 1);
+       if (ret) {
+               hns3_err(hw,
+                        "fail to get optical module exist state, ret = %d.\n",
+                        ret);
+               return false;
+       }
+       existed = !!desc.data[0];
+
+       return existed;
+}
+
+static int
+hns3_get_module_eeprom_data(struct hns3_hw *hw, uint32_t offset,
+                               uint32_t len, uint8_t *data)
+{
+#define HNS3_SFP_INFO_CMD_NUM 6
+#define HNS3_SFP_INFO_MAX_LEN \
+       (HNS3_SFP_INFO_BD0_LEN + \
+       (HNS3_SFP_INFO_CMD_NUM - 1) * HNS3_SFP_INFO_BDX_LEN)
+       struct hns3_cmd_desc desc[HNS3_SFP_INFO_CMD_NUM];
+       struct hns3_sfp_info_bd0_cmd *sfp_info_bd0;
+       uint16_t read_len;
+       uint16_t copy_len;
+       int ret;
+       int i;
+
+       for (i = 0; i < HNS3_SFP_INFO_CMD_NUM; i++) {
+               hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_GET_SFP_EEPROM,
+                                         true);
+               if (i < HNS3_SFP_INFO_CMD_NUM - 1)
+                       desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT);
+       }
+
+       sfp_info_bd0 = (struct hns3_sfp_info_bd0_cmd *)desc[0].data;
+       sfp_info_bd0->offset = rte_cpu_to_le_16((uint16_t)offset);
+       read_len = RTE_MIN(len, HNS3_SFP_INFO_MAX_LEN);
+       sfp_info_bd0->read_len = rte_cpu_to_le_16((uint16_t)read_len);
+
+       ret = hns3_cmd_send(hw, desc, HNS3_SFP_INFO_CMD_NUM);
+       if (ret) {
+               hns3_err(hw, "fail to get module EEPROM info, ret = %d.\n",
+                               ret);
+               return ret;
+       }
+
+       /* The data format in BD0 is different with the others. */
+       copy_len = RTE_MIN(len, HNS3_SFP_INFO_BD0_LEN);
+       memcpy(data, sfp_info_bd0->data, copy_len);
+       read_len = copy_len;
+
+       for (i = 1; i < HNS3_SFP_INFO_CMD_NUM; i++) {
+               if (read_len >= len)
+                       break;
+
+               copy_len = RTE_MIN(len - read_len, HNS3_SFP_INFO_BDX_LEN);
+               memcpy(data + read_len, desc[i].data, copy_len);
+               read_len += copy_len;
+       }
+
+       return (int)read_len;
+}
+
+static int
+hns3_get_module_eeprom(struct rte_eth_dev *dev,
+                      struct rte_dev_eeprom_info *info)
+{
+       struct hns3_adapter *hns = dev->data->dev_private;
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns);
+       uint32_t offset = info->offset;
+       uint32_t len = info->length;
+       uint8_t *data = info->data;
+       uint32_t read_len = 0;
+
+       if (hw->mac.media_type != HNS3_MEDIA_TYPE_FIBER)
+               return -ENOTSUP;
+
+       if (!hns3_optical_module_existed(hw)) {
+               hns3_err(hw, "fail to read module EEPROM: no module is connected.\n");
+               return -EIO;
+       }
+
+       while (read_len < len) {
+               int ret;
+               ret = hns3_get_module_eeprom_data(hw, offset + read_len,
+                                                 len - read_len,
+                                                 data + read_len);
+               if (ret < 0)
+                       return -EIO;
+               read_len += ret;
+       }
+
+       return 0;
+}
+
+static int
+hns3_get_module_info(struct rte_eth_dev *dev,
+                    struct rte_eth_dev_module_info *modinfo)
+{
+#define HNS3_SFF8024_ID_SFP            0x03
+#define HNS3_SFF8024_ID_QSFP_8438      0x0c
+#define HNS3_SFF8024_ID_QSFP_8436_8636 0x0d
+#define HNS3_SFF8024_ID_QSFP28_8636    0x11
+#define HNS3_SFF_8636_V1_3             0x03
+       struct hns3_adapter *hns = dev->data->dev_private;
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns);
+       struct rte_dev_eeprom_info info;
+       struct hns3_sfp_type sfp_type;
+       int ret;
+
+       memset(&sfp_type, 0, sizeof(sfp_type));
+       memset(&info, 0, sizeof(info));
+       info.data = (uint8_t *)&sfp_type;
+       info.length = sizeof(sfp_type);
+       ret = hns3_get_module_eeprom(dev, &info);
+       if (ret)
+               return ret;
+
+       switch (sfp_type.type) {
+       case HNS3_SFF8024_ID_SFP:
+               modinfo->type = RTE_ETH_MODULE_SFF_8472;
+               modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN;
+               break;
+       case HNS3_SFF8024_ID_QSFP_8438:
+               modinfo->type = RTE_ETH_MODULE_SFF_8436;
+               modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8436_MAX_LEN;
+               break;
+       case HNS3_SFF8024_ID_QSFP_8436_8636:
+               if (sfp_type.ext_type < HNS3_SFF_8636_V1_3) {
+                       modinfo->type = RTE_ETH_MODULE_SFF_8436;
+                       modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8436_MAX_LEN;
+               } else {
+                       modinfo->type = RTE_ETH_MODULE_SFF_8636;
+                       modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8636_MAX_LEN;
+               }
+               break;
+       case HNS3_SFF8024_ID_QSFP28_8636:
+               modinfo->type = RTE_ETH_MODULE_SFF_8636;
+               modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8636_MAX_LEN;
+               break;
+       default:
+               hns3_err(hw, "unknown module, type = %u, extra_type = %u.\n",
+                        sfp_type.type, sfp_type.ext_type);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int
+hns3_parse_io_hint_func(const char *key, const char *value, void *extra_args)
+{
+       uint32_t hint = HNS3_IO_FUNC_HINT_NONE;
+
+       RTE_SET_USED(key);
+
+       if (strcmp(value, "vec") == 0)
+               hint = HNS3_IO_FUNC_HINT_VEC;
+       else if (strcmp(value, "sve") == 0)
+               hint = HNS3_IO_FUNC_HINT_SVE;
+       else if (strcmp(value, "simple") == 0)
+               hint = HNS3_IO_FUNC_HINT_SIMPLE;
+       else if (strcmp(value, "common") == 0)
+               hint = HNS3_IO_FUNC_HINT_COMMON;
+
+       /* If the hint is valid then update output parameters */
+       if (hint != HNS3_IO_FUNC_HINT_NONE)
+               *(uint32_t *)extra_args = hint;
+
+       return 0;
+}
+
+static const char *
+hns3_get_io_hint_func_name(uint32_t hint)
+{
+       switch (hint) {
+       case HNS3_IO_FUNC_HINT_VEC:
+               return "vec";
+       case HNS3_IO_FUNC_HINT_SVE:
+               return "sve";
+       case HNS3_IO_FUNC_HINT_SIMPLE:
+               return "simple";
+       case HNS3_IO_FUNC_HINT_COMMON:
+               return "common";
+       default:
+               return "none";
+       }
+}
+
+void
+hns3_parse_devargs(struct rte_eth_dev *dev)
+{
+       struct hns3_adapter *hns = dev->data->dev_private;
+       uint32_t rx_func_hint = HNS3_IO_FUNC_HINT_NONE;
+       uint32_t tx_func_hint = HNS3_IO_FUNC_HINT_NONE;
+       struct hns3_hw *hw = &hns->hw;
+       struct rte_kvargs *kvlist;
+
+       if (dev->device->devargs == NULL)
+               return;
+
+       kvlist = rte_kvargs_parse(dev->device->devargs->args, NULL);
+       if (!kvlist)
+               return;
+
+       rte_kvargs_process(kvlist, HNS3_DEVARG_RX_FUNC_HINT,
+                          &hns3_parse_io_hint_func, &rx_func_hint);
+       rte_kvargs_process(kvlist, HNS3_DEVARG_TX_FUNC_HINT,
+                          &hns3_parse_io_hint_func, &tx_func_hint);
+       rte_kvargs_free(kvlist);
+
+       if (rx_func_hint != HNS3_IO_FUNC_HINT_NONE)
+               hns3_warn(hw, "parsed %s = %s.", HNS3_DEVARG_RX_FUNC_HINT,
+                         hns3_get_io_hint_func_name(rx_func_hint));
+       hns->rx_func_hint = rx_func_hint;
+       if (tx_func_hint != HNS3_IO_FUNC_HINT_NONE)
+               hns3_warn(hw, "parsed %s = %s.", HNS3_DEVARG_TX_FUNC_HINT,
+                         hns3_get_io_hint_func_name(tx_func_hint));
+       hns->tx_func_hint = tx_func_hint;
+}
+
 static const struct eth_dev_ops hns3_eth_dev_ops = {
        .dev_configure      = hns3_dev_configure,
        .dev_start          = hns3_dev_start,
@@ -6150,18 +6724,28 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
        .rss_hash_conf_get      = hns3_dev_rss_hash_conf_get,
        .reta_update            = hns3_dev_rss_reta_update,
        .reta_query             = hns3_dev_rss_reta_query,
-       .filter_ctrl            = hns3_dev_filter_ctrl,
+       .flow_ops_get           = hns3_dev_flow_ops_get,
        .vlan_filter_set        = hns3_vlan_filter_set,
        .vlan_tpid_set          = hns3_vlan_tpid_set,
        .vlan_offload_set       = hns3_vlan_offload_set,
        .vlan_pvid_set          = hns3_vlan_pvid_set,
        .get_reg                = hns3_get_regs,
+       .get_module_info        = hns3_get_module_info,
+       .get_module_eeprom      = hns3_get_module_eeprom,
        .get_dcb_info           = hns3_get_dcb_info,
        .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
        .fec_get_capability     = hns3_fec_get_capability,
        .fec_get                = hns3_fec_get,
        .fec_set                = hns3_fec_set,
        .tm_ops_get             = hns3_tm_ops_get,
+       .tx_done_cleanup        = hns3_tx_done_cleanup,
+       .timesync_enable            = hns3_timesync_enable,
+       .timesync_disable           = hns3_timesync_disable,
+       .timesync_read_rx_timestamp = hns3_timesync_read_rx_timestamp,
+       .timesync_read_tx_timestamp = hns3_timesync_read_tx_timestamp,
+       .timesync_adjust_time       = hns3_timesync_adjust_time,
+       .timesync_read_time         = hns3_timesync_read_time,
+       .timesync_write_time        = hns3_timesync_write_time,
 };
 
 static const struct hns3_reset_ops hns3_reset_ops = {
@@ -6222,6 +6806,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
        hw->adapter_state = HNS3_NIC_UNINITIALIZED;
        hns->is_vf = false;
        hw->data = eth_dev->data;
+       hns3_parse_devargs(eth_dev);
 
        /*
         * Set default max packet size according to the mtu
@@ -6267,7 +6852,8 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
 
        hw->adapter_state = HNS3_NIC_INITIALIZED;
 
-       if (rte_atomic16_read(&hns->hw.reset.schedule) == SCHEDULE_PENDING) {
+       if (__atomic_load_n(&hw->reset.schedule, __ATOMIC_RELAXED) ==
+                           SCHEDULE_PENDING) {
                hns3_err(hw, "Reschedule reset service after dev_init");
                hns3_schedule_reset(hns);
        } else {
@@ -6291,8 +6877,10 @@ err_mp_init_primary:
 err_mp_init_secondary:
        eth_dev->dev_ops = NULL;
        eth_dev->rx_pkt_burst = NULL;
+       eth_dev->rx_descriptor_status = NULL;
        eth_dev->tx_pkt_burst = NULL;
        eth_dev->tx_pkt_prepare = NULL;
+       eth_dev->tx_descriptor_status = NULL;
        rte_free(eth_dev->process_private);
        eth_dev->process_private = NULL;
        return ret;
@@ -6354,5 +6942,8 @@ static struct rte_pci_driver rte_hns3_pmd = {
 RTE_PMD_REGISTER_PCI(net_hns3, rte_hns3_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_hns3, pci_id_hns3_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_hns3, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_hns3,
+               HNS3_DEVARG_RX_FUNC_HINT "=vec|sve|simple|common "
+               HNS3_DEVARG_TX_FUNC_HINT "=vec|sve|simple|common ");
 RTE_LOG_REGISTER(hns3_logtype_init, pmd.net.hns3.init, NOTICE);
 RTE_LOG_REGISTER(hns3_logtype_driver, pmd.net.hns3.driver, NOTICE);