net: hns3: Fix for packet buffer setting bug

BugLink: https://bugs.launchpad.net/bugs/1810457
The hardware expects a unit of 128 bytes when setting
packet buffer. When calculating the packet buffer size,
hclge_rx_buffer_calc does not round up the size as a unit
of 128 byte, which may casue packet lost problem when stress
testing.

This patch fixes it by rounding up packet size when calculating.

Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 996ff91840eb6f288826e472685abde78bac20ea)
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/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index f690110fcaed531bfd0780b766eea1c07fd18a99..ddf5909a51d671089683c192cee3ac38a2b31c19 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1356,11 +1356,13 @@ static int hclge_tx_buffer_calc(struct hclge_dev *hdev,
 static int hclge_rx_buffer_calc(struct hclge_dev *hdev,
                                struct hclge_pkt_buf_alloc *buf_alloc)
 {
-       u32 rx_all = hdev->pkt_buf_size;
+#define HCLGE_BUF_SIZE_UNIT    128
+       u32 rx_all = hdev->pkt_buf_size, aligned_mps;
        int no_pfc_priv_num, pfc_priv_num;
        struct hclge_priv_buf *priv;
        int i;
 
+       aligned_mps = round_up(hdev->mps, HCLGE_BUF_SIZE_UNIT);
        rx_all -= hclge_get_tx_buff_alloced(buf_alloc);
 
        /* When DCB is not supported, rx private
@@ -1379,13 +1381,13 @@ static int hclge_rx_buffer_calc(struct hclge_dev *hdev,
                if (hdev->hw_tc_map & BIT(i)) {
                        priv->enable = 1;
                        if (hdev->tm_info.hw_pfc_map & BIT(i)) {
-                               priv->wl.low = hdev->mps;
-                               priv->wl.high = priv->wl.low + hdev->mps;
+                               priv->wl.low = aligned_mps;
+                               priv->wl.high = priv->wl.low + aligned_mps;
                                priv->buf_size = priv->wl.high +
                                                HCLGE_DEFAULT_DV;
                        } else {
                                priv->wl.low = 0;
-                               priv->wl.high = 2 * hdev->mps;
+                               priv->wl.high = 2 * aligned_mps;
                                priv->buf_size = priv->wl.high;
                        }
                } else {
@@ -1417,11 +1419,11 @@ static int hclge_rx_buffer_calc(struct hclge_dev *hdev,
 
                if (hdev->tm_info.hw_pfc_map & BIT(i)) {
                        priv->wl.low = 128;
-                       priv->wl.high = priv->wl.low + hdev->mps;
+                       priv->wl.high = priv->wl.low + aligned_mps;
                        priv->buf_size = priv->wl.high + HCLGE_DEFAULT_DV;
                } else {
                        priv->wl.low = 0;
-                       priv->wl.high = hdev->mps;
+                       priv->wl.high = aligned_mps;
                        priv->buf_size = priv->wl.high;
                }
        }