Commit ed5b255b authored by Yufeng Mo's avatar Yufeng Mo Committed by David S. Miller
Browse files

net: hns3: optimize some log printings 



To better identify abnormal conditions, this patch modifies or
adds some logs to show driver status more accurately.

Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarZhongzhu Liu <liuzhongzhu@huawei.com>
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 70a21490

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

+13 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int hns3_dbg_queue_info(struct hnae3_handle *h, 


	if (queue_num >= h->kinfo.num_tqps) {

		dev_err(&h->pdev->dev,

			"Queue number(%u) is out of range(%u)\n", queue_num,

			"Queue number(%u) is out of range(0-%u)\n", queue_num,

			h->kinfo.num_tqps - 1);

		return -EINVAL;

	}
@@ -177,7 +177,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	}



	if (q_num >= h->kinfo.num_tqps) {

		dev_err(dev, "Queue number(%u) is out of range(%u)\n", q_num,

		dev_err(dev, "Queue number(%u) is out of range(0-%u)\n", q_num,

			h->kinfo.num_tqps - 1);

		return -EINVAL;

	}
@@ -188,7 +188,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	tx_index = (cnt == 1) ? value : tx_index;



	if (tx_index >= ring->desc_num) {

		dev_err(dev, "bd index (%u) is out of range(%u)\n", tx_index,

		dev_err(dev, "bd index(%u) is out of range(0-%u)\n", tx_index,

			ring->desc_num - 1);

		return -EINVAL;

	}
@@ -219,6 +219,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 


	dev_info(dev, "RX Queue Num: %u, BD Index: %u\n", q_num, rx_index);

	dev_info(dev, "(RX)addr: 0x%llx\n", rx_desc->addr);

	dev_info(dev, "(RX)l234_info: %u\n", rx_desc->rx.l234_info);

	dev_info(dev, "(RX)pkt_len: %u\n", rx_desc->rx.pkt_len);

	dev_info(dev, "(RX)size: %u\n", rx_desc->rx.size);

	dev_info(dev, "(RX)rss_hash: %u\n", rx_desc->rx.rss_hash);
@@ -238,16 +239,16 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	char printf_buf[HNS3_DBG_BUF_LEN];



	dev_info(&h->pdev->dev, "available commands\n");

	dev_info(&h->pdev->dev, "queue info [number]\n");

	dev_info(&h->pdev->dev, "queue info <number>\n");

	dev_info(&h->pdev->dev, "queue map\n");

	dev_info(&h->pdev->dev, "bd info [q_num] <bd index>\n");

	dev_info(&h->pdev->dev, "bd info <q_num> <bd index>\n");



	if (!hns3_is_phys_func(h->pdev))

		return;



	dev_info(&h->pdev->dev, "dump fd tcam\n");

	dev_info(&h->pdev->dev, "dump tc\n");

	dev_info(&h->pdev->dev, "dump tm map [q_num]\n");

	dev_info(&h->pdev->dev, "dump tm map <q_num>\n");

	dev_info(&h->pdev->dev, "dump tm\n");

	dev_info(&h->pdev->dev, "dump qos pause cfg\n");

	dev_info(&h->pdev->dev, "dump qos pri map\n");
@@ -259,20 +260,20 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	dev_info(&h->pdev->dev, "dump mac tnl status\n");



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg [[bios common] [ssu <prt_id>]",

	strncat(printf_buf, "dump reg [[bios common] [ssu <port_id>]",

		HNS3_DBG_BUF_LEN - 1);

	strncat(printf_buf + strlen(printf_buf),

		" [igu egu <prt_id>] [rpu <tc_queue_num>]",

		" [igu egu <port_id>] [rpu <tc_queue_num>]",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	strncat(printf_buf + strlen(printf_buf),

		" [rtc] [ppp] [rcb] [tqp <q_num>]]\n",

		" [rtc] [ppp] [rcb] [tqp <queue_num>]]\n",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	dev_info(&h->pdev->dev, "%s", printf_buf);



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg dcb [port_id] [pri_id] [pg_id]",

	strncat(printf_buf, "dump reg dcb <port_id> <pri_id> <pg_id>",

		HNS3_DBG_BUF_LEN - 1);

	strncat(printf_buf + strlen(printf_buf), " [rq_id] [nq_id] [qset_id]\n",

	strncat(printf_buf + strlen(printf_buf), " <rq_id> <nq_id> <qset_id>\n",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	dev_info(&h->pdev->dev, "%s", printf_buf);

}

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

+16 −16
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int hclge_dbg_get_dfx_bd_num(struct hclge_dev *hdev, int offset) 
	ret = hclge_query_bd_num_cmd_send(hdev, desc);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"get dfx bdnum fail, status is %d.\n", ret);

			"get dfx bdnum fail, ret = %d\n", ret);

		return ret;

	}
@@ -110,12 +110,9 @@ static int hclge_dbg_cmd_send(struct hclge_dev *hdev, 
	}



	ret = hclge_cmd_send(&hdev->hw, desc_src, bd_num);

	if (ret) {

	if (ret)

		dev_err(&hdev->pdev->dev,

			"read reg cmd send fail, status is %d.\n", ret);

		return ret;

	}



			"cmd(0x%x) send fail, ret = %d\n", cmd, ret);

	return ret;

}
@@ -142,8 +139,11 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, 
	}



	bd_num = hclge_dbg_get_dfx_bd_num(hdev, reg_msg->offset);

	if (bd_num <= 0)

	if (bd_num <= 0) {

		dev_err(&hdev->pdev->dev, "get cmd(%d) bd num(%d) failed\n",

			reg_msg->offset, bd_num);

		return;

	}



	buf_len	 = sizeof(struct hclge_desc) * bd_num;

	desc_src = kzalloc(buf_len, GFP_KERNEL);
