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

net: hns3: remove tc enable checking 



Currently, in function hns3_nic_set_real_num_queue(), the
driver doesn't report the queue count and offset for disabled
tc. If user enables multiple TCs, but only maps user
priorities to partial of them, it may cause the queue range
of the unmapped TC being displayed abnormally.

Fix it by removing the tc enable checking, ensure the queue
count is not zero.

With this change, the tc_en is useless now, so remove it.

Fixes: a75a8efa ("net: hns3: Fix tc setup when netdev is first up")
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 5b09e88e

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+0 −1
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ struct hnae3_tc_info { 
	u8 prio_tc[HNAE3_MAX_USER_PRIO]; /* TC indexed by prio */

	u16 tqp_count[HNAE3_MAX_TC];

	u16 tqp_offset[HNAE3_MAX_TC];

	unsigned long tc_en; /* bitmap of TC enabled */

	u8 num_tc; /* Total number of enabled TCs */

	bool mqprio_active;

};

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+2 −9
Original line number Diff line number Diff line
@@ -623,14 +623,10 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev) 
			return ret;

		}



		for (i = 0; i < HNAE3_MAX_TC; i++) {

			if (!test_bit(i, &tc_info->tc_en))

				continue;



		for (i = 0; i < tc_info->num_tc; i++)

			netdev_set_tc_queue(netdev, i, tc_info->tqp_count[i],

					    tc_info->tqp_offset[i]);

	}

	}



	ret = netif_set_real_num_tx_queues(netdev, queue_size);

	if (ret) {
@@ -4870,12 +4866,9 @@ static void hns3_init_tx_ring_tc(struct hns3_nic_priv *priv) 
	struct hnae3_tc_info *tc_info = &kinfo->tc_info;

	int i;



	for (i = 0; i < HNAE3_MAX_TC; i++) {

	for (i = 0; i < tc_info->num_tc; i++) {

		int j;



		if (!test_bit(i, &tc_info->tc_en))

			continue;



		for (j = 0; j < tc_info->tqp_count[i]; j++) {

			struct hnae3_queue *q;

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

+0 −5
Original line number Diff line number Diff line
@@ -441,8 +441,6 @@ static int hclge_mqprio_qopt_check(struct hclge_dev *hdev, 
static void hclge_sync_mqprio_qopt(struct hnae3_tc_info *tc_info,

				   struct tc_mqprio_qopt_offload *mqprio_qopt)

{

	int i;



	memset(tc_info, 0, sizeof(*tc_info));

	tc_info->num_tc = mqprio_qopt->qopt.num_tc;

	memcpy(tc_info->prio_tc, mqprio_qopt->qopt.prio_tc_map,
@@ -451,9 +449,6 @@ static void hclge_sync_mqprio_qopt(struct hnae3_tc_info *tc_info, 
	       sizeof_field(struct hnae3_tc_info, tqp_count));

	memcpy(tc_info->tqp_offset, mqprio_qopt->qopt.offset,

	       sizeof_field(struct hnae3_tc_info, tqp_offset));



	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)

		set_bit(tc_info->prio_tc[i], &tc_info->tc_en);

}



static int hclge_config_tc(struct hclge_dev *hdev,

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

+0 −2
Original line number Diff line number Diff line
@@ -687,12 +687,10 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport) 


	for (i = 0; i < HNAE3_MAX_TC; i++) {

		if (hdev->hw_tc_map & BIT(i) && i < kinfo->tc_info.num_tc) {

			set_bit(i, &kinfo->tc_info.tc_en);

			kinfo->tc_info.tqp_offset[i] = i * kinfo->rss_size;

			kinfo->tc_info.tqp_count[i] = kinfo->rss_size;

		} else {

			/* Set to default queue if TC is disable */

			clear_bit(i, &kinfo->tc_info.tc_en);

			kinfo->tc_info.tqp_offset[i] = 0;

			kinfo->tc_info.tqp_count[i] = 1;

		}