optimize np dtb channel initialization.<br /> <br />Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn> <br />---<br /> drivers/net/zxdh/zxdh_ethdev.c     | 128 +++++++++++++++++++--------<br /> drivers/net/zxdh/zxdh_ethdev.h     |   9 +-<br /> drivers/net/zxdh/zxdh_ethdev_ops.c |  85 +++++++++---------<br /> drivers/net/zxdh/zxdh_tables.c     | 137 ++++++++++++++++-------------<br /> drivers/net/zxdh/zxdh_tables.h     |  20 +++--<br /> 5 files changed, 233 insertions(+), 146 deletions(-)<br /> <br />diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c<br />index 858e3c3d47..fc1bff6b44 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.c<br />+++ b/drivers/net/zxdh/zxdh_ethdev.c<br />@@ -22,9 +22,10 @@ struct zxdh_hw_internal zxdh_hw_internal[RTE_MAX_ETHPORTS];<br /> struct zxdh_shared_data *zxdh_shared_data;<br /> const char *ZXDH_PMD_SHARED_DATA_MZ = "zxdh_pmd_shared_data";<br /> rte_spinlock_t zxdh_shared_data_lock = RTE_SPINLOCK_INITIALIZER;<br />-struct zxdh_dtb_shared_data g_dtb_data;<br />+struct zxdh_dev_shared_data g_dev_sd[ZXDH_SLOT_MAX];<br />  <br />-#define ZXDH_INVALID_DTBQUE  0xFFFF<br />+#define ZXDH_INVALID_DTBQUE      0xFFFF<br />+#define ZXDH_INVALID_SLOT_IDX    0xFFFF<br />  <br /> uint16_t<br /> zxdh_vport_to_vfid(union zxdh_virport_num v)<br />@@ -810,10 +811,10 @@ zxdh_rss_qid_config(struct rte_eth_dev *dev)<br />     int ret = 0;<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+        ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />         port_attr.port_base_qid = hw->channel_context[0].ph_chno & 0xfff;<br />  <br />-        ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+        ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "PF:%d port_base_qid insert failed", hw->vfid);<br />             return ret;<br />@@ -937,30 +938,31 @@ static void<br /> zxdh_np_dtb_data_res_free(struct zxdh_hw *hw)<br /> {<br />     struct rte_eth_dev *dev = hw->eth_dev;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     int ret;<br />     int i;<br />  <br />-    if (g_dtb_data.init_done && g_dtb_data.bind_device == dev) {<br />-        ret = zxdh_np_online_uninit(0, dev->data->name, g_dtb_data.queueid);<br />+    if (dtb_data->init_done && dtb_data->bind_device == dev) {<br />+        ret = zxdh_np_online_uninit(hw->slot_id, dev->data->name, dtb_data->queueid);<br />         if (ret)<br />             PMD_DRV_LOG(ERR, "%s dpp_np_online_uninstall failed", dev->data->name);<br />  <br />-        if (g_dtb_data.dtb_table_conf_mz)<br />-            rte_memzone_free(g_dtb_data.dtb_table_conf_mz);<br />+        if (dtb_data->dtb_table_conf_mz)<br />+            rte_memzone_free(dtb_data->dtb_table_conf_mz);<br />  <br />-        if (g_dtb_data.dtb_table_dump_mz) {<br />-            rte_memzone_free(g_dtb_data.dtb_table_dump_mz);<br />-            g_dtb_data.dtb_table_dump_mz = NULL;<br />+        if (dtb_data->dtb_table_dump_mz) {<br />+            rte_memzone_free(dtb_data->dtb_table_dump_mz);<br />+            dtb_data->dtb_table_dump_mz = NULL;<br />         }<br />  <br />         for (i = 0; i < ZXDH_MAX_BASE_DTB_TABLE_COUNT; i++) {<br />-            if (g_dtb_data.dtb_table_bulk_dump_mz[i]) {<br />-                rte_memzone_free(g_dtb_data.dtb_table_bulk_dump_mz[i]);<br />-                g_dtb_data.dtb_table_bulk_dump_mz[i] = NULL;<br />+            if (dtb_data->dtb_table_bulk_dump_mz[i]) {<br />+                rte_memzone_free(dtb_data->dtb_table_bulk_dump_mz[i]);<br />+                dtb_data->dtb_table_bulk_dump_mz[i] = NULL;<br />             }<br />         }<br />-        g_dtb_data.init_done = 0;<br />-        g_dtb_data.bind_device = NULL;<br />+        dtb_data->init_done = 0;<br />+        dtb_data->bind_device = NULL;<br />     }<br />     if (zxdh_shared_data != NULL)<br />         zxdh_shared_data->np_init_done = 0;<br />@@ -970,11 +972,14 @@ static void<br /> zxdh_np_uninit(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />  <br />-    if (!g_dtb_data.init_done && !g_dtb_data.dev_refcnt)<br />+    if (!hw->is_pf)<br />+        return;<br />+    if (!dtb_data->init_done && !dtb_data->dev_refcnt)<br />         return;<br />  <br />-    if (--g_dtb_data.dev_refcnt == 0)<br />+    if (--dtb_data->dev_refcnt == 0)<br />         zxdh_np_dtb_data_res_free(hw);<br /> }<br />  <br />@@ -1002,7 +1007,7 @@ static int<br /> zxdh_dev_stop(struct rte_eth_dev *dev)<br /> {<br />     uint16_t i;<br />-    int ret;<br />+    int ret = 0;<br />  <br />     if (dev->data->dev_started == 0)<br />         return 0;<br />@@ -1010,21 +1015,22 @@ zxdh_dev_stop(struct rte_eth_dev *dev)<br />     ret = zxdh_intr_disable(dev);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "intr disable failed");<br />-        return ret;<br />+        goto end;<br />     }<br />  <br />     ret = zxdh_dev_set_link_down(dev);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "set port %s link down failed!", dev->device->name);<br />-        return ret;<br />+        goto end;<br />     }<br />  <br />+end:<br />     for (i = 0; i < dev->data->nb_rx_queues; i++)<br />         dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;<br />     for (i = 0; i < dev->data->nb_tx_queues; i++)<br />         dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;<br />  <br />-    return 0;<br />+    return ret;<br /> }<br />  <br /> static int<br />@@ -1089,7 +1095,7 @@ zxdh_mac_config(struct rte_eth_dev *eth_dev)<br />     int ret = 0;<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_set_mac_table(hw->vport.vport,<br />+        ret = zxdh_set_mac_table(hw, hw->vport.vport,<br />                 &eth_dev->data->mac_addrs[0], hw->hash_search_index);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "Failed to add mac: port 0x%x", hw->vport.vport);<br />@@ -1244,17 +1250,19 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />     struct zxdh_bar_offset_params param = {0};<br />     struct zxdh_bar_offset_res res = {0};<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     int ret = 0;<br />  <br />-    if (g_dtb_data.init_done) {<br />+    if (dtb_data->init_done) {<br />         PMD_DRV_LOG(DEBUG, "DTB res already init done, dev %s no need init",<br />             dev->device->name);<br />         return 0;<br />     }<br />-    g_dtb_data.queueid = ZXDH_INVALID_DTBQUE;<br />-    g_dtb_data.bind_device = dev;<br />-    g_dtb_data.dev_refcnt++;<br />-    g_dtb_data.init_done = 1;<br />+<br />+    dtb_data->queueid = ZXDH_INVALID_DTBQUE;<br />+    dtb_data->bind_device = dev;<br />+    dtb_data->dev_refcnt++;<br />+    dtb_data->init_done = 1;<br />  <br />     ZXDH_DEV_INIT_CTRL_T *dpp_ctrl = rte_zmalloc(NULL, sizeof(*dpp_ctrl) +<br />             sizeof(ZXDH_DTB_ADDR_INFO_T) * 256, 0);<br />@@ -1281,7 +1289,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />     dpp_ctrl->np_bar_len = res.bar_length;<br />     dpp_ctrl->np_bar_offset = res.bar_offset;<br />  <br />-    if (!g_dtb_data.dtb_table_conf_mz) {<br />+    if (!dtb_data->dtb_table_conf_mz) {<br />         const struct rte_memzone *conf_mz = rte_memzone_reserve_aligned("zxdh_dtb_table_conf_mz",<br />                 ZXDH_DTB_TABLE_CONF_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);<br />  <br />@@ -1294,10 +1302,10 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />         }<br />         dpp_ctrl->down_vir_addr = conf_mz->addr_64;<br />         dpp_ctrl->down_phy_addr = conf_mz->iova;<br />-        g_dtb_data.dtb_table_conf_mz = conf_mz;<br />+        dtb_data->dtb_table_conf_mz = conf_mz;<br />     }<br />  <br />-    if (!g_dtb_data.dtb_table_dump_mz) {<br />+    if (!dtb_data->dtb_table_dump_mz) {<br />         const struct rte_memzone *dump_mz = rte_memzone_reserve_aligned("zxdh_dtb_table_dump_mz",<br />                 ZXDH_DTB_TABLE_DUMP_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);<br />  <br />@@ -1310,10 +1318,10 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />         }<br />         dpp_ctrl->dump_vir_addr = dump_mz->addr_64;<br />         dpp_ctrl->dump_phy_addr = dump_mz->iova;<br />-        g_dtb_data.dtb_table_dump_mz = dump_mz;<br />+        dtb_data->dtb_table_dump_mz = dump_mz;<br />     }<br />  <br />-    ret = zxdh_np_host_init(0, dpp_ctrl);<br />+    ret = zxdh_np_host_init(hw->slot_id, dpp_ctrl);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "dev %s dpp host np init failed .ret %d", dev->device->name, ret);<br />         goto free_res;<br />@@ -1321,7 +1329,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />  <br />     PMD_DRV_LOG(DEBUG, "dev %s dpp host np init ok.dtb queue %d",<br />         dev->device->name, dpp_ctrl->queue_id);<br />-    g_dtb_data.queueid = dpp_ctrl->queue_id;<br />+    dtb_data->queueid = dpp_ctrl->queue_id;<br />     rte_free(dpp_ctrl);<br />     return 0;<br />  <br />@@ -1331,6 +1339,44 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)<br />     return ret;<br /> }<br />  <br />+static inline uint16_t<br />+zxdh_get_dev_shared_data_idx(uint32_t dev_serial_id)<br />+{<br />+    uint16_t idx = 0;<br />+    for (; idx < ZXDH_SLOT_MAX; idx++) {<br />+        if (g_dev_sd[idx].serial_id == dev_serial_id || g_dev_sd[idx].serial_id == 0)<br />+            return idx;<br />+    }<br />+<br />+    PMD_DRV_LOG(ERR, "dev serial_id[%d] can not found in global dev_share_data arrays",<br />+        dev_serial_id);<br />+    return ZXDH_INVALID_SLOT_IDX;<br />+}<br />+<br />+static int zxdh_init_dev_share_data(struct rte_eth_dev *eth_dev)<br />+{<br />+    struct zxdh_hw *hw = eth_dev->data->dev_private;<br />+    struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);<br />+    uint32_t serial_id = (pci_dev->addr.domain << 16) |<br />+                (pci_dev->addr.bus << 8) | pci_dev->addr.devid;<br />+    uint16_t slot_id = 0;<br />+<br />+    if (serial_id <= 0) {<br />+        PMD_DRV_LOG(ERR, "failed to get pcie bus-info %s", pci_dev->name);<br />+        return -EINVAL;<br />+    }<br />+<br />+    slot_id = zxdh_get_dev_shared_data_idx(serial_id);<br />+    if (slot_id == ZXDH_INVALID_SLOT_IDX)<br />+        return -EINVAL;<br />+<br />+    hw->slot_id = slot_id;<br />+    g_dev_sd[slot_id].serial_id = serial_id;<br />+    hw->dev_sd = &g_dev_sd[slot_id];<br />+<br />+    return 0;<br />+}<br />+<br /> static int<br /> zxdh_init_shared_data(void)<br /> {<br />@@ -1368,10 +1414,19 @@ zxdh_init_shared_data(void)<br /> }<br />  <br /> static int<br />-zxdh_init_once(void)<br />+zxdh_init_once(struct rte_eth_dev *eth_dev)<br /> {<br />+    struct zxdh_hw *hw = eth_dev->data->dev_private;<br />     int ret = 0;<br />  <br />+    if (hw->is_pf) {<br />+        ret = zxdh_init_dev_share_data(eth_dev);<br />+        if (ret < 0) {<br />+            PMD_DRV_LOG(ERR, "init dev share date failed");<br />+            return ret;<br />+        }<br />+    }<br />+<br />     if (zxdh_init_shared_data())<br />         return -1;<br />  <br />@@ -1476,6 +1531,7 @@ zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)<br />     hw->eth_dev = eth_dev;<br />     hw->speed = RTE_ETH_SPEED_NUM_UNKNOWN;<br />     hw->duplex = RTE_ETH_LINK_FULL_DUPLEX;<br />+    hw->slot_id = ZXDH_INVALID_SLOT_IDX;<br />     hw->is_pf = 0;<br />  <br />     if (pci_dev->id.device_id == ZXDH_E310_PF_DEVICEID ||<br />@@ -1483,7 +1539,7 @@ zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)<br />         hw->is_pf = 1;<br />     }<br />  <br />-    ret = zxdh_init_once();<br />+    ret = zxdh_init_once(eth_dev);<br />     if (ret != 0)<br />         goto err_zxdh_init;<br />  <br />diff --git a/drivers/net/zxdh/zxdh_ethdev.h b/drivers/net/zxdh/zxdh_ethdev.h<br />index fd4699c34d..6c9cc58a9a 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.h<br />+++ b/drivers/net/zxdh/zxdh_ethdev.h<br />@@ -40,6 +40,7 @@<br /> #define ZXDH_DTB_TABLE_CONF_SIZE        (32 * (16 + 16 * 1024))<br />  <br /> #define ZXDH_MAX_NAME_LEN               32<br />+#define ZXDH_SLOT_MAX             256<br />  <br /> union zxdh_virport_num {<br />     uint16_t vport;<br />@@ -65,6 +66,7 @@ struct zxdh_hw {<br />     struct rte_intr_handle *dtb_intr;<br />     struct zxdh_virtqueue **vqs;<br />     struct zxdh_chnl_context channel_context[ZXDH_QUEUES_NUM_MAX];<br />+    struct zxdh_dev_shared_data *dev_sd;<br />  <br />     uint64_t bar_addr[ZXDH_NUM_BARS];<br />     uint64_t host_features;<br />@@ -104,7 +106,7 @@ struct zxdh_hw {<br />     uint8_t allmulti_status;<br />     uint8_t rss_enable;<br />     uint8_t rss_init;<br />-    uint8_t rsv[2];<br />+    uint16_t slot_id;<br /> };<br />  <br /> struct zxdh_dtb_shared_data {<br />@@ -131,6 +133,11 @@ struct zxdh_shared_data {<br />     struct zxdh_dtb_shared_data *dtb_data;<br /> };<br />  <br />+struct zxdh_dev_shared_data {<br />+    uint32_t serial_id;<br />+    struct zxdh_dtb_shared_data dtb_sd;<br />+};<br />+<br /> uint16_t zxdh_vport_to_vfid(union zxdh_virport_num v);<br />  <br /> #endif /* ZXDH_ETHDEV_H */<br />diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />index 1a21ded58e..c3c5045281 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev_ops.c<br />+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />@@ -135,14 +135,14 @@ static int32_t zxdh_config_port_status(struct rte_eth_dev *dev, uint16_t link_st<br />     int32_t ret = 0;<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_get_port_attr(hw->vfid, &port_attr);<br />+        ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "get port_attr failed");<br />             return -1;<br />         }<br />         port_attr.is_up = link_status;<br />  <br />-        ret = zxdh_set_port_attr(hw->vfid, &port_attr);<br />+        ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write port_attr failed");<br />             return -1;<br />@@ -296,14 +296,14 @@ int zxdh_dev_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)<br />     }<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_del_mac_table(hw->vport.vport, old_addr, hw->hash_search_index);<br />+        ret = zxdh_del_mac_table(hw, hw->vport.vport, old_addr, hw->hash_search_index);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "mac_addr_add failed, code:%d", ret);<br />             return ret;<br />         }<br />         hw->uc_num--;<br />  <br />-        ret = zxdh_set_mac_table(hw->vport.vport, addr, hw->hash_search_index);<br />+        ret = zxdh_set_mac_table(hw, hw->vport.vport, addr, hw->hash_search_index);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "mac_addr_add failed, code:%d", ret);<br />             return ret;<br />@@ -364,8 +364,8 @@ int zxdh_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_ad<br />     if (hw->is_pf) {<br />         if (rte_is_unicast_ether_addr(mac_addr)) {<br />             if (hw->uc_num < ZXDH_MAX_UC_MAC_ADDRS) {<br />-                ret = zxdh_set_mac_table(hw->vport.vport,<br />-                            mac_addr, hw->hash_search_index);<br />+                ret = zxdh_set_mac_table(hw, hw->vport.vport,<br />+                        mac_addr, hw->hash_search_index);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "mac_addr_add failed, code:%d", ret);<br />                     return ret;<br />@@ -378,8 +378,8 @@ int zxdh_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_ad<br />             }<br />         } else {<br />             if (hw->mc_num < ZXDH_MAX_MC_MAC_ADDRS) {<br />-                ret = zxdh_set_mac_table(hw->vport.vport,<br />-                            mac_addr, hw->hash_search_index);<br />+                ret = zxdh_set_mac_table(hw, hw->vport.vport,<br />+                        mac_addr, hw->hash_search_index);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "mac_addr_add  failed, code:%d", ret);<br />                     return ret;<br />@@ -446,7 +446,7 @@ void zxdh_dev_mac_addr_remove(struct rte_eth_dev *dev __rte_unused, uint32_t ind<br />     if (hw->is_pf) {<br />         if (rte_is_unicast_ether_addr(mac_addr)) {<br />             if (hw->uc_num <= ZXDH_MAX_UC_MAC_ADDRS) {<br />-                ret = zxdh_del_mac_table(hw->vport.vport,<br />+                ret = zxdh_del_mac_table(hw, hw->vport.vport,<br />                         mac_addr, hw->hash_search_index);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "mac_addr_del  failed, code:%d", ret);<br />@@ -460,7 +460,7 @@ void zxdh_dev_mac_addr_remove(struct rte_eth_dev *dev __rte_unused, uint32_t ind<br />             }<br />         } else {<br />             if (hw->mc_num <= ZXDH_MAX_MC_MAC_ADDRS) {<br />-                ret = zxdh_del_mac_table(hw->vport.vport,<br />+                ret = zxdh_del_mac_table(hw, hw->vport.vport,<br />                             mac_addr, hw->hash_search_index);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "mac_addr_del  failed, code:%d", ret);<br />@@ -680,7 +680,7 @@ zxdh_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)<br />     }<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_vlan_filter_table_set(hw->vport.vport, vlan_id, on);<br />+        ret = zxdh_vlan_filter_table_set(hw, hw->vport.vport, vlan_id, on);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "vlan_id:%d table set failed", vlan_id);<br />             return -1;<br />@@ -718,9 +718,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />     if (mask & RTE_ETH_VLAN_FILTER_MASK) {<br />         if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_FILTER) {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.vlan_filter_enable = true;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d vlan filter set failed",<br />                         hw->vport.vfid);<br />@@ -739,9 +739,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />             }<br />         } else {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.vlan_filter_enable = false;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d vlan filter set failed",<br />                         hw->vport.vfid);<br />@@ -764,9 +764,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />     if (mask & RTE_ETH_VLAN_STRIP_MASK) {<br />         if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.vlan_strip_offload = true;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d vlan strip set failed",<br />                         hw->vport.vfid);<br />@@ -786,9 +786,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />             }<br />         } else {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.vlan_strip_offload = false;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d vlan strip set failed",<br />                         hw->vport.vfid);<br />@@ -813,9 +813,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />         memset(&msg, 0, sizeof(struct zxdh_msg_info));<br />         if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.qinq_strip_offload = true;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d qinq offload set failed",<br />                         hw->vport.vfid);<br />@@ -835,9 +835,9 @@ zxdh_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)<br />             }<br />         } else {<br />             if (hw->is_pf) {<br />-                ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />                 port_attr.qinq_strip_offload = true;<br />-                ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+                ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />                 if (ret) {<br />                     PMD_DRV_LOG(ERR, "port %d qinq offload set failed",<br />                         hw->vport.vfid);<br />@@ -918,7 +918,7 @@ zxdh_dev_rss_reta_update(struct rte_eth_dev *dev,<br />             (hw->channel_context[hw->rss_reta[i] * 2].ph_chno);<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_rss_table_set(hw->vport.vport, &msg.data.rss_reta);<br />+        ret = zxdh_rss_table_set(hw, hw->vport.vport, &msg.data.rss_reta);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "rss reta table set failed");<br />             return -EINVAL;<br />@@ -976,7 +976,7 @@ zxdh_dev_rss_reta_query(struct rte_eth_dev *dev,<br />     zxdh_msg_head_build(hw, ZXDH_RSS_RETA_GET, &msg);<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_rss_table_get(hw->vport.vport, &reply_msg.reply_body.rss_reta);<br />+        ret = zxdh_rss_table_get(hw, hw->vport.vport, &reply_msg.reply_body.rss_reta);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "rss reta table set failed");<br />             return -EINVAL;<br />@@ -1067,9 +1067,9 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,<br />  <br />     if (need_update_hf) {<br />         if (hw->is_pf) {<br />-            ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />             port_attr.rss_enable = !!rss_conf->rss_hf;<br />-            ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />             if (ret) {<br />                 PMD_DRV_LOG(ERR, "rss enable set failed");<br />                 return -EINVAL;<br />@@ -1085,9 +1085,9 @@ zxdh_rss_hash_update(struct rte_eth_dev *dev,<br />             }<br />         }<br />         if (hw->is_pf) {<br />-            ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />             port_attr.rss_hash_factor = hw_hf_new;<br />-            ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />             if (ret) {<br />                 PMD_DRV_LOG(ERR, "rss hash factor set failed");<br />                 return -EINVAL;<br />@@ -1129,7 +1129,7 @@ zxdh_rss_hash_conf_get(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_con<br />  <br />     zxdh_msg_head_build(hw, ZXDH_RSS_HF_GET, &msg);<br />     if (hw->is_pf) {<br />-        ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+        ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "rss hash factor set failed");<br />             return -EINVAL;<br />@@ -1181,9 +1181,9 @@ zxdh_rss_configure(struct rte_eth_dev *dev)<br />  <br />     if (hw->rss_enable != curr_rss_enable) {<br />         if (hw->is_pf) {<br />-            ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />             port_attr.rss_enable = curr_rss_enable;<br />-            ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />             if (ret) {<br />                 PMD_DRV_LOG(ERR, "rss enable set failed");<br />                 return -EINVAL;<br />@@ -1207,9 +1207,9 @@ zxdh_rss_configure(struct rte_eth_dev *dev)<br />         hw_hf = zxdh_rss_hf_to_hw(dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf);<br />         memset(&msg, 0, sizeof(msg));<br />         if (hw->is_pf) {<br />-            ret = zxdh_get_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_get_port_attr(hw, hw->vport.vport, &port_attr);<br />             port_attr.rss_hash_factor = hw_hf;<br />-            ret = zxdh_set_port_attr(hw->vport.vfid, &port_attr);<br />+            ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />             if (ret) {<br />                 PMD_DRV_LOG(ERR, "rss hash factor set failed");<br />                 return -EINVAL;<br />@@ -1244,7 +1244,7 @@ zxdh_rss_configure(struct rte_eth_dev *dev)<br />             hw->channel_context[hw->rss_reta[i] * 2].ph_chno;<br />  <br />     if (hw->is_pf) {<br />-        ret = zxdh_rss_table_set(hw->vport.vport, &msg.data.rss_reta);<br />+        ret = zxdh_rss_table_set(hw, hw->vport.vport, &msg.data.rss_reta);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "rss reta table set failed");<br />             return -EINVAL;<br />@@ -1334,13 +1334,14 @@ static void zxdh_data_hi_to_lo(uint64_t *data)<br /> static int zxdh_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *np_stats)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_np_stats_data stats_data;<br />     uint32_t stats_id = zxdh_vport_to_vfid(hw->vport);<br />     uint32_t idx = 0;<br />     int ret = 0;<br />  <br />     idx = stats_id + ZXDH_BROAD_STATS_EGRESS_BASE;<br />-    ret = zxdh_np_dtb_stats_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+    ret = zxdh_np_dtb_stats_get(hw->slot_id, dtb_data->queueid,<br />                 0, idx, (uint32_t *)&np_stats->np_tx_broadcast);<br />     if (ret)<br />         return ret;<br />@@ -1348,7 +1349,7 @@ static int zxdh_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *n<br />  <br />     idx = stats_id + ZXDH_BROAD_STATS_INGRESS_BASE;<br />     memset(&stats_data, 0, sizeof(stats_data));<br />-    ret = zxdh_np_dtb_stats_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+    ret = zxdh_np_dtb_stats_get(hw->slot_id, dtb_data->queueid,<br />                 0, idx, (uint32_t *)&np_stats->np_rx_broadcast);<br />     if (ret)<br />         return ret;<br />@@ -1356,7 +1357,7 @@ static int zxdh_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *n<br />  <br />     idx = stats_id + ZXDH_MTU_STATS_EGRESS_BASE;<br />     memset(&stats_data, 0, sizeof(stats_data));<br />-    ret = zxdh_np_dtb_stats_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+    ret = zxdh_np_dtb_stats_get(hw->slot_id, dtb_data->queueid,<br />                 1, idx, (uint32_t *)&stats_data);<br />     if (ret)<br />         return ret;<br />@@ -1368,7 +1369,7 @@ static int zxdh_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *n<br />  <br />     idx = stats_id + ZXDH_MTU_STATS_INGRESS_BASE;<br />     memset(&stats_data, 0, sizeof(stats_data));<br />-    ret = zxdh_np_dtb_stats_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+    ret = zxdh_np_dtb_stats_get(hw->slot_id, dtb_data->queueid,<br />                 1, idx, (uint32_t *)&stats_data);<br />     if (ret)<br />         return ret;<br />@@ -1381,7 +1382,7 @@ static int zxdh_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *n<br /> }<br />  <br /> static int<br />-zxdh_hw_np_stats_get(struct rte_eth_dev *dev,  struct zxdh_hw_np_stats *np_stats)<br />+zxdh_hw_np_stats_get(struct rte_eth_dev *dev, struct zxdh_hw_np_stats *np_stats)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />     struct zxdh_msg_info msg_info = {0};<br />@@ -1523,7 +1524,7 @@ int zxdh_dev_mtu_set(struct rte_eth_dev *dev, uint16_t new_mtu)<br />             return ret;<br />         }<br />  <br />-        ret = zxdh_get_port_attr(vfid, &vport_att);<br />+        ret = zxdh_get_port_attr(hw, hw->vport.vport, &vport_att);<br />         if (ret != 0) {<br />             PMD_DRV_LOG(ERR,<br />                 "[vfid:%d] zxdh_dev_mtu, get vport failed ret:%d", vfid, ret);<br />@@ -1540,7 +1541,7 @@ int zxdh_dev_mtu_set(struct rte_eth_dev *dev, uint16_t new_mtu)<br />  <br />         vport_att.mtu_enable = 1;<br />         vport_att.mtu = new_mtu;<br />-        ret = zxdh_set_port_attr(vfid, &vport_att);<br />+        ret = zxdh_set_port_attr(hw, hw->vport.vport, &vport_att);<br />         if (ret != 0) {<br />             PMD_DRV_LOG(ERR,<br />                 "[vfid:%d] zxdh_dev_mtu, set vport failed ret:%d", vfid, ret);<br />diff --git a/drivers/net/zxdh/zxdh_tables.c b/drivers/net/zxdh/zxdh_tables.c<br />index fe228e2227..f169eca575 100644<br />--- a/drivers/net/zxdh/zxdh_tables.c<br />+++ b/drivers/net/zxdh/zxdh_tables.c<br />@@ -27,17 +27,19 @@<br /> #define ZXDH_VLAN_FILTER_VLANID_STEP      120<br />  <br /> int<br />-zxdh_set_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr)<br />+zxdh_set_port_attr(struct zxdh_hw *hw, uint16_t vport, struct zxdh_port_attr_table *port_attr)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />+    union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />     int ret = 0;<br />  <br />-    ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vfid, (uint32_t *)port_attr};<br />+    ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vport_num.vfid, (uint32_t *)port_attr};<br />     ZXDH_DTB_USER_ENTRY_T user_entry_write = {ZXDH_SDT_VPORT_ATT_TABLE, (void *)&entry};<br />  <br />-    ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                g_dtb_data.queueid, 1, &user_entry_write);<br />+    ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                dtb_data->queueid, 1, &user_entry_write);<br />     if (ret != 0)<br />-        PMD_DRV_LOG(ERR, "write vport_att failed vfid:%d failed", vfid);<br />+        PMD_DRV_LOG(ERR, "write vport_att failed vfid:%d failed", vport_num.vfid);<br />  <br />     return ret;<br /> }<br />@@ -64,7 +66,7 @@ zxdh_port_attr_init(struct rte_eth_dev *dev)<br />         if (!port_attr.rss_enable)<br />             port_attr.port_base_qid = 0;<br />  <br />-        ret = zxdh_set_port_attr(hw->vfid, &port_attr);<br />+        ret = zxdh_set_port_attr(hw, hw->vport.vport, &port_attr);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write port_attr failed");<br />             ret = -1;<br />@@ -90,6 +92,7 @@ int<br /> zxdh_port_attr_uninit(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_msg_info msg_info = {0};<br />     struct zxdh_port_attr_table port_attr = {0};<br />     int ret = 0;<br />@@ -100,7 +103,7 @@ zxdh_port_attr_uninit(struct rte_eth_dev *dev)<br />             .sdt_no = ZXDH_SDT_VPORT_ATT_TABLE,<br />             .p_entry_data = (void *)&port_attr_entry<br />         };<br />-        ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO, g_dtb_data.queueid, 1, &entry);<br />+        ret = zxdh_np_dtb_table_entry_delete(hw->slot_id, dtb_data->queueid, 1, &entry);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "delete port attr table failed");<br />             ret = -1;<br />@@ -119,6 +122,7 @@ zxdh_port_attr_uninit(struct rte_eth_dev *dev)<br /> int zxdh_panel_table_init(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     int ret;<br />  <br />     if (!hw->is_pf)<br />@@ -140,7 +144,7 @@ int zxdh_panel_table_init(struct rte_eth_dev *dev)<br />         .sdt_no = ZXDH_SDT_PANEL_ATT_TABLE,<br />         .p_entry_data = (void *)&panel_entry<br />     };<br />-    ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid, 1, &entry);<br />+    ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid, 1, &entry);<br />  <br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "Insert eram-panel failed, code:%u", ret);<br />@@ -153,6 +157,7 @@ int zxdh_panel_table_init(struct rte_eth_dev *dev)<br /> int zxdh_get_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_attr)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     uint8_t index_phy_port = hw->phyport;<br />  <br />     ZXDH_DTB_ERAM_ENTRY_INFO_T panel_entry = {<br />@@ -163,7 +168,7 @@ int zxdh_get_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_<br />         .sdt_no = ZXDH_SDT_PANEL_ATT_TABLE,<br />         .p_entry_data = (void *)&panel_entry<br />     };<br />-    int ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &entry, 1);<br />+    int ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid, &entry, 1);<br />  <br />     if (ret != 0)<br />         PMD_DRV_LOG(ERR, "get panel table failed");<br />@@ -174,6 +179,7 @@ int zxdh_get_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_<br /> int zxdh_set_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_attr)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     uint8_t index_phy_port = hw->phyport;<br />  <br />     ZXDH_DTB_ERAM_ENTRY_INFO_T panel_entry = {<br />@@ -184,7 +190,7 @@ int zxdh_set_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_<br />         .sdt_no = ZXDH_SDT_PANEL_ATT_TABLE,<br />         .p_entry_data = (void *)&panel_entry<br />     };<br />-    int ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid, 1, &entry);<br />+    int ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid, 1, &entry);<br />  <br />     if (ret)<br />         PMD_DRV_LOG(ERR, "Insert panel table failed");<br />@@ -193,23 +199,26 @@ int zxdh_set_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_<br /> }<br />  <br /> int<br />-zxdh_get_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr)<br />+zxdh_get_port_attr(struct zxdh_hw *hw, uint16_t vport, struct zxdh_port_attr_table *port_attr)<br /> {<br />-    int ret;<br />-<br />-    ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vfid, (uint32_t *)port_attr};<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />+    union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />+    ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vport_num.vfid, (uint32_t *)port_attr};<br />     ZXDH_DTB_USER_ENTRY_T user_entry_get = {ZXDH_SDT_VPORT_ATT_TABLE, &entry};<br />+    int ret;<br />  <br />-    ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &user_entry_get, 1);<br />+    ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid, &user_entry_get, 1);<br />     if (ret != 0)<br />-        PMD_DRV_LOG(ERR, "get port_attr vfid:%d failed, ret:%d", vfid, ret);<br />+        PMD_DRV_LOG(ERR, "get port_attr vfid:%d failed, ret:%d", vport_num.vfid, ret);<br />  <br />     return ret;<br /> }<br />  <br /> int<br />-zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_search_idx)<br />+zxdh_set_mac_table(struct zxdh_hw *hw, uint16_t vport,<br />+        struct rte_ether_addr *addr, uint8_t hash_search_idx)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_mac_unicast_table unicast_table = {0};<br />     struct zxdh_mac_multicast_table multicast_table = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />@@ -230,8 +239,8 @@ zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />             .p_entry_data = (void *)&dtb_hash_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &entry_get);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &entry_get);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "Insert mac_table failed");<br />             return -ret;<br />@@ -251,7 +260,7 @@ zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />                 .p_entry_data = (void *)&dtb_hash_entry<br />             };<br />  <br />-            ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+            ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid,<br />                     &entry_get, 1);<br />             uint8_t index = (vport_num.vfid % 64) / 32;<br />             if (ret == 0) {<br />@@ -283,7 +292,7 @@ zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />                 }<br />             }<br />  <br />-            ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+            ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid,<br />                         1, &entry_get);<br />             if (ret) {<br />                 PMD_DRV_LOG(ERR, "add mac_table failed, code:%d", ret);<br />@@ -295,8 +304,10 @@ zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br /> }<br />  <br /> int<br />-zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_search_idx)<br />+zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport,<br />+        struct rte_ether_addr *addr, uint8_t hash_search_idx)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_mac_unicast_table unicast_table = {0};<br />     struct zxdh_mac_multicast_table multicast_table = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />@@ -318,8 +329,8 @@ zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />             .p_entry_data = (void *)&dtb_hash_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &entry_get);<br />+        ret = zxdh_np_dtb_table_entry_delete(hw->slot_id,<br />+                    dtb_data->queueid, 1, &entry_get);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "delete l2_fwd_hash_table failed, code:%d", ret);<br />             return -ret;<br />@@ -338,8 +349,8 @@ zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />             .p_entry_data = (void *)&dtb_hash_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, &entry_get, 1);<br />+        ret = zxdh_np_dtb_table_entry_get(hw->slot_id,<br />+                    dtb_data->queueid, &entry_get, 1);<br />         uint8_t index = (vport_num.vfid % 64) / 32;<br />         if (vport_num.vf_flag)<br />             multicast_table.entry.mc_bitmap[index] &=<br />@@ -347,8 +358,8 @@ zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />         else<br />             multicast_table.entry.mc_pf_enable = 0;<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &entry_get);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &entry_get);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "mac_addr_add mc_table failed, code:%d", ret);<br />             return -ret;<br />@@ -367,7 +378,7 @@ zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />                 .p_entry_data = (void *)&dtb_hash_entry<br />             };<br />  <br />-            ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+            ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid,<br />                         &entry_get, 1);<br />             if (multicast_table.entry.mc_bitmap[0] == 0 && <br />                 multicast_table.entry.mc_bitmap[1] == 0 && <br />@@ -392,8 +403,8 @@ zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_se<br />                     .p_entry_data = (void *)&dtb_hash_entry<br />                 };<br />  <br />-                ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO,<br />-                            g_dtb_data.queueid, 1, &entry_get);<br />+                ret = zxdh_np_dtb_table_entry_delete(hw->slot_id,<br />+                            dtb_data->queueid, 1, &entry_get);<br />             }<br />         }<br />     }<br />@@ -404,6 +415,7 @@ int<br /> zxdh_promisc_table_init(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     uint32_t ret, vf_group_id = 0;<br />     struct zxdh_brocast_table brocast_table = {0};<br />     struct zxdh_unitcast_table uc_table = {0};<br />@@ -423,8 +435,8 @@ zxdh_promisc_table_init(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_brocast_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &entry_brocast);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &entry_brocast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write brocast table failed");<br />             return ret;<br />@@ -440,8 +452,8 @@ zxdh_promisc_table_init(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_uc_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &entry_unicast);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &entry_unicast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write unicast table failed");<br />             return ret;<br />@@ -457,7 +469,7 @@ zxdh_promisc_table_init(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_mc_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid,<br />                     1, &entry_multicast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write multicast table failed");<br />@@ -472,6 +484,7 @@ int<br /> zxdh_promisc_table_uninit(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     uint32_t ret, vf_group_id = 0;<br />     struct zxdh_brocast_table brocast_table = {0};<br />     struct zxdh_unitcast_table uc_table = {0};<br />@@ -491,8 +504,8 @@ zxdh_promisc_table_uninit(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_brocast_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO,<br />-                g_dtb_data.queueid, 1, &entry_brocast);<br />+        ret = zxdh_np_dtb_table_entry_delete(hw->slot_id,<br />+                dtb_data->queueid, 1, &entry_brocast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write brocast table failed");<br />             return ret;<br />@@ -508,8 +521,8 @@ zxdh_promisc_table_uninit(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_uc_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO,<br />-                g_dtb_data.queueid, 1, &entry_unicast);<br />+        ret = zxdh_np_dtb_table_entry_delete(hw->slot_id,<br />+                dtb_data->queueid, 1, &entry_unicast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write unicast table failed");<br />             return ret;<br />@@ -525,7 +538,7 @@ zxdh_promisc_table_uninit(struct rte_eth_dev *dev)<br />             .p_entry_data = (void *)&eram_mc_entry<br />         };<br />  <br />-        ret = zxdh_np_dtb_table_entry_delete(ZXDH_DEVICE_NO, g_dtb_data.queueid,<br />+        ret = zxdh_np_dtb_table_entry_delete(hw->slot_id, dtb_data->queueid,<br />                     1, &entry_multicast);<br />         if (ret) {<br />             PMD_DRV_LOG(ERR, "write multicast table failed");<br />@@ -539,9 +552,10 @@ zxdh_promisc_table_uninit(struct rte_eth_dev *dev)<br /> int<br /> zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br /> {<br />-    int16_t ret = 0;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_unitcast_table uc_table = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />+    int16_t ret = 0;<br />  <br />     ZXDH_DTB_ERAM_ENTRY_INFO_T uc_table_entry = {<br />         .index = ((hw->vfid - ZXDH_BASE_VFID) << 2) + vport_num.vfid / 64,<br />@@ -552,7 +566,7 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br />         .p_entry_data = (void *)&uc_table_entry<br />     };<br />  <br />-    ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &entry, 1);<br />+    ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid, &entry, 1);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "unicast_table_get_failed:%d", hw->vfid);<br />         return -ret;<br />@@ -569,7 +583,7 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br />         uc_table.uc_flood_pf_enable = rte_be_to_cpu_32(ZXDH_TABLE_HIT_FLAG + (enable << 6));<br />     }<br />  <br />-    ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid, 1, &entry);<br />+    ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid, 1, &entry);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "unicast_table_set_failed:%d", hw->vfid);<br />         return -ret;<br />@@ -580,9 +594,10 @@ zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br /> int<br /> zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br /> {<br />-    int16_t ret = 0;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_multicast_table mc_table = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />+    int16_t ret = 0;<br />  <br />     ZXDH_DTB_ERAM_ENTRY_INFO_T mc_table_entry = {<br />         .index = ((hw->vfid - ZXDH_BASE_VFID) << 2) + vport_num.vfid / 64,<br />@@ -593,7 +608,7 @@ zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br />         .p_entry_data = (void *)&mc_table_entry<br />     };<br />  <br />-    ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &entry, 1);<br />+    ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid, &entry, 1);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "allmulti_table_get_failed:%d", hw->vfid);<br />         return -ret;<br />@@ -610,7 +625,7 @@ zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable)<br />     } else {<br />         mc_table.mc_flood_pf_enable = rte_be_to_cpu_32(ZXDH_TABLE_HIT_FLAG + (enable << 6));<br />     }<br />-    ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO, g_dtb_data.queueid, 1, &entry);<br />+    ret = zxdh_np_dtb_table_entry_write(hw->slot_id, dtb_data->queueid, 1, &entry);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "allmulti_table_set_failed:%d", hw->vfid);<br />         return -ret;<br />@@ -622,6 +637,7 @@ int<br /> zxdh_vlan_filter_table_init(struct rte_eth_dev *dev)<br /> {<br />     struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_vlan_filter_table vlan_table = {0};<br />     int16_t ret = 0;<br />  <br />@@ -643,8 +659,8 @@ zxdh_vlan_filter_table_init(struct rte_eth_dev *dev)<br />         };<br />         ZXDH_DTB_USER_ENTRY_T user_entry = {ZXDH_SDT_VLAN_ATT_TABLE, &entry_data};<br />  <br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &user_entry);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &user_entry);<br />         if (ret != 0) {<br />             PMD_DRV_LOG(ERR,<br />                 "[vfid:%d], vlan_group:%d, init vlan filter table failed",<br />@@ -657,8 +673,9 @@ zxdh_vlan_filter_table_init(struct rte_eth_dev *dev)<br /> }<br />  <br /> int<br />-zxdh_vlan_filter_table_set(uint16_t vport, uint16_t vlan_id, uint8_t enable)<br />+zxdh_vlan_filter_table_set(struct zxdh_hw *hw, uint16_t vport, uint16_t vlan_id, uint8_t enable)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_vlan_filter_table vlan_table = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />     int ret = 0;<br />@@ -677,7 +694,7 @@ zxdh_vlan_filter_table_set(uint16_t vport, uint16_t vlan_id, uint8_t enable)<br />     ZXDH_DTB_ERAM_ENTRY_INFO_T entry_data = {index, (uint32_t *)&vlan_table};<br />     ZXDH_DTB_USER_ENTRY_T user_entry_get = {ZXDH_SDT_VLAN_ATT_TABLE, &entry_data};<br />  <br />-    ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &user_entry_get, 1);<br />+    ret = zxdh_np_dtb_table_entry_get(hw->slot_id, dtb_data->queueid, &user_entry_get, 1);<br />     if (ret) {<br />         PMD_DRV_LOG(ERR, "get vlan table failed");<br />         return -1;<br />@@ -703,8 +720,8 @@ zxdh_vlan_filter_table_set(uint16_t vport, uint16_t vlan_id, uint8_t enable)<br />         .p_entry_data = &entry_data<br />     };<br />  <br />-    ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                g_dtb_data.queueid, 1, &user_entry_write);<br />+    ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                dtb_data->queueid, 1, &user_entry_write);<br />     if (ret != 0) {<br />         PMD_DRV_LOG(ERR, "write vlan table failed");<br />         return -1;<br />@@ -713,8 +730,9 @@ zxdh_vlan_filter_table_set(uint16_t vport, uint16_t vlan_id, uint8_t enable)<br /> }<br />  <br /> int<br />-zxdh_rss_table_set(uint16_t vport, struct zxdh_rss_reta *rss_reta)<br />+zxdh_rss_table_set(struct zxdh_hw *hw, uint16_t vport, struct zxdh_rss_reta *rss_reta)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_rss_to_vqid_table rss_vqid = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />     int ret = 0;<br />@@ -744,8 +762,8 @@ zxdh_rss_table_set(uint16_t vport, struct zxdh_rss_reta *rss_reta)<br />             .sdt_no = ZXDH_SDT_RSS_ATT_TABLE,<br />             .p_entry_data = &entry<br />         };<br />-        ret = zxdh_np_dtb_table_entry_write(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, 1, &user_entry_write);<br />+        ret = zxdh_np_dtb_table_entry_write(hw->slot_id,<br />+                    dtb_data->queueid, 1, &user_entry_write);<br />         if (ret != 0) {<br />             PMD_DRV_LOG(ERR, "write rss base qid failed vfid:%d", vport_num.vfid);<br />             return ret;<br />@@ -755,8 +773,9 @@ zxdh_rss_table_set(uint16_t vport, struct zxdh_rss_reta *rss_reta)<br /> }<br />  <br /> int<br />-zxdh_rss_table_get(uint16_t vport, struct zxdh_rss_reta *rss_reta)<br />+zxdh_rss_table_get(struct zxdh_hw *hw, uint16_t vport, struct zxdh_rss_reta *rss_reta)<br /> {<br />+    struct zxdh_dtb_shared_data *dtb_data = &hw->dev_sd->dtb_sd;<br />     struct zxdh_rss_to_vqid_table rss_vqid = {0};<br />     union zxdh_virport_num vport_num = (union zxdh_virport_num)vport;<br />     int ret = 0;<br />@@ -765,8 +784,8 @@ zxdh_rss_table_get(uint16_t vport, struct zxdh_rss_reta *rss_reta)<br />         ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vport_num.vfid * 32 + i, (uint32_t *)&rss_vqid};<br />         ZXDH_DTB_USER_ENTRY_T user_entry = {ZXDH_SDT_RSS_ATT_TABLE, &entry};<br />  <br />-        ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO,<br />-                    g_dtb_data.queueid, &user_entry, 1);<br />+        ret = zxdh_np_dtb_table_entry_get(hw->slot_id,<br />+                    dtb_data->queueid, &user_entry, 1);<br />         if (ret != 0) {<br />             PMD_DRV_LOG(ERR, "get rss tbl failed, vfid:%d", vport_num.vfid);<br />             return -1;<br />diff --git a/drivers/net/zxdh/zxdh_tables.h b/drivers/net/zxdh/zxdh_tables.h<br />index adedf3d0d3..d800faee3e 100644<br />--- a/drivers/net/zxdh/zxdh_tables.h<br />+++ b/drivers/net/zxdh/zxdh_tables.h<br />@@ -7,7 +7,6 @@<br />  <br /> #include <stdint.h> <br />  <br />-#define ZXDH_DEVICE_NO                    0<br /> #define ZXDH_PORT_MTU_FLAG                9<br /> #define ZXDH_PORT_BASE_QID_FLAG           10<br /> #define ZXDH_PORT_ATTR_IS_UP_FLAG         35<br />@@ -212,19 +211,24 @@ struct zxdh_rss_to_vqid_table {<br />  <br /> int zxdh_port_attr_init(struct rte_eth_dev *dev);<br /> int zxdh_panel_table_init(struct rte_eth_dev *dev);<br />-int zxdh_set_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr);<br />+int zxdh_set_port_attr(struct zxdh_hw *hw, uint16_t vport,<br />+        struct zxdh_port_attr_table *port_attr);<br /> int zxdh_port_attr_uninit(struct rte_eth_dev *dev);<br />-int zxdh_get_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr);<br />-int zxdh_set_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_search_idx);<br />-int zxdh_del_mac_table(uint16_t vport, struct rte_ether_addr *addr,  uint8_t hash_search_idx);<br />+int zxdh_get_port_attr(struct zxdh_hw *hw, uint16_t vport,<br />+        struct zxdh_port_attr_table *port_attr);<br />+int zxdh_set_mac_table(struct zxdh_hw *hw, uint16_t vport,<br />+        struct rte_ether_addr *addr,  uint8_t hash_search_idx);<br />+int zxdh_del_mac_table(struct zxdh_hw *hw, uint16_t vport,<br />+        struct rte_ether_addr *addr,  uint8_t hash_search_idx);<br /> int zxdh_promisc_table_init(struct rte_eth_dev *dev);<br /> int zxdh_promisc_table_uninit(struct rte_eth_dev *dev);<br /> int zxdh_dev_unicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable);<br /> int zxdh_dev_multicast_table_set(struct zxdh_hw *hw, uint16_t vport, bool enable);<br /> int zxdh_vlan_filter_table_init(struct rte_eth_dev *dev);<br />-int zxdh_vlan_filter_table_set(uint16_t vport, uint16_t vlan_id, uint8_t enable);<br />-int zxdh_rss_table_set(uint16_t vport, struct zxdh_rss_reta *rss_reta);<br />-int zxdh_rss_table_get(uint16_t vport, struct zxdh_rss_reta *rss_reta);<br />+int zxdh_vlan_filter_table_set(struct zxdh_hw *hw, uint16_t vport,<br />+        uint16_t vlan_id, uint8_t enable);<br />+int zxdh_rss_table_set(struct zxdh_hw *hw, uint16_t vport, struct zxdh_rss_reta *rss_reta);<br />+int zxdh_rss_table_get(struct zxdh_hw *hw, uint16_t vport, struct zxdh_rss_reta *rss_reta);<br /> int zxdh_get_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_attr);<br /> int zxdh_set_panel_attr(struct rte_eth_dev *dev, struct zxdh_panel_table *panel_attr);<br />  <br />--  <br />2.27.0<br />