net/hns3: unify MAC and multicast address configuration

Currently, the interface logic for adding and deleting all MAC address
and multicast address in PF and VF driver is the same. This patch
extracts two common interfaces to configure them separately.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 48f5c996d5ce31a51dd70e3a2d5a250289051f4d..7dcc701b1c89caa03944dca1395dc36405b00648 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -1790,17 +1790,20 @@ err_add_uc_addr:
        return ret;
 }
 
-static int
+int
 hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del)
 {
        char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
        struct hns3_hw *hw = &hns->hw;
+       struct hns3_hw_ops *ops = &hw->ops;
        struct rte_ether_addr *addr;
-       int err = 0;
-       int ret;
+       uint16_t mac_addrs_capa;
+       int ret = 0;
        int i;
 
-       for (i = 0; i < HNS3_UC_MACADDR_NUM; i++) {
+       mac_addrs_capa =
+               hns->is_vf ? HNS3_VF_UC_MACADDR_NUM : HNS3_UC_MACADDR_NUM;
+       for (i = 0; i < mac_addrs_capa; i++) {
                addr = &hw->data->mac_addrs[i];
                if (rte_is_zero_ether_addr(addr))
                        continue;
@@ -1812,15 +1815,14 @@ hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del)
                              ops->add_uc_mac_addr(hw, addr);
 
                if (ret) {
-                       err = ret;
                        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",
-                                mac_str, i, ret);
+                                              addr);
+                       hns3_err(hw, "failed to %s mac addr(%s) index:%d ret = %d.",
+                                del ? "remove" : "restore", mac_str, i, ret);
                }
        }
-       return err;
+
+       return ret;
 }
 
 static void
@@ -2151,14 +2153,13 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
        return 0;
 }
 
-static int
+int
 hns3_configure_all_mc_mac_addr(struct hns3_adapter *hns, bool del)
 {
        char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
        struct hns3_hw *hw = &hns->hw;
        struct rte_ether_addr *addr;
-       int err = 0;
-       int ret;
+       int ret = 0;
        int i;
 
        for (i = 0; i < hw->mc_addrs_num; i++) {
@@ -2170,14 +2171,13 @@ hns3_configure_all_mc_mac_addr(struct hns3_adapter *hns, bool del)
                else
                        ret = hw->ops.add_mc_mac_addr(hw, addr);
                if (ret) {
-                       err = ret;
                        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",
+                       hns3_dbg(hw, "failed to %s mc mac addr: %s ret = %d",
                                 del ? "Remove" : "Restore", mac_str, ret);
                }
        }
-       return err;
+       return ret;
 }
 
 static int

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 4c1e4955f2d2d2b26b680ee5cfed766b4f4a3184..a07de6b6413084a409a97bd80791060353573807 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -1064,6 +1064,8 @@ void hns3vf_update_push_lsc_cap(struct hns3_hw *hw, bool supported);
 
 bool hns3_find_duplicate_mc_addr(struct hns3_hw *hw,
                                struct rte_ether_addr *mc_addr);
+int hns3_configure_all_mc_mac_addr(struct hns3_adapter *hns, bool del);
+int hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del);
 
 int hns3_restore_ptp(struct hns3_adapter *hns);
 int hns3_mbuf_dyn_rx_timestamp_register(struct rte_eth_dev *dev,

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index d69a3e559f72caf7a0b17dcfc80ec1a35911b4aa..6af55f439746893b54a766388babb9e53342e86d 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -323,40 +323,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
        return ret;
 }
 
-static int
-hns3vf_configure_mac_addr(struct hns3_adapter *hns, bool del)
-{
-       char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
-       struct hns3_hw *hw = &hns->hw;
-       struct hns3_hw_ops *ops = &hw->ops;
-       struct rte_ether_addr *addr;
-       int err = 0;
-       int ret;
-       int i;
-
-       for (i = 0; i < HNS3_VF_UC_MACADDR_NUM; i++) {
-               addr = &hw->data->mac_addrs[i];
-               if (rte_is_zero_ether_addr(addr))
-                       continue;
-               if (rte_is_multicast_ether_addr(addr))
-                       ret = del ? ops->del_mc_mac_addr(hw, addr) :
-                             ops->add_mc_mac_addr(hw, addr);
-               else
-                       ret = del ? ops->del_uc_mac_addr(hw, addr) :
-                             ops->add_uc_mac_addr(hw, addr);
-
-               if (ret) {
-                       err = ret;
-                       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",
-                                mac_str, i, ret);
-               }
-       }
-       return err;
-}
-
 static int
 hns3vf_add_mc_mac_addr(struct hns3_hw *hw,
                       struct rte_ether_addr *mac_addr)
