net/hns3: fix HW buffer size on MTU update
[dpdk.git] / drivers / net / hns3 / hns3_ethdev.c
index c850e5e..21c3c59 100644 (file)
@@ -2,25 +2,9 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <rte_atomic.h>
+#include <rte_alarm.h>
 #include <rte_bus_pci.h>
-#include <rte_common.h>
-#include <rte_cycles.h>
-#include <rte_dev.h>
-#include <rte_eal.h>
-#include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
-#include <rte_interrupts.h>
-#include <rte_io.h>
-#include <rte_log.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 
 #include "hns3_ethdev.h"
@@ -35,6 +19,7 @@
 #define HNS3_DEFAULT_PORT_CONF_QUEUES_NUM      1
 
 #define HNS3_SERVICE_INTERVAL          1000000 /* us */
+#define HNS3_SERVICE_QUICK_INTERVAL    10
 #define HNS3_INVALID_PVID              0xFFFF
 
 #define HNS3_FILTER_TYPE_VF            0
@@ -108,14 +93,24 @@ 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,
                            struct rte_ether_addr *mac_addr);
 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 rte_eth_dev *dev);
+static int hns3_query_dev_fec_info(struct hns3_hw *hw);
+
+void hns3_ether_format_addr(char *buf, uint16_t size,
+                           const struct rte_ether_addr *ether_addr)
+{
+       snprintf(buf, size, "%02X:**:**:**:%02X:%02X",
+               ether_addr->addr_bytes[0],
+               ether_addr->addr_bytes[4],
+               ether_addr->addr_bytes[5]);
+}
 
 static void
 hns3_pf_disable_irq0(struct hns3_hw *hw)
@@ -129,6 +124,47 @@ hns3_pf_enable_irq0(struct hns3_hw *hw)
        hns3_write_dev(hw, HNS3_MISC_VECTOR_REG_BASE, 1);
 }
 
+static enum hns3_evt_cause
+hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay,
+                         uint32_t *vec_val)
+{
+       struct hns3_hw *hw = &hns->hw;
+
+       __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) {
+               hw->reset.stats.imp_cnt++;
+               hns3_warn(hw, "IMP reset detected, clear reset status");
+       } else {
+               hns3_schedule_delayed_reset(hns);
+               hns3_warn(hw, "IMP reset detected, don't clear reset status");
+       }
+
+       return HNS3_VECTOR0_EVENT_RST;
+}
+
+static enum hns3_evt_cause
+hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay,
+                            uint32_t *vec_val)
+{
+       struct hns3_hw *hw = &hns->hw;
+
+       __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) {
+               hw->reset.stats.global_cnt++;
+               hns3_warn(hw, "Global reset detected, clear reset status");
+       } else {
+               hns3_schedule_delayed_reset(hns);
+               hns3_warn(hw,
+                         "Global reset detected, don't clear reset status");
+       }
+
+       return HNS3_VECTOR0_EVENT_RST;
+}
+
 static enum hns3_evt_cause
 hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
 {
@@ -138,12 +174,14 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
        uint32_t hw_err_src_reg;
        uint32_t val;
        enum hns3_evt_cause ret;
+       bool is_delay;
 
        /* fetch the events from their corresponding regs */
        vector0_int_stats = hns3_read_dev(hw, HNS3_VECTOR0_OTHER_INT_STS_REG);
        cmdq_src_val = hns3_read_dev(hw, HNS3_VECTOR0_CMDQ_SRC_REG);
        hw_err_src_reg = hns3_read_dev(hw, HNS3_RAS_PF_OTHER_INT_STS_REG);
 
+       is_delay = clearval == NULL ? true : false;
        /*
         * Assumption: If by any chance reset and mailbox events are reported
         * together then we will only process reset event and defer the
@@ -152,35 +190,13 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
         * from H/W just for the mailbox.
         */
        if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_int_stats) { /* IMP */
-               rte_atomic16_set(&hw->reset.disable_cmd, 1);
-               hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending);
-               val = BIT(HNS3_VECTOR0_IMPRESET_INT_B);
-               if (clearval) {
-                       hw->reset.stats.imp_cnt++;
-                       hns3_warn(hw, "IMP reset detected, clear reset status");
-               } else {
-                       hns3_schedule_delayed_reset(hns);
-                       hns3_warn(hw, "IMP reset detected, don't clear reset status");
-               }
-
-               ret = HNS3_VECTOR0_EVENT_RST;
+               ret = hns3_proc_imp_reset_event(hns, is_delay, &val);
                goto out;
        }
 
        /* Global reset */
        if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_int_stats) {
-               rte_atomic16_set(&hw->reset.disable_cmd, 1);
-               hns3_atomic_set_bit(HNS3_GLOBAL_RESET, &hw->reset.pending);
-               val = BIT(HNS3_VECTOR0_GLOBALRESET_INT_B);
-               if (clearval) {
-                       hw->reset.stats.global_cnt++;
-                       hns3_warn(hw, "Global reset detected, clear reset status");
-               } else {
-                       hns3_schedule_delayed_reset(hns);
-                       hns3_warn(hw, "Global reset detected, don't clear reset status");
-               }
-
-               ret = HNS3_VECTOR0_EVENT_RST;
+               ret = hns3_proc_global_reset_event(hns, is_delay, &val);
                goto out;
        }
 
@@ -253,7 +269,6 @@ hns3_interrupt_handler(void *param)
        hns3_pf_disable_irq0(hw);
 
        event_cause = hns3_check_event_cause(hns, &clearval);
