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

net: hns3: debugfs add dump dscp map info 



This patch add dump the map relation for dscp, priority and TC, and
the current tc map mode.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ enum hnae3_dbg_cmd { 
	HNAE3_DBG_CMD_TC_SCH_INFO,

	HNAE3_DBG_CMD_QOS_PAUSE_CFG,

	HNAE3_DBG_CMD_QOS_PRI_MAP,

	HNAE3_DBG_CMD_QOS_DSCP_MAP,

	HNAE3_DBG_CMD_QOS_BUF_CFG,

	HNAE3_DBG_CMD_DEV_INFO,

	HNAE3_DBG_CMD_TX_BD,

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

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "qos_dscp_map",

		.cmd = HNAE3_DBG_CMD_QOS_DSCP_MAP,

		.dentry = HNS3_DBG_DENTRY_TM,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "qos_buf_cfg",

		.cmd = HNAE3_DBG_CMD_QOS_BUF_CFG,

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

+59 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ static const char * const hclge_mac_state_str[] = { 
	"TO_ADD", "TO_DEL", "ACTIVE"

};



static const char * const tc_map_mode_str[] = { "PRIO", "DSCP" };



static const struct hclge_dbg_reg_type_info hclge_dbg_reg_info[] = {

	{ .cmd = HNAE3_DBG_CMD_REG_BIOS_COMMON,

	  .dfx_msg = &hclge_dbg_bios_common_reg[0],
@@ -1115,10 +1117,11 @@ static int hclge_dbg_dump_qos_pause_cfg(struct hclge_dev *hdev, char *buf, 
	return 0;

}



#define HCLGE_DBG_TC_MASK		0x0F



static int hclge_dbg_dump_qos_pri_map(struct hclge_dev *hdev, char *buf,

				      int len)

{

#define HCLGE_DBG_TC_MASK		0x0F

#define HCLGE_DBG_TC_BIT_WIDTH		4



	struct hclge_qos_pri_map_cmd *pri_map;
@@ -1152,6 +1155,57 @@ static int hclge_dbg_dump_qos_pri_map(struct hclge_dev *hdev, char *buf, 
	return 0;

}



static int hclge_dbg_dump_qos_dscp_map(struct hclge_dev *hdev, char *buf,

				       int len)

{

	struct hclge_desc desc[HCLGE_DSCP_MAP_TC_BD_NUM];

	u8 *req0 = (u8 *)desc[0].data;

	u8 *req1 = (u8 *)desc[1].data;

	u8 dscp_tc[HCLGE_MAX_DSCP];

	int pos, ret;

	u8 i, j;



	pos = scnprintf(buf, len, "tc map mode: %s\n",

			tc_map_mode_str[hdev->vport[0].nic.kinfo.tc_map_mode]);



	if (hdev->vport[0].nic.kinfo.tc_map_mode != HNAE3_TC_MAP_MODE_DSCP)

		return 0;



	hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_QOS_MAP, true);

	desc[0].flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_NEXT);

	hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_QOS_MAP, true);

	ret = hclge_cmd_send(&hdev->hw, desc, HCLGE_DSCP_MAP_TC_BD_NUM);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump qos dscp map, ret = %d\n", ret);

		return ret;

	}



	pos += scnprintf(buf + pos, len - pos, "\nDSCP  PRIO  TC\n");



	/* The low 32 dscp setting use bd0, high 32 dscp setting use bd1 */

	for (i = 0; i < HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; i++) {

		j = i + HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM;

		/* Each dscp setting has 4 bits, so each byte saves two dscp

		 * setting

		 */

		dscp_tc[i] = req0[i >> 1] >> HCLGE_DSCP_TC_SHIFT(i);

		dscp_tc[j] = req1[i >> 1] >> HCLGE_DSCP_TC_SHIFT(i);

		dscp_tc[i] &= HCLGE_DBG_TC_MASK;

		dscp_tc[j] &= HCLGE_DBG_TC_MASK;

	}



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

		if (hdev->tm_info.dscp_prio[i] == HCLGE_PRIO_ID_INVALID)

			continue;



		pos += scnprintf(buf + pos, len - pos, " %2u    %u    %u\n",

				 i, hdev->tm_info.dscp_prio[i], dscp_tc[i]);

	}



	return 0;

}



static int hclge_dbg_dump_tx_buf_cfg(struct hclge_dev *hdev, char *buf, int len)

{

	struct hclge_tx_buff_alloc_cmd *tx_buf_cmd;
@@ -2376,6 +2430,10 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = { 
		.cmd = HNAE3_DBG_CMD_QOS_PRI_MAP,

		.dbg_dump = hclge_dbg_dump_qos_pri_map,

	},

	{

		.cmd = HNAE3_DBG_CMD_QOS_DSCP_MAP,

		.dbg_dump = hclge_dbg_dump_qos_dscp_map,

	},

	{

		.cmd = HNAE3_DBG_CMD_QOS_BUF_CFG,

		.dbg_dump = hclge_dbg_dump_qos_buf_cfg,