Commit 0472e95f authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: fix mixed flag HCLGE_FLAG_MQPRIO_ENABLE and HCLGE_FLAG_DCB_ENABLE 



HCLGE_FLAG_MQPRIO_ENABLE is supposed to set when enable
multiple TCs with tc mqprio, and HCLGE_FLAG_DCB_ENABLE is
supposed to set when enable multiple TCs with ets. But
the driver mixed the flags when updating the tm configuration.

Furtherly, PFC should be available when HCLGE_FLAG_MQPRIO_ENABLE
too, so remove the unnecessary limitation.

Fixes: 5a5c9091 ("net: hns3: add support for tc mqprio offload")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d82650be

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

+5 −2
Original line number Diff line number Diff line
@@ -247,6 +247,10 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets) 
	}



	hclge_tm_schd_info_update(hdev, num_tc);

	if (num_tc > 1)

		hdev->flag |= HCLGE_FLAG_DCB_ENABLE;

	else

		hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;



	ret = hclge_ieee_ets_to_tm_info(hdev, ets);

	if (ret)
@@ -306,8 +310,7 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
	u8 i, j, pfc_map, *prio_tc;

	int ret;



	if (!(hdev->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) ||

	    hdev->flag & HCLGE_FLAG_MQPRIO_ENABLE)

	if (!(hdev->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))

		return -EINVAL;



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

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

+5 −26
Original line number Diff line number Diff line
@@ -727,14 +727,6 @@ static void hclge_tm_tc_info_init(struct hclge_dev *hdev) 
	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)

		hdev->tm_info.prio_tc[i] =

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



	/* 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;

}



static void hclge_tm_pg_info_init(struct hclge_dev *hdev)
@@ -765,10 +757,10 @@ static void hclge_tm_pg_info_init(struct hclge_dev *hdev) 


static void hclge_update_fc_mode_by_dcb_flag(struct hclge_dev *hdev)

{

	if (!(hdev->flag & HCLGE_FLAG_DCB_ENABLE)) {

	if (hdev->tm_info.num_tc == 1 && !hdev->tm_info.pfc_en) {

		if (hdev->fc_mode_last_time == HCLGE_FC_PFC)

			dev_warn(&hdev->pdev->dev,

				 "DCB is disable, but last mode is FC_PFC\n");

				 "Only 1 tc used, but last mode is FC_PFC\n");



		hdev->tm_info.fc_mode = hdev->fc_mode_last_time;

	} else if (hdev->tm_info.fc_mode != HCLGE_FC_PFC) {
@@ -794,7 +786,7 @@ static void hclge_update_fc_mode(struct hclge_dev *hdev) 
	}

}



static void hclge_pfc_info_init(struct hclge_dev *hdev)

void hclge_tm_pfc_info_update(struct hclge_dev *hdev)

{

	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)

		hclge_update_fc_mode(hdev);
@@ -810,7 +802,7 @@ static void hclge_tm_schd_info_init(struct hclge_dev *hdev) 


	hclge_tm_vport_info_update(hdev);



	hclge_pfc_info_init(hdev);

	hclge_tm_pfc_info_update(hdev);

}



static int hclge_tm_pg_to_pri_map(struct hclge_dev *hdev)
@@ -1556,19 +1548,6 @@ 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;
@@ -1614,7 +1593,7 @@ int hclge_tm_vport_map_update(struct hclge_dev *hdev) 
	if (ret)

		return ret;



	if (!(hdev->flag & HCLGE_FLAG_DCB_ENABLE))

	if (hdev->tm_info.num_tc == 1 && !hdev->tm_info.pfc_en)

		return 0;



	return hclge_tm_bp_setup(hdev);