-
        /* vector 0 interrupt is shared with reset and mailbox source events. */
        if (event_cause == HNS3_VECTOR0_EVENT_ERR) {
                hns3_warn(hw, "Received err interrupt");
@@ -1024,7 +1039,7 @@ hns3_init_vlan_config(struct hns3_adapter *hns)
         * ensure that the hardware configuration remains unchanged before and
         * after reset.
         */
-       if (rte_atomic16_read(&hw->reset.resetting) == 0) {
+       if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {
                hw->port_base_vlan_cfg.state = HNS3_PORT_BASE_VLAN_DISABLE;
                hw->port_base_vlan_cfg.pvid = HNS3_INVALID_PVID;
        }
@@ -1048,7 +1063,7 @@ hns3_init_vlan_config(struct hns3_adapter *hns)
         * we will restore configurations to hardware in hns3_restore_vlan_table
         * and hns3_restore_vlan_conf later.
         */
-       if (rte_atomic16_read(&hw->reset.resetting) == 0) {
+       if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {
                ret = hns3_vlan_pvid_configure(hns, HNS3_INVALID_PVID, 0);
                if (ret) {
                        hns3_err(hw, "pvid set fail in pf, ret =%d", ret);
@@ -1115,8 +1130,8 @@ hns3_dev_configure_vlan(struct rte_eth_dev *dev)
                hns3_warn(hw,
                          "hw_vlan_reject_tagged or hw_vlan_reject_untagged "
                          "configuration is not supported! Ignore these two "
-                         "parameters: hw_vlan_reject_tagged(%d), "
-                         "hw_vlan_reject_untagged(%d)",
+                         "parameters: hw_vlan_reject_tagged(%u), "
+                         "hw_vlan_reject_untagged(%u)",
                          txmode->hw_vlan_reject_tagged,
                          txmode->hw_vlan_reject_untagged);
 
@@ -1140,7 +1155,7 @@ hns3_dev_configure_vlan(struct rte_eth_dev *dev)
        ret = hns3_vlan_pvid_set(dev, txmode->pvid,
                                 txmode->hw_vlan_insert_pvid);
        if (ret)
-               hns3_err(hw, "dev config vlan pvid(%d) failed, ret = %d",
+               hns3_err(hw, "dev config vlan pvid(%u) failed, ret = %d",
                         txmode->pvid, ret);
 
        return ret;
@@ -1465,7 +1480,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        /* check if mac addr is valid */
        if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "Add unicast mac addr err! addr(%s) invalid",
                         mac_str);
@@ -1505,7 +1520,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
                return -ENOSPC;
        }
 
-       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, mac_addr);
+       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, mac_addr);
 
        /* check if we just hit the duplicate */
        if (ret == 0) {
@@ -1531,7 +1546,7 @@ hns3_add_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
                addr = &hw->mc_addrs[i];
                /* Check if there are duplicate addresses */
                if (rte_is_same_ether_addr(addr, mac_addr)) {
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              addr);
                        hns3_err(hw, "failed to add mc mac addr, same addrs"
                                 "(%s) is added by the set_mc_mac_addr_list "
@@ -1542,7 +1557,7 @@ hns3_add_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        ret = hns3_add_mc_addr(hw, mac_addr);
        if (ret) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to add mc mac addr(%s), ret = %d",
                         mac_str, ret);
@@ -1558,7 +1573,7 @@ hns3_remove_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        ret = hns3_remove_mc_addr(hw, mac_addr);
        if (ret) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to remove mc mac addr(%s), ret = %d",
                         mac_str, ret);
@@ -1592,7 +1607,7 @@ hns3_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
 
        if (ret) {
                rte_spinlock_unlock(&hw->lock);
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to add mac addr(%s), ret = %d", mac_str,
                         ret);
@@ -1615,7 +1630,7 @@ hns3_remove_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        /* check if mac addr is valid */
        if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "remove unicast mac addr err! addr(%s) invalid",
                         mac_str);
@@ -1651,7 +1666,7 @@ hns3_remove_mac_addr(struct rte_eth_dev *dev, uint32_t idx)
                ret = hns3_remove_uc_addr_common(hw, mac_addr);
        rte_spinlock_unlock(&hw->lock);
        if (ret) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to remove mac addr(%s), ret = %d", mac_str,
                         ret);