@@ -511,35 +477,6 @@ hns3vf_set_mc_mac_addr_list(struct rte_eth_dev *dev,
        return 0;
 }
 
-static int
-hns3vf_configure_all_mc_mac_addr(struct hns3_adapter *hns, bool del)
-{
-       char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
-       struct hns3_hw *hw = &hns->hw;
-       struct rte_ether_addr *addr;
-       int err = 0;
-       int ret;
-       int i;
-
-       for (i = 0; i < hw->mc_addrs_num; i++) {
-               addr = &hw->mc_addrs[i];
-               if (!rte_is_multicast_ether_addr(addr))
-                       continue;
-               if (del)
-                       ret = hw->ops.del_mc_mac_addr(hw, addr);
-               else
-                       ret = hw->ops.add_mc_mac_addr(hw, addr);
-               if (ret) {
-                       err = ret;
-                       hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
-                                             addr);
-                       hns3_err(hw, "Failed to %s mc mac addr: %s for vf: %d",
-                                del ? "Remove" : "Restore", mac_str, ret);
-               }
-       }
-       return err;
-}
-
 static int
 hns3vf_set_promisc_mode(struct hns3_hw *hw, bool en_bc_pmc,
                        bool en_uc_pmc, bool en_mc_pmc)
@@ -2048,7 +1985,7 @@ hns3vf_do_stop(struct hns3_adapter *hns)
                hns3_dev_release_mbufs(hns);
 
        if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED) == 0) {
-               hns3vf_configure_mac_addr(hns, true);
+               hns3_configure_all_mac_addr(hns, true);
                ret = hns3_reset_all_tqps(hns);
                if (ret) {
                        hns3_err(hw, "failed to reset all queues ret = %d",
@@ -2143,7 +2080,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
        hns3_reset_abort(hns);
        hw->adapter_state = HNS3_NIC_CLOSED;
        rte_eal_alarm_cancel(hns3vf_keep_alive_handler, eth_dev);
-       hns3vf_configure_all_mc_mac_addr(hns, true);
+       hns3_configure_all_mc_mac_addr(hns, true);
        hns3vf_remove_all_vlan_table(hns);
        hns3vf_uninit_vf(eth_dev);
        hns3_free_all_queues(eth_dev);
@@ -2572,7 +2509,7 @@ hns3vf_stop_service(struct hns3_adapter *hns)
         * required to delete the entries.
         */
        if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED) == 0)
-               hns3vf_configure_all_mc_mac_addr(hns, true);
+               hns3_configure_all_mc_mac_addr(hns, true);
        rte_spinlock_unlock(&hw->lock);
 
        return 0;
@@ -2658,11 +2595,11 @@ hns3vf_restore_conf(struct hns3_adapter *hns)
        if (ret)
                return ret;
 
-       ret = hns3vf_configure_mac_addr(hns, false);
+       ret = hns3_configure_all_mac_addr(hns, false);
        if (ret)
                return ret;
 
-       ret = hns3vf_configure_all_mc_mac_addr(hns, false);
+       ret = hns3_configure_all_mc_mac_addr(hns, false);
        if (ret)
                goto err_mc_mac;
 
@@ -2703,9 +2640,9 @@ hns3vf_restore_conf(struct hns3_adapter *hns)
        return 0;
 
 err_vlan_table:
-       hns3vf_configure_all_mc_mac_addr(hns, true);
+       hns3_configure_all_mc_mac_addr(hns, true);
 err_mc_mac:
-       hns3vf_configure_mac_addr(hns, true);
+       hns3_configure_all_mac_addr(hns, true);
        return ret;
 }