|
@@ -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;
|
|
|
}
|
|
|
}
|