@@ -1682,7 +1697,7 @@ hns3_set_default_mac_addr(struct rte_eth_dev *dev,
        if (default_addr_setted) {
                ret = hns3_remove_uc_addr_common(hw, oaddr);
                if (ret) {
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              oaddr);
                        hns3_warn(hw, "Remove old uc mac address(%s) fail: %d",
                                  mac_str, ret);
@@ -1693,7 +1708,7 @@ hns3_set_default_mac_addr(struct rte_eth_dev *dev,
 
        ret = hns3_add_uc_addr_common(hw, mac_addr);
        if (ret) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "Failed to set mac addr(%s): %d", mac_str, ret);
                goto err_add_uc_addr;
@@ -1715,7 +1730,7 @@ hns3_set_default_mac_addr(struct rte_eth_dev *dev,
 err_pause_addr_cfg:
        ret_val = hns3_remove_uc_addr_common(hw, mac_addr);
        if (ret_val) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_warn(hw,
                          "Failed to roll back to del setted mac addr(%s): %d",
@@ -1726,7 +1741,7 @@ err_add_uc_addr:
        if (rm_succes) {
                ret_val = hns3_add_uc_addr_common(hw, oaddr);
                if (ret_val) {
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              oaddr);
                        hns3_warn(hw,
                                  "Failed to restore old uc mac addr(%s): %d",
@@ -1762,7 +1777,7 @@ hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del)
 
                if (ret) {
                        err = ret;
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              addr);
                        hns3_err(hw, "failed to %s mac addr(%s) index:%d "
                                 "ret = %d.", del ? "remove" : "restore",
@@ -1811,7 +1826,7 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        /* Check if mac addr is valid */
        if (!rte_is_multicast_ether_addr(mac_addr)) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to add mc mac addr, addr(%s) invalid",
                         mac_str);
@@ -1839,7 +1854,7 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
        if (ret) {
                if (ret == -ENOSPC)
                        hns3_err(hw, "mc mac vlan table is full");
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "failed to add mc mac addr(%s): %d", mac_str, ret);
        }
@@ -1858,7 +1873,7 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
 
        /* Check if mac addr is valid */
        if (!rte_is_multicast_ether_addr(mac_addr)) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "Failed to rm mc mac addr, addr(%s) invalid",
                         mac_str);
@@ -1886,7 +1901,7 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
        }
 
        if (ret) {
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                      mac_addr);
                hns3_err(hw, "Failed to rm mc mac addr(%s): %d", mac_str, ret);
        }
@@ -1905,7 +1920,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
        uint32_t j;
 
        if (nb_mc_addr > HNS3_MC_MACADDR_NUM) {
-               hns3_err(hw, "failed to set mc mac addr, nb_mc_addr(%d) "
+               hns3_err(hw, "failed to set mc mac addr, nb_mc_addr(%u) "
                         "invalid. valid range: 0~%d",
                         nb_mc_addr, HNS3_MC_MACADDR_NUM);
                return -EINVAL;
@@ -1915,7 +1930,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
        for (i = 0; i < nb_mc_addr; i++) {
                addr = &mc_addr_set[i];
                if (!rte_is_multicast_ether_addr(addr)) {
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              addr);
                        hns3_err(hw,
                                 "failed to set mc mac addr, addr(%s) invalid.",
@@ -1926,7 +1941,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
                /* Check if there are duplicate addresses */
                for (j = i + 1; j < nb_mc_addr; j++) {
                        if (rte_is_same_ether_addr(addr, &mc_addr_set[j])) {
-                               rte_ether_format_addr(mac_str,
+                               hns3_ether_format_addr(mac_str,
                                                      RTE_ETHER_ADDR_FMT_SIZE,
                                                      addr);
                                hns3_err(hw, "failed to set mc mac addr, "
@@ -1943,7 +1958,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
                for (j = 0; j < HNS3_UC_MACADDR_NUM; j++) {
                        if (rte_is_same_ether_addr(addr,
                                                   &hw->data->mac_addrs[j])) {
-                               rte_ether_format_addr(mac_str,
+                               hns3_ether_format_addr(mac_str,
                                                      RTE_ETHER_ADDR_FMT_SIZE,
                                                      addr);
                                hns3_err(hw, "failed to set mc mac addr, "
@@ -2117,7 +2132,7 @@ hns3_configure_all_mc_mac_addr(struct hns3_adapter *hns, bool del)
                        ret = hns3_add_mc_addr(hw, addr);
                if (ret) {
                        err = ret;
-                       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                              addr);
                        hns3_dbg(hw, "%s mc mac addr: %s failed for pf: ret = %d",
                                 del ? "Remove" : "Restore", mac_str, ret);
@@ -2179,7 +2194,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)
 
                for (i = 0; i < HNS3_MAX_USER_PRIO; i++) {
                        if (dcb_rx_conf->dcb_tc[i] != dcb_tx_conf->dcb_tc[i]) {
-                               hns3_err(hw, "dcb_tc[%d] = %d in rx direction, "
+                               hns3_err(hw, "dcb_tc[%d] = %u in rx direction, "
                                         "is not equal to one in tx direction.",
                                         i, dcb_rx_conf->dcb_tc[i]);
                                return -EINVAL;
@@ -2219,7 +2234,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev)
 }
 
 static int
-hns3_bind_ring_with_vector(struct hns3_hw *hw, uint8_t vector_id, bool mmap,
+hns3_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id, bool en,
                           enum hns3_ring_type queue_type, uint16_t queue_id)
 {
        struct hns3_cmd_desc desc;
@@ -2228,13 +2243,15 @@ hns3_bind_ring_with_vector(struct hns3_hw *hw, uint8_t vector_id, bool mmap,
        enum hns3_cmd_status status;
        enum hns3_opcode_type op;
        uint16_t tqp_type_and_id = 0;
-       const char *op_str;
        uint16_t type;
        uint16_t gl;
 
-       op = mmap ? HNS3_OPC_ADD_RING_TO_VECTOR : HNS3_OPC_DEL_RING_TO_VECTOR;
+       op = en ? HNS3_OPC_ADD_RING_TO_VECTOR : HNS3_OPC_DEL_RING_TO_VECTOR;
        hns3_cmd_setup_basic_desc(&desc, op, false);
-       req->int_vector_id = vector_id;
+       req->int_vector_id = hns3_get_field(vector_id, HNS3_TQP_INT_ID_L_M,
+                                             HNS3_TQP_INT_ID_L_S);
+       req->int_vector_id_h = hns3_get_field(vector_id, HNS3_TQP_INT_ID_H_M,
+                                             HNS3_TQP_INT_ID_H_S);
 
        if (queue_type == HNS3_RING_TYPE_RX)
                gl = HNS3_RING_GL_RX;
@@ -2250,11 +2267,10 @@ hns3_bind_ring_with_vector(struct hns3_hw *hw, uint8_t vector_id, bool mmap,
                       gl);
        req->tqp_type_and_id[0] = rte_cpu_to_le_16(tqp_type_and_id);
        req->int_cause_num = 1;
-       op_str = mmap ? "Map" : "Unmap";
        status = hns3_cmd_send(hw, &desc, 1);
        if (status) {
-               hns3_err(hw, "%s TQP %d fail, vector_id is %d, status is %d.",
-                        op_str, queue_id, req->int_vector_id, status);
+               hns3_err(hw, "%s TQP %u fail, vector_id is %u, status is %d.",
+                        en ? "Map" : "Unmap", queue_id, vector_id, status);
                return status;
        }
 
@@ -2291,13 +2307,17 @@ hns3_init_ring_with_vector(struct hns3_hw *hw)
                hns3_set_queue_intr_gl(hw, i, HNS3_RING_GL_TX,
                                       HNS3_TQP_INTR_GL_DEFAULT);
                hns3_set_queue_intr_rl(hw, i, HNS3_TQP_INTR_RL_DEFAULT);
+               /*
+                * QL(quantity limiter) is not used currently, just set 0 to
+                * close it.
+                */
                hns3_set_queue_intr_ql(hw, i, HNS3_TQP_INTR_QL_DEFAULT);
 
                ret = hns3_bind_ring_with_vector(hw, vec, false,
                                                 HNS3_RING_TYPE_TX, i);
                if (ret) {
                        PMD_INIT_LOG(ERR, "PF fail to unbind TX ring(%d) with "
-                                         "vector: %d, ret=%d", i, vec, ret);
+                                         "vector: %u, ret=%d", i, vec, ret);
                        return ret;
                }
 
@@ -2305,7 +2325,7 @@ hns3_init_ring_with_vector(struct hns3_hw *hw)
                                                 HNS3_RING_TYPE_RX, i);
                if (ret) {
                        PMD_INIT_LOG(ERR, "PF fail to unbind RX ring(%d) with "
-                                         "vector: %d, ret=%d", i, vec, ret);
+                                         "vector: %u, ret=%d", i, vec, ret);
                        return ret;
                }
        }
@@ -2320,10 +2340,10 @@ hns3_dev_configure(struct rte_eth_dev *dev)
        struct rte_eth_conf *conf = &dev->data->dev_conf;
        enum rte_eth_rx_mq_mode mq_mode = conf->rxmode.mq_mode;
        struct hns3_hw *hw = &hns->hw;
-       struct hns3_rss_conf *rss_cfg = &hw->rss_info;
        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;
+       uint32_t max_rx_pkt_len;
        uint16_t mtu;
        bool gro_en;
        int ret;
@@ -2367,11 +2387,6 @@ hns3_dev_configure(struct rte_eth_dev *dev)
                conf->rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
                rss_conf = conf->rx_adv_conf.rss_conf;
                hw->rss_dis_flag = false;
-               if (rss_conf.rss_key == NULL) {
-                       rss_conf.rss_key = rss_cfg->key;
-                       rss_conf.rss_key_len = HNS3_RSS_KEY_SIZE;
-               }
-
                ret = hns3_dev_rss_hash_update(dev, &rss_conf);
                if (ret)
                        goto cfg_err;
@@ -2382,12 +2397,18 @@ hns3_dev_configure(struct rte_eth_dev *dev)
         * 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);
+               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 less than %u when jumbo frame enabled.",
+                                (uint16_t)HNS3_DEFAULT_FRAME_LEN,
+                                (uint16_t)HNS3_MAX_FRAME_LEN);
+                       ret = -EINVAL;
+                       goto cfg_err;
+               }
+
+               mtu = (uint16_t)HNS3_PKTLEN_TO_MTU(max_rx_pkt_len);
                ret = hns3_dev_mtu_set(dev, mtu);
                if (ret)
                        goto cfg_err;
@@ -2439,17 +2460,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;
 }
@@ -2470,7 +2507,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        }
 
        rte_spinlock_lock(&hw->lock);
-       is_jumbo_frame = frame_size > RTE_ETHER_MAX_LEN ? true : false;
+       is_jumbo_frame = frame_size > HNS3_DEFAULT_FRAME_LEN ? true : false;
        frame_size = RTE_MAX(frame_size, HNS3_DEFAULT_FRAME_LEN);
 
        /*
@@ -2484,7 +2521,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;
@@ -2497,7 +2534,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        return 0;
 }
 
-static int
+int
 hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 {
        struct hns3_adapter *hns = eth_dev->data->dev_private;
@@ -2579,7 +2616,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;
 
@@ -2628,8 +2665,8 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev,
        struct rte_eth_link new_link;
 
        if (!hns3_is_reset_pending(hns)) {
-               hns3_update_speed_duplex(eth_dev);
                hns3_update_link_status(hw);
+               hns3_update_link_info(eth_dev);
        }
 
        memset(&new_link, 0, sizeof(new_link));
@@ -2952,6 +2989,7 @@ hns3_set_default_dev_specifications(struct hns3_hw *hw)
        hw->rss_ind_tbl_size = HNS3_RSS_IND_TBL_SIZE;
        hw->rss_key_size = HNS3_RSS_KEY_SIZE;
        hw->max_tm_rate = HNS3_ETHER_MAX_RATE;
+       hw->intr.int_ql_max = HNS3_INTR_QL_NONE;
 }
 
 static void
@@ -2965,6 +3003,21 @@ hns3_parse_dev_specifications(struct hns3_hw *hw, struct hns3_cmd_desc *desc)
        hw->rss_ind_tbl_size = rte_le_to_cpu_16(req0->rss_ind_tbl_size);
        hw->rss_key_size = rte_le_to_cpu_16(req0->rss_key_size);
        hw->max_tm_rate = rte_le_to_cpu_32(req0->max_tm_rate);
+       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
@@ -2987,7 +3040,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
@@ -3011,13 +3064,6 @@ hns3_get_capability(struct hns3_hw *hw)
            device_id == HNS3_DEV_ID_200G_RDMA)
                hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1);
 
-       ret = hns3_query_dev_fec_info(eth_dev);
-       if (ret) {
-               PMD_INIT_LOG(ERR,
-                            "failed to query FEC information, ret = %d", ret);
-               return ret;
-       }
-
        /* Get PCI revision id */
        ret = rte_pci_read_config(pci_dev, &revision, HNS3_PCI_REVISION_ID_LEN,
                                  HNS3_PCI_REVISION_ID);
@@ -3031,12 +3077,12 @@ hns3_get_capability(struct hns3_hw *hw)
        if (revision < PCI_REVISION_ID_HIP09_A) {
                hns3_set_default_dev_specifications(hw);
                hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE;
-               hw->intr.coalesce_mode = HNS3_INTR_COALESCE_NON_QL;
                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->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;
                return 0;
        }
 
@@ -3049,16 +3095,47 @@ hns3_get_capability(struct hns3_hw *hw)
        }
 
        hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_ALL;
-       hw->intr.coalesce_mode = HNS3_INTR_COALESCE_QL;
        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->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;
 
        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)
 {
@@ -3073,11 +3150,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;
@@ -3092,7 +3167,7 @@ hns3_get_board_configuration(struct hns3_hw *hw)
 
        ret = hns3_parse_speed(cfg.default_speed, &hw->mac.link_speed);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Get wrong speed %d, ret = %d",
+               PMD_INIT_LOG(ERR, "Get wrong speed %u, ret = %d",
                             cfg.default_speed, ret);
                return ret;
        }
@@ -3149,8 +3224,15 @@ hns3_get_configuration(struct hns3_hw *hw)
        }
 
        ret = hns3_get_board_configuration(hw);
-       if (ret)
+       if (ret) {
                PMD_INIT_LOG(ERR, "failed to get board configuration: %d", ret);
+               return ret;
+       }
+
+       ret = hns3_query_dev_fec_info(hw);
+       if (ret)
+               PMD_INIT_LOG(ERR,
+                            "failed to query FEC information, ret = %d", ret);
 
        return ret;
 }
@@ -3444,8 +3526,8 @@ hns3_is_rx_buf_ok(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc,
                hi_thrd = shared_buf - pf->dv_buf_size;
 
                if (tc_num <= NEED_RESERVE_TC_NUM)
-                       hi_thrd = hi_thrd * BUF_RESERVE_PERCENT
-                                       / BUF_MAX_PERCENT;
+                       hi_thrd = hi_thrd * BUF_RESERVE_PERCENT /
+                                 BUF_MAX_PERCENT;
 
                if (tc_num)
                        hi_thrd = hi_thrd / tc_num;
@@ -3565,9 +3647,7 @@ hns3_drop_pfc_buf_till_fit(struct hns3_hw *hw,
        for (i = HNS3_MAX_TC_NUM - 1; i >= 0; i--) {
                priv = &buf_alloc->priv_buf[i];
                mask = BIT((uint8_t)i);
-
-               if (hw->hw_tc_map & mask &&
-                   hw->dcb_info.hw_pfc_map & mask) {
+               if (hw->hw_tc_map & mask && hw->dcb_info.hw_pfc_map & mask) {
                        /* Reduce the number of pfc TC with private buffer */
                        priv->wl.low = 0;
                        priv->enable = 0;
@@ -3621,7 +3701,6 @@ hns3_only_alloc_priv_buff(struct hns3_hw *hw,
 
        for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
                priv = &buf_alloc->priv_buf[i];
-
                priv->enable = 0;
                priv->wl.low = 0;
                priv->wl.high = 0;
@@ -3905,6 +3984,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)
 {
@@ -3937,7 +4038,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
 
        if (cmdq_resp) {
                PMD_INIT_LOG(ERR,
-                            "cmdq execute failed for get_mac_ethertype_cmd_status, status=%d.\n",
+                            "cmdq execute failed for get_mac_ethertype_cmd_status, status=%u.\n",
                             cmdq_resp);
                return -EIO;
        }
@@ -3958,7 +4059,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
                break;
        default:
                PMD_INIT_LOG(ERR,
-                            "add mac ethertype failed for undefined, code=%d.",
+                            "add mac ethertype failed for undefined, code=%u.",
                             resp_code);
                return_status = -EIO;
                break;
@@ -4116,7 +4217,7 @@ hns3_promisc_init(struct hns3_hw *hw)
                hns3_promisc_param_init(&param, false, false, false, func_id);
                ret = hns3_cmd_set_promisc_mode(hw, &param);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "failed to clear vf:%d promisc mode,"
+                       PMD_INIT_LOG(ERR, "failed to clear vf:%u promisc mode,"
                                        " ret = %d", func_id, ret);
                        return ret;
                }
@@ -4340,6 +4441,10 @@ hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
        if (ret)
                return ret;
 
+       ret = hns3_port_shaper_update(hw, speed);
+       if (ret)
+               return ret;
+
        mac->link_speed = speed;
        mac->link_duplex = duplex;
 
@@ -4347,11 +4452,9 @@ hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
 }
 
 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;
 
@@ -4373,6 +4476,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_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_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_phy_params(desc, mac);
+
+       return 0;
+}
+
+static int
+hns3_update_phy_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_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_phy_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)
 {
@@ -4439,7 +4629,7 @@ hns3_get_mac_link_status(struct hns3_hw *hw)
        return !!link_status;
 }
 
-void
+static bool
 hns3_update_link_status(struct hns3_hw *hw)
 {
        int state;
@@ -4448,7 +4638,36 @@ 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");
+               return true;
        }
+
+       return false;
+}
+
+/*
+ * Current, the PF driver get link status by two ways:
+ * 1) Periodic polling in the intr thread context, driver call
+ *    hns3_update_link_status to update link status.
+ * 2) Firmware report async interrupt, driver process the event in the intr
+ *    thread context, and call hns3_update_link_status to update link status.
+ *
+ * If detect link status changed, driver need report LSE. One method is add the
+ * report LSE logic in hns3_update_link_status.
+ *
+ * But the PF driver ops(link_update) also call hns3_update_link_status to
+ * update link status.
+ * If we report LSE in hns3_update_link_status, it may lead to deadlock in the
+ * bonding application.
+ *
+ * So add the one new API which used only in intr thread context.
+ */
+void
+hns3_update_link_status_and_event(struct hns3_hw *hw)
+{
+       struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
+       bool changed = hns3_update_link_status(hw);
+       if (changed)
+               rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 static void
@@ -4459,10 +4678,11 @@ 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(hw);
-       } else
+               hns3_update_link_status_and_event(hw);
+               hns3_update_link_info(eth_dev);
+       } else {
                hns3_warn(hw, "Cancel the query when reset is pending");
+       }
 
        rte_eal_alarm_set(HNS3_SERVICE_INTERVAL, hns3_service_handler, eth_dev);
 }
@@ -4546,6 +4766,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:
@@ -4628,6 +4857,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,
@@ -4666,7 +4902,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
                goto err_fdir;
        }
 