@@ -331,7 +331,7 @@ static void hclge_dbg_dump_tc(struct hclge_dev *hdev) 


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

	if (ret) {

		dev_err(&hdev->pdev->dev, "dump tc fail, status is %d.\n", ret);

		dev_err(&hdev->pdev->dev, "dump tc fail, ret = %d\n", ret);

		return;

	}
@@ -433,7 +433,7 @@ static void hclge_dbg_dump_tm_pg(struct hclge_dev *hdev) 
	return;



err_tm_pg_cmd_send:

	dev_err(&hdev->pdev->dev, "dump tm_pg fail(0x%x), status is %d\n",

	dev_err(&hdev->pdev->dev, "dump tm_pg fail(0x%x), ret = %d\n",

		cmd, ret);

}
@@ -545,7 +545,7 @@ static void hclge_dbg_dump_tm(struct hclge_dev *hdev) 
	return;



err_tm_cmd_send:

	dev_err(&hdev->pdev->dev, "dump tm fail(0x%x), status is %d\n",

	dev_err(&hdev->pdev->dev, "dump tm fail(0x%x), ret = %d\n",

		cmd, ret);

}
@@ -634,7 +634,7 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev, 
	return;



err_tm_map_cmd_send:

	dev_err(&hdev->pdev->dev, "dump tqp map fail(0x%x), status is %d\n",

	dev_err(&hdev->pdev->dev, "dump tqp map fail(0x%x), ret = %d\n",

		cmd, ret);

}
@@ -648,7 +648,7 @@ static void hclge_dbg_dump_qos_pause_cfg(struct hclge_dev *hdev) 


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

	if (ret) {

		dev_err(&hdev->pdev->dev, "dump checksum fail, status is %d.\n",

		dev_err(&hdev->pdev->dev, "dump checksum fail, ret = %d\n",

			ret);

		return;

	}
@@ -672,7 +672,7 @@ static void hclge_dbg_dump_qos_pri_map(struct hclge_dev *hdev) 
	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"dump qos pri map fail, status is %d.\n", ret);

			"dump qos pri map fail, ret = %d\n", ret);

		return;

	}
@@ -805,7 +805,7 @@ static void hclge_dbg_dump_qos_buf_cfg(struct hclge_dev *hdev) 


err_qos_cmd_send:

	dev_err(&hdev->pdev->dev,

		"dump qos buf cfg fail(0x%x), status is %d\n", cmd, ret);

		"dump qos buf cfg fail(0x%x), ret = %d\n", cmd, ret);

}



static void hclge_dbg_dump_mng_table(struct hclge_dev *hdev)

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

+1 −1
Original line number Diff line number Diff line
@@ -7237,7 +7237,7 @@ static int hclge_set_mac_addr(struct hnae3_handle *handle, void *p, 
	    is_broadcast_ether_addr(new_addr) ||

	    is_multicast_ether_addr(new_addr)) {

		dev_err(&hdev->pdev->dev,

			"Change uc mac err! invalid mac:%p.\n",

			"Change uc mac err! invalid mac:%pM.\n",

			 new_addr);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE