Commit 13297028 authored by Guangbin Huang's avatar Guangbin Huang Committed by David S. Miller
Browse files

net: hns3: add a check for device specifications queried from firmware 



The device specifications querying is unsupported by the old
firmware, in this case, these specifications are 0. However,
some specifications should not be 0 or will cause problem.

So after querying from firmware, some device specifications
are needed to check their value and set to default value if
their values are 0.

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9c7d20d

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

+15 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,20 @@ static void hclge_parse_dev_specs(struct hclge_dev *hdev, 
	ae_dev->dev_specs.max_tm_rate = le32_to_cpu(req0->max_tm_rate);

}



static void hclge_check_dev_specs(struct hclge_dev *hdev)

{

	struct hnae3_dev_specs *dev_specs = &hdev->ae_dev->dev_specs;



	if (!dev_specs->max_non_tso_bd_num)

		dev_specs->max_non_tso_bd_num = HCLGE_MAX_NON_TSO_BD_NUM;

	if (!dev_specs->rss_ind_tbl_size)

		dev_specs->rss_ind_tbl_size = HCLGE_RSS_IND_TBL_SIZE;

	if (!dev_specs->rss_key_size)

		dev_specs->rss_key_size = HCLGE_RSS_KEY_SIZE;

	if (!dev_specs->max_tm_rate)

		dev_specs->max_tm_rate = HCLGE_ETHER_MAX_RATE;

}



static int hclge_query_dev_specs(struct hclge_dev *hdev)

{

	struct hclge_desc desc[HCLGE_QUERY_DEV_SPECS_BD_NUM];
@@ -1409,6 +1423,7 @@ static int hclge_query_dev_specs(struct hclge_dev *hdev) 
		return ret;



	hclge_parse_dev_specs(hdev, desc);

	hclge_check_dev_specs(hdev);



	return 0;

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+13 −0
Original line number Diff line number Diff line
@@ -2965,6 +2965,18 @@ static void hclgevf_parse_dev_specs(struct hclgevf_dev *hdev, 
	ae_dev->dev_specs.rss_key_size = le16_to_cpu(req0->rss_key_size);

}



static void hclgevf_check_dev_specs(struct hclgevf_dev *hdev)

{

	struct hnae3_dev_specs *dev_specs = &hdev->ae_dev->dev_specs;



	if (!dev_specs->max_non_tso_bd_num)

		dev_specs->max_non_tso_bd_num = HCLGEVF_MAX_NON_TSO_BD_NUM;

	if (!dev_specs->rss_ind_tbl_size)

		dev_specs->rss_ind_tbl_size = HCLGEVF_RSS_IND_TBL_SIZE;

	if (!dev_specs->rss_key_size)

		dev_specs->rss_key_size = HCLGEVF_RSS_KEY_SIZE;

}



static int hclgevf_query_dev_specs(struct hclgevf_dev *hdev)

{

	struct hclgevf_desc desc[HCLGEVF_QUERY_DEV_SPECS_BD_NUM];
@@ -2992,6 +3004,7 @@ static int hclgevf_query_dev_specs(struct hclgevf_dev *hdev) 
		return ret;



	hclgevf_parse_dev_specs(hdev, desc);

	hclgevf_check_dev_specs(hdev);



	return 0;

}