Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f6bfa4c authored by Yunsheng Lin's avatar Yunsheng Lin Committed by Greg Kroah-Hartman
Browse files

net: hns3: Fix for packet buffer setting bug 



[ Upstream commit 996ff91840eb6f288826e472685abde78bac20ea ]

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: 46a3df9f ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5014ac9

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+8 −6
Original line number Diff line number Diff line
@@ -1657,11 +1657,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
@@ -1680,13 +1682,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 {
@@ -1718,11 +1720,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;

		}

	}