-       hns3_set_default_rss_args(hw);
+       hns3_rss_set_default_args(hw);
 
        ret = hns3_enable_hw_error_intr(hns, true);
        if (ret) {
@@ -4675,11 +4911,14 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
                goto err_enable_intr;
        }
 
+       hns3_tm_conf_init(eth_dev);
+
        return 0;
 
 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);
@@ -4708,11 +4947,13 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)
 
        PMD_INIT_FUNC_TRACE();
 
+       hns3_tm_conf_uninit(eth_dev);
        hns3_enable_hw_error_intr(hns, false);
        hns3_rss_uninit(hns);
        (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_pf_disable_irq0(hw);
@@ -4735,6 +4976,18 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
        if (ret)
                return ret;
 
+       /*
+        * The hns3_dcb_cfg_update may configure TM module, so
+        * hns3_tm_conf_update must called later.
+        */
+       ret = hns3_tm_conf_update(hw);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "failed to update tm conf, ret = %d.", ret);
+               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);
@@ -4750,7 +5003,13 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
 
 err_config_mac_mode:
        hns3_dev_release_mbufs(hns);
-       hns3_reset_all_tqps(hns);
+       /*
+        * Here is exception handling, hns3_reset_all_tqps will have the
+        * corresponding error message if it is handled incorrectly, so it is
+        * not necessary to check hns3_reset_all_tqps return value, here keep
+        * ret as the error code causing the exception.
+        */
+       (void)hns3_reset_all_tqps(hns);
        return ret;
 }
 
@@ -4760,33 +5019,34 @@ hns3_map_rx_interrupt(struct rte_eth_dev *dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint8_t base = RTE_INTR_VEC_ZERO_OFFSET;
-       uint8_t vec = RTE_INTR_VEC_ZERO_OFFSET;
+       uint16_t base = RTE_INTR_VEC_ZERO_OFFSET;
+       uint16_t vec = RTE_INTR_VEC_ZERO_OFFSET;
        uint32_t intr_vector;
        uint16_t q_id;
        int ret;
 
-       if (dev->data->dev_conf.intr_conf.rxq == 0)
+       /*
+        * hns3 needs a separate interrupt to be used as event interrupt which
+        * could not be shared with task queue pair, so KERNEL drivers need
+        * support multiple interrupt vectors.
+        */
+       if (dev->data->dev_conf.intr_conf.rxq == 0 ||
+           !rte_intr_cap_multiple(intr_handle))
                return 0;
 
-       /* disable uio/vfio intr/eventfd mapping */
        rte_intr_disable(intr_handle);
+       intr_vector = hw->used_rx_queues;
+       /* creates event fd for each intr vector when MSIX is used */
+       if (rte_intr_efd_enable(intr_handle, intr_vector))
+               return -EINVAL;
 
-       /* check and configure queue intr-vector mapping */
-       if (rte_intr_cap_multiple(intr_handle) ||
-           !RTE_ETH_DEV_SRIOV(dev).active) {
-               intr_vector = hw->used_rx_queues;
-               /* creates event fd for each intr vector when MSIX is used */
-               if (rte_intr_efd_enable(intr_handle, intr_vector))
-                       return -EINVAL;
-       }
-       if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
+       if (intr_handle->intr_vec == NULL) {
                intr_handle->intr_vec =
                        rte_zmalloc("intr_vec",
                                    hw->used_rx_queues * sizeof(int), 0);
                if (intr_handle->intr_vec == NULL) {
-                       hns3_err(hw, "Failed to allocate %d rx_queues"
-                                    " intr_vec", hw->used_rx_queues);
+                       hns3_err(hw, "failed to allocate %u rx_queues intr_vec",
+                                       hw->used_rx_queues);
                        ret = -ENOMEM;
                        goto alloc_intr_vec_error;
                }
@@ -4796,28 +5056,26 @@ hns3_map_rx_interrupt(struct rte_eth_dev *dev)
                vec = RTE_INTR_VEC_RXTX_OFFSET;
                base = RTE_INTR_VEC_RXTX_OFFSET;
        }
-       if (rte_intr_dp_is_en(intr_handle)) {
-               for (q_id = 0; q_id < hw->used_rx_queues; q_id++) {
-                       ret = hns3_bind_ring_with_vector(hw, vec, true,
-                                                        HNS3_RING_TYPE_RX,
-                                                        q_id);
-                       if (ret)
-                               goto bind_vector_error;
-                       intr_handle->intr_vec[q_id] = vec;
-                       if (vec < base + intr_handle->nb_efd - 1)
-                               vec++;
-               }
+
+       for (q_id = 0; q_id < hw->used_rx_queues; q_id++) {
+               ret = hns3_bind_ring_with_vector(hw, vec, true,
+                                                HNS3_RING_TYPE_RX, q_id);
+               if (ret)
+                       goto bind_vector_error;
+               intr_handle->intr_vec[q_id] = vec;
+               /*
+                * If there are not enough efds (e.g. not enough interrupt),
+                * remaining queues will be bond to the last interrupt.
+                */
+               if (vec < base + intr_handle->nb_efd - 1)
+                       vec++;
        }
        rte_intr_enable(intr_handle);
        return 0;
 
 bind_vector_error:
-       rte_intr_efd_disable(intr_handle);
-       if (intr_handle->intr_vec) {
-               free(intr_handle->intr_vec);
-               intr_handle->intr_vec = NULL;
-       }
-       return ret;
+       rte_free(intr_handle->intr_vec);
+       intr_handle->intr_vec = NULL;
 alloc_intr_vec_error:
        rte_intr_efd_disable(intr_handle);
        return ret;
@@ -4862,7 +5120,7 @@ hns3_dev_start(struct rte_eth_dev *dev)
        int ret;
 
        PMD_INIT_FUNC_TRACE();
-       if (rte_atomic16_read(&hw->reset.resetting))
+       if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED))
                return -EBUSY;
 
        rte_spinlock_lock(&hw->lock);
