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

Commit d3ad430a authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

net: hns3: fix PFC not setting problem for DCB module 



The PFC enabling is based on user priority, currently it is
based on TC, which may cause PFC not setting correctly when pri
to TC mapping is not one to one relation.

This patch adds pfc_en in tm_info to fix it.

Fixes: cacde272 ("net: hns3: Add hclge_dcb module for the support of DCB feature")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d174ea75

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -296,6 +296,9 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
	    hdev->flag & HCLGE_FLAG_MQPRIO_ENABLE)

	    hdev->flag & HCLGE_FLAG_MQPRIO_ENABLE)

		return -EINVAL;

		return -EINVAL;





	if (pfc->pfc_en == hdev->tm_info.pfc_en)

		return 0;



	prio_tc = hdev->tm_info.prio_tc;

	prio_tc = hdev->tm_info.prio_tc;

	pfc_map = 0;

	pfc_map = 0;
@@ -308,10 +311,8 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
		}

		}

	}

	}





	if (pfc_map == hdev->tm_info.hw_pfc_map)

		return 0;



	hdev->tm_info.hw_pfc_map = pfc_map;

	hdev->tm_info.hw_pfc_map = pfc_map;

	hdev->tm_info.pfc_en = pfc->pfc_en;





	return hclge_pause_setup_hw(hdev, false);

	return hclge_pause_setup_hw(hdev, false);

}

}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -325,6 +325,7 @@ struct hclge_tm_info { 
	struct hclge_tc_info tc_info[HNAE3_MAX_TC];

	struct hclge_tc_info tc_info[HNAE3_MAX_TC];

	enum hclge_fc_mode fc_mode;

	enum hclge_fc_mode fc_mode;

	u8 hw_pfc_map; /* Allow for packet drop or not on this TC */

	u8 hw_pfc_map; /* Allow for packet drop or not on this TC */

	u8 pfc_en;	/* PFC enabled or not for user priority */

};

};





struct hclge_comm_stats_str {

struct hclge_comm_stats_str {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1215,7 +1215,7 @@ static int hclge_pfc_setup_hw(struct hclge_dev *hdev) 
				HCLGE_RX_MAC_PAUSE_EN_MSK;

				HCLGE_RX_MAC_PAUSE_EN_MSK;





	return hclge_pfc_pause_en_cfg(hdev, enable_bitmap,

	return hclge_pfc_pause_en_cfg(hdev, enable_bitmap,

				      hdev->tm_info.hw_pfc_map);

				      hdev->tm_info.pfc_en);

}

}





/* Each Tc has a 1024 queue sets to backpress, it divides to

/* Each Tc has a 1024 queue sets to backpress, it divides to