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

net: hns3: enable DCB when TC num is one and pfc_en is non-zero 



Currently when TC num is one, the DCB will be disabled no matter if
pfc_en is non-zero or not.

This patch enables the DCB if pfc_en is non-zero, even when TC num
is one.

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 f96315f2

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

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
	hdev->tm_info.hw_pfc_map = pfc_map;

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



	hclge_tm_pfc_info_update(hdev);



	return hclge_pause_setup_hw(hdev, false);

}

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

+17 −2
Original line number Diff line number Diff line
@@ -597,8 +597,10 @@ static void hclge_tm_tc_info_init(struct hclge_dev *hdev) 
		hdev->tm_info.prio_tc[i] =

			(i >= hdev->tm_info.num_tc) ? 0 : i;



	/* DCB is enabled if we have more than 1 TC */

	if (hdev->tm_info.num_tc > 1)

	/* DCB is enabled if we have more than 1 TC or pfc_en is

	 * non-zero.

	 */

	if (hdev->tm_info.num_tc > 1 || hdev->tm_info.pfc_en)

		hdev->flag |= HCLGE_FLAG_DCB_ENABLE;

	else

		hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;
@@ -1388,6 +1390,19 @@ void hclge_tm_schd_info_update(struct hclge_dev *hdev, u8 num_tc) 
	hclge_tm_schd_info_init(hdev);

}



void hclge_tm_pfc_info_update(struct hclge_dev *hdev)

{

	/* DCB is enabled if we have more than 1 TC or pfc_en is

	 * non-zero.

	 */

	if (hdev->tm_info.num_tc > 1 || hdev->tm_info.pfc_en)

		hdev->flag |= HCLGE_FLAG_DCB_ENABLE;

	else

		hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;



	hclge_pfc_info_init(hdev);

}



int hclge_tm_init_hw(struct hclge_dev *hdev, bool init)

{

	int ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ int hclge_pause_setup_hw(struct hclge_dev *hdev, bool init); 
int hclge_tm_schd_setup_hw(struct hclge_dev *hdev);

void hclge_tm_prio_tc_info_update(struct hclge_dev *hdev, u8 *prio_tc);

void hclge_tm_schd_info_update(struct hclge_dev *hdev, u8 num_tc);

void hclge_tm_pfc_info_update(struct hclge_dev *hdev);

int hclge_tm_dwrr_cfg(struct hclge_dev *hdev);

int hclge_tm_init_hw(struct hclge_dev *hdev, bool init);

int hclge_mac_pause_en_cfg(struct hclge_dev *hdev, bool tx, bool rx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE