net: hns3: reallocate tx/rx buffer after changing mtu

When changing the mtu, the max frame size also will be changed. The tx
buffer size and the rx buffer size to be allocated are determined by max
frame size. So when max frame size is changed, the tx buffer and rx buffer
need to be reallocated.

When the tc_num is changed, the tx buffer and rx buffer need to be
reallocated too. So calling set_mtu and buffer_alloc separately is better.

Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index d70619b5ff15b356a80014801d9bf5332a11dc1f..e110c65cd91a950c82aca49b3c2f8c522a564d0a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4772,11 +4772,9 @@ static int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)
        return hclge_set_vlan_rx_offload_cfg(vport);
 }
 
-static int hclge_set_mtu(struct hnae3_handle *handle, int new_mtu)
+static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mtu)
 {
-       struct hclge_vport *vport = hclge_get_vport(handle);
        struct hclge_config_max_frm_size_cmd *req;
-       struct hclge_dev *hdev = vport->back;
        struct hclge_desc desc;
        int max_frm_size;
        int ret;
@@ -4805,6 +4803,27 @@ static int hclge_set_mtu(struct hnae3_handle *handle, int new_mtu)
        return 0;
 }
 
+static int hclge_set_mtu(struct hnae3_handle *handle, int new_mtu)
+{
+       struct hclge_vport *vport = hclge_get_vport(handle);
+       struct hclge_dev *hdev = vport->back;
+       int ret;
+
+       ret = hclge_set_mac_mtu(hdev, new_mtu);
+       if (ret) {
+               dev_err(&hdev->pdev->dev,
+                       "Change mtu fail, ret =%d\n", ret);
+               return ret;
+       }
+
+       ret = hclge_buffer_alloc(hdev);
+       if (ret)
+               dev_err(&hdev->pdev->dev,
+                       "Allocate buffer fail, ret =%d\n", ret);
+
+       return ret;
+}
+
 static int hclge_send_reset_tqp_cmd(struct hclge_dev *hdev, u16 queue_id,
                                    bool enable)
 {
@@ -5392,11 +5411,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
                dev_err(&pdev->dev, "Mac init error, ret = %d\n", ret);
                return ret;
        }
-       ret = hclge_buffer_alloc(hdev);
-       if (ret) {
-               dev_err(&pdev->dev, "Buffer allocate fail, ret =%d\n", ret);
-               return  ret;
-       }
 
        ret = hclge_config_tso(hdev, HCLGE_TSO_MSS_MIN, HCLGE_TSO_MSS_MAX);
        if (ret) {
@@ -5503,12 +5517,6 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)
                return ret;
        }
 
-       ret = hclge_buffer_alloc(hdev);
-       if (ret) {
-               dev_err(&pdev->dev, "Buffer allocate fail, ret =%d\n", ret);
-               return ret;
-       }
-
        ret = hclge_config_tso(hdev, HCLGE_TSO_MSS_MIN, HCLGE_TSO_MSS_MAX);
        if (ret) {
                dev_err(&pdev->dev, "Enable tso fail, ret =%d\n", ret);