net: hns3: up/down netdev in hclge module when setting mtu

BugLink: https://bugs.launchpad.net/bugs/1810457
Currently netdev is down in enet module, and it is before
mtu range checking in hclge module, which may be cause
netdev being down unnecessarily.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit cdca4c485d0c6467211f7181710122100552b4b9)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index fe029090935eddf7caf66b9546dad5e723f1a013..57de21622e884538ec17c75c781522052150f154 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1564,18 +1564,11 @@ static int hns3_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
 static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
 {
        struct hnae3_handle *h = hns3_get_handle(netdev);
-       bool if_running = netif_running(netdev);
        int ret;
 
        if (!h->ae_algo->ops->set_mtu)
                return -EOPNOTSUPP;
 
-       /* if this was called with netdev up then bring netdevice down */
-       if (if_running) {
-               (void)hns3_nic_net_stop(netdev);
-               msleep(100);
-       }
-
        ret = h->ae_algo->ops->set_mtu(h, new_mtu);
        if (ret)
                netdev_err(netdev, "failed to change MTU in hardware %d\n",
@@ -1583,10 +1576,6 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
        else
                netdev->mtu = new_mtu;
 
-       /* if the netdev was running earlier, bring it up again */
-       if (if_running && hns3_nic_net_open(netdev))
-               ret = -EINVAL;
-
        return ret;
 }
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 9ff026db2825f17da03f5169234fa147300e0c63..12ccbaa6cbd1bbbe47b9bce64868948481c1dfbf 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -6450,6 +6450,8 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu)
                        return -EINVAL;
                }
 
+       hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);
+
        ret = hclge_set_mac_mtu(hdev, max_frm_size);
        if (ret) {
                dev_err(&hdev->pdev->dev,
@@ -6466,6 +6468,7 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu)
                        "Allocate buffer fail, ret =%d\n", ret);
 
 out:
+       hclge_notify_client(hdev, HNAE3_UP_CLIENT);
        mutex_unlock(&hdev->vport_lock);
        return ret;
 }