Commit 63247ba1 authored by Guojia Liao's avatar Guojia Liao Committed by Zheng Zengkai
Browse files

net: hns3: split out hclge_tm_vport_tc_info_update() 

mainline inclusion
from mainline-v5.13-rc1
commit b1261897
category: feature
bugzilla: 173966
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b1261897b0902d870c483fb006a9443723a3d58b



----------------------------------------------------------------------

hclge_tm_vport_tc_info_update() is bloated, so split it into
separate functions for readability and maintainability.

Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarYongxin Li <liyongxin1@huawei.com>
Signed-off-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 9232c252

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

+9 −2
Original line number Diff line number Diff line
@@ -631,13 +631,12 @@ static u16 hclge_vport_get_tqp_num(struct hclge_vport *vport) 
	return sum;

}



static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport)

static void hclge_tm_update_kinfo_rss_size(struct hclge_vport *vport)

{

	struct hnae3_knic_private_info *kinfo = &vport->nic.kinfo;

	struct hclge_dev *hdev = vport->back;

	u16 vport_max_rss_size;

	u16 max_rss_size;

	u8 i;



	/* TC configuration is shared by PF/VF in one port, only allow

	 * one tc for VF for simplicity. VF's vport_id is non zero.
@@ -677,7 +676,15 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport) 
		/* Set to the maximum specification value (max_rss_size). */

		kinfo->rss_size = max_rss_size;

	}

}



static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport)

{

	struct hnae3_knic_private_info *kinfo = &vport->nic.kinfo;

	struct hclge_dev *hdev = vport->back;

	u8 i;



	hclge_tm_update_kinfo_rss_size(vport);

	kinfo->num_tqps = hclge_vport_get_tqp_num(vport);

	vport->dwrr = 100;  /* 100 percent as init */

	vport->alloc_rss_size = kinfo->rss_size;