@@ -4926,6 +5184,8 @@ hns3_dev_start(struct rte_eth_dev *dev)
         */
        hns3_start_tqps(hw);
 
+       hns3_tm_dev_start_proc(hw);
+
        hns3_info(hw, "hns3 dev start successful!");
        return 0;
 }
@@ -4941,7 +5201,7 @@ hns3_do_stop(struct hns3_adapter *hns)
                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) {
@@ -4990,7 +5250,7 @@ hns3_unmap_rx_interrupt(struct rte_eth_dev *dev)
        }
 }
 
-static void
+static int
 hns3_dev_stop(struct rte_eth_dev *dev)
 {
        struct hns3_adapter *hns = dev->data->dev_private;
@@ -5008,7 +5268,8 @@ hns3_dev_stop(struct rte_eth_dev *dev)
        rte_delay_ms(hw->tqps_num);
 
        rte_spinlock_lock(&hw->lock);
-       if (rte_atomic16_read(&hw->reset.resetting) == 0) {
+       if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {
+               hns3_tm_dev_stop_proc(hw);
                hns3_stop_tqps(hw);
                hns3_do_stop(hns);
                hns3_unmap_rx_interrupt(dev);
@@ -5018,6 +5279,8 @@ hns3_dev_stop(struct rte_eth_dev *dev)
        hns3_rx_scattered_reset(dev);
        rte_eal_alarm_cancel(hns3_service_handler, dev);
        rte_spinlock_unlock(&hw->lock);
+
+       return 0;
 }
 
 static int
@@ -5025,6 +5288,7 @@ hns3_dev_close(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 (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                rte_free(eth_dev->process_private);
@@ -5033,7 +5297,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
        }
 
        if (hw->adapter_state == HNS3_NIC_STARTED)
-               hns3_dev_stop(eth_dev);
+               ret = hns3_dev_stop(eth_dev);
 
        hw->adapter_state = HNS3_NIC_CLOSING;
        hns3_reset_abort(hns);
@@ -5048,9 +5312,9 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
        rte_free(eth_dev->process_private);
        eth_dev->process_private = NULL;
        hns3_mp_uninit_primary();
-       hns3_warn(hw, "Close port %d finished", hw->data->port_id);
+       hns3_warn(hw, "Close port %u finished", hw->data->port_id);
 
-       return 0;
+       return ret;
 }
 
 static int
@@ -5126,7 +5390,7 @@ hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
                return -EINVAL;
        }
        if (!fc_conf->pause_time) {
-               hns3_err(hw, "Invalid pause time %d setting.",
+               hns3_err(hw, "Invalid pause time %u setting.",
                         fc_conf->pause_time);
                return -EINVAL;
        }
@@ -5179,7 +5443,7 @@ hns3_priority_flow_ctrl_set(struct rte_eth_dev *dev,
                return -EINVAL;
        }
        if (pfc_conf->fc.pause_time == 0) {
-               hns3_err(hw, "Invalid pause time %d setting.",
+               hns3_err(hw, "Invalid pause time %u setting.",
                         pfc_conf->fc.pause_time);
                return -EINVAL;
        }
@@ -5480,7 +5744,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:
@@ -5514,8 +5778,10 @@ hns3_stop_service(struct hns3_adapter *hns)
        struct rte_eth_dev *eth_dev;
 
        eth_dev = &rte_eth_devices[hw->data->port_id];
-       if (hw->adapter_state == HNS3_NIC_STARTED)
+       if (hw->adapter_state == HNS3_NIC_STARTED) {
                rte_eal_alarm_cancel(hns3_service_handler, eth_dev);
+               hns3_update_link_status_and_event(hw);
+       }
        hw->mac.link_status = ETH_LINK_DOWN;
 
        hns3_set_rxtx_function(eth_dev);
@@ -5538,7 +5804,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);
 
@@ -5558,10 +5824,23 @@ hns3_start_service(struct hns3_adapter *hns)
        hns3_set_rxtx_function(eth_dev);
        hns3_mp_req_start_rxtx(eth_dev);
        if (hw->adapter_state == HNS3_NIC_STARTED) {
-               hns3_service_handler(eth_dev);
+               /*
+                * This API parent function already hold the hns3_hw.lock, the
+                * hns3_service_handler may report lse, in bonding application
+                * it will call driver's ops which may acquire the hns3_hw.lock
+                * again, thus lead to deadlock.
+                * We defer calls hns3_service_handler to avoid the deadlock.
+                */
+               rte_eal_alarm_set(HNS3_SERVICE_QUICK_INTERVAL,
+                                 hns3_service_handler, eth_dev);
 
                /* Enable interrupt of all rx queues before enabling queues */
                hns3_dev_all_rx_queue_intr_enable(hw, true);
+               /*
+                * Enable state of each rxq and txq will be recovered after
+                * reset, so we need to restore them before enable all tqps;
+                */
+               hns3_restore_tqp_enable_state(hw);
                /*
                 * When finished the initialization, enable queues to receive
                 * and transmit packets.
@@ -5647,8 +5926,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);
@@ -5657,7 +5938,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
@@ -5779,6 +6060,16 @@ get_current_fec_auto_state(struct hns3_hw *hw, uint8_t *state)
        struct hns3_cmd_desc desc;
        int ret;
 
+       /*
+        * CMD(HNS3_OPC_CONFIG_FEC_MODE) read is not supported
+        * in device of link speed
+        * below 10 Gbps.
+        */
+       if (hw->mac.link_speed < ETH_SPEED_NUM_10G) {
+               *state = 0;
+               return 0;
+       }
+
        hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_CONFIG_FEC_MODE, true);
        req = (struct hns3_config_fec_cmd *)desc.data;
        ret = hns3_cmd_send(hw, &desc, 1);
@@ -5793,10 +6084,9 @@ get_current_fec_auto_state(struct hns3_hw *hw, uint8_t *state)
 }
 
 static int
-hns3_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa)
+hns3_fec_get_internal(struct hns3_hw *hw, uint32_t *fec_capa)
 {
 #define QUERY_ACTIVE_SPEED     1
-       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct hns3_sfp_speed_cmd *resp;
        uint32_t tmp_fec_capa;
        uint8_t auto_state;
@@ -5856,6 +6146,14 @@ hns3_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa)
        return 0;
 }
 
