Commit 3f094bd1 authored by Guangbin Huang's avatar Guangbin Huang Committed by Jakub Kicinski
Browse files

net: hns3: replace macro of max qset number with specification 



The max qset number is a fixed value now and it is defined by a macro.
In order to support other value in different kinds of device, it is
better to use specification queried from firmware to replace macro.

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2783e77b

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

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ struct hnae3_dev_specs { 
	u16 max_int_gl; /* max value of interrupt coalesce based on INT_GL */

	u8 max_non_tso_bd_num; /* max BD number of one non-TSO packet */

	u16 max_frm_size;

	u16 max_qset_num;

};



struct hnae3_client_ops {

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

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ static void hns3_dbg_dev_specs(struct hnae3_handle *h) 
	dev_info(priv->dev, "MAX INT GL: %u\n", dev_specs->max_int_gl);

	dev_info(priv->dev, "MAX frame size: %u\n", dev_specs->max_frm_size);

	dev_info(priv->dev, "MAX TM RATE: %uMbps\n", dev_specs->max_tm_rate);

	dev_info(priv->dev, "MAX QSET number: %u\n", dev_specs->max_qset_num);

}



static ssize_t hns3_dbg_cmd_read(struct file *filp, char __user *buffer,

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

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ struct hclge_dev_specs_0_cmd { 


struct hclge_dev_specs_1_cmd {

	__le16 max_frm_size;

	__le16 rsv0;

	__le16 max_qset_num;

	__le16 max_int_gl;

	u8 rsv1[18];

};

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

+3 −5
Original line number Diff line number Diff line
@@ -1599,8 +1599,6 @@ static void hclge_dbg_dump_qs_shaper_all(struct hclge_dev *hdev) 
static void hclge_dbg_dump_qs_shaper(struct hclge_dev *hdev,

				     const char *cmd_buf)

{

#define HCLGE_MAX_QSET_NUM 1024



	u16 qsid;

	int ret;
@@ -1610,9 +1608,9 @@ static void hclge_dbg_dump_qs_shaper(struct hclge_dev *hdev, 
		return;

	}



	if (qsid >= HCLGE_MAX_QSET_NUM) {

		dev_err(&hdev->pdev->dev, "qsid(%u) out of range[0-1023]\n",

			qsid);

	if (qsid >= hdev->ae_dev->dev_specs.max_qset_num) {

		dev_err(&hdev->pdev->dev, "qsid(%u) out of range[0-%u]\n",

			qsid, hdev->ae_dev->dev_specs.max_qset_num - 1);

		return;

	}

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

+4 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ static void hclge_set_default_dev_specs(struct hclge_dev *hdev) 
	ae_dev->dev_specs.max_tm_rate = HCLGE_ETHER_MAX_RATE;

	ae_dev->dev_specs.max_int_gl = HCLGE_DEF_MAX_INT_GL;

	ae_dev->dev_specs.max_frm_size = HCLGE_MAC_MAX_FRAME;

	ae_dev->dev_specs.max_qset_num = HCLGE_MAX_QSET_NUM;

}



static void hclge_parse_dev_specs(struct hclge_dev *hdev,
@@ -1390,6 +1391,7 @@ static void hclge_parse_dev_specs(struct hclge_dev *hdev, 
	ae_dev->dev_specs.int_ql_max = le16_to_cpu(req0->int_ql_max);

	ae_dev->dev_specs.rss_key_size = le16_to_cpu(req0->rss_key_size);

	ae_dev->dev_specs.max_tm_rate = le32_to_cpu(req0->max_tm_rate);

	ae_dev->dev_specs.max_qset_num = le16_to_cpu(req1->max_qset_num);

	ae_dev->dev_specs.max_int_gl = le16_to_cpu(req1->max_int_gl);

	ae_dev->dev_specs.max_frm_size = le16_to_cpu(req1->max_frm_size);

}
@@ -1406,6 +1408,8 @@ static void hclge_check_dev_specs(struct hclge_dev *hdev) 
		dev_specs->rss_key_size = HCLGE_RSS_KEY_SIZE;

	if (!dev_specs->max_tm_rate)

		dev_specs->max_tm_rate = HCLGE_ETHER_MAX_RATE;

	if (!dev_specs->max_qset_num)

		dev_specs->max_qset_num = HCLGE_MAX_QSET_NUM;

	if (!dev_specs->max_int_gl)

		dev_specs->max_int_gl = HCLGE_DEF_MAX_INT_GL;

	if (!dev_specs->max_frm_size)