+static int
+hns3_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa)
+{
+       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       return hns3_fec_get_internal(hw, fec_capa);
+}
+
 static int
 hns3_set_fec_hw(struct hns3_hw *hw, uint32_t mode)
 {
@@ -5985,20 +6283,176 @@ hns3_restore_fec(struct hns3_hw *hw)
 }
 
 static int
-hns3_query_dev_fec_info(struct rte_eth_dev *dev)
+hns3_query_dev_fec_info(struct hns3_hw *hw)
 {
-       struct hns3_adapter *hns = dev->data->dev_private;
-       struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns);
-       struct hns3_pf *pf = &hns->pf;
+       struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
+       struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(hns);
        int ret;
 
-       ret = hns3_fec_get(dev, &pf->fec_mode);
+       ret = hns3_fec_get_internal(hw, &pf->fec_mode);
        if (ret)
                hns3_err(hw, "query device FEC info failed, ret = %d", ret);
 
        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 const struct eth_dev_ops hns3_eth_dev_ops = {
        .dev_configure      = hns3_dev_configure,
        .dev_start          = hns3_dev_start,
@@ -6050,11 +6504,15 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
        .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,
 };
 
 static const struct hns3_reset_ops hns3_reset_ops = {
@@ -6091,6 +6549,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
 
        hns3_set_rxtx_function(eth_dev);
        eth_dev->dev_ops = &hns3_eth_dev_ops;
+       eth_dev->rx_queue_count = hns3_rx_queue_count;
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                ret = hns3_mp_init_secondary();
                if (ret) {
@@ -6148,7 +6607,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
        eth_addr = (struct rte_ether_addr *)hw->mac.mac_addr;
        if (!rte_is_valid_assigned_ether_addr(eth_addr)) {
                rte_eth_random_addr(hw->mac.mac_addr);
-               rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+               hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
                                (struct rte_ether_addr *)hw->mac.mac_addr);
                hns3_warn(hw, "default mac_addr from firmware is an invalid "
                          "unicast address, using random MAC address %s",
@@ -6159,7 +6618,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 {
@@ -6198,8 +6658,11 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return -EPERM;
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               rte_free(eth_dev->process_private);
+               eth_dev->process_private = NULL;
+               return 0;
+       }
 
        if (hw->adapter_state < HNS3_NIC_CLOSING)
                hns3_dev_close(eth_dev);
@@ -6230,7 +6693,7 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_50GE_RDMA) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) },
-       { .vendor_id = 0, /* sentinel */ },
+       { .vendor_id = 0, }, /* sentinel */
 };
 
 static struct rte_pci_driver rte_hns3_pmd = {