Commit 3d77d0cb authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: dump some debug information when reset fail 



When reset fails, there is some information that will help for
finding out why does reset fail. and removes an unused
core_rst_cnt field in struct hclge_rst_stats.

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

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

+2 −3
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev) 
	}

}



static void hclge_dbg_dump_rst_info(struct hclge_dev *hdev)

void hclge_dbg_dump_rst_info(struct hclge_dev *hdev)

{

	dev_info(&hdev->pdev->dev, "PF reset count: %u\n",

		 hdev->rst_stats.pf_rst_cnt);
@@ -945,8 +945,6 @@ static void hclge_dbg_dump_rst_info(struct hclge_dev *hdev) 
		 hdev->rst_stats.hw_reset_done_cnt);

	dev_info(&hdev->pdev->dev, "reset count: %u\n",

		 hdev->rst_stats.reset_cnt);

	dev_info(&hdev->pdev->dev, "reset count: %u\n",

		 hdev->rst_stats.reset_cnt);

	dev_info(&hdev->pdev->dev, "reset fail count: %u\n",

		 hdev->rst_stats.reset_fail_cnt);

	dev_info(&hdev->pdev->dev, "vector0 interrupt enable status: 0x%x\n",
@@ -961,6 +959,7 @@ static void hclge_dbg_dump_rst_info(struct hclge_dev *hdev) 
		 hclge_read_dev(&hdev->hw, HCLGE_NIC_CSQ_DEPTH_REG));

	dev_info(&hdev->pdev->dev, "function reset status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING));

	dev_info(&hdev->pdev->dev, "hdev state: 0x%lx\n", hdev->state);

}



static void hclge_dbg_get_m7_stats_info(struct hclge_dev *hdev)

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

+3 −0
Original line number Diff line number Diff line
@@ -3669,6 +3669,9 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev) 
	hclge_reset_handshake(hdev, true);



	dev_err(&hdev->pdev->dev, "Reset fail!\n");



	hclge_dbg_dump_rst_info(hdev);



	return false;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ struct hclge_rst_stats { 
	u32 hw_reset_done_cnt;	/* the number of HW reset has completed */

	u32 pf_rst_cnt;		/* the number of PF reset */

	u32 flr_rst_cnt;	/* the number of FLR */

	u32 core_rst_cnt;	/* the number of CORE reset */

	u32 global_rst_cnt;	/* the number of GLOBAL */

	u32 imp_rst_cnt;	/* the number of IMP reset */

	u32 reset_cnt;		/* the number of reset */
@@ -1005,4 +1004,5 @@ int hclge_query_bd_num_cmd_send(struct hclge_dev *hdev, 
void hclge_report_hw_error(struct hclge_dev *hdev,

			   enum hnae3_hw_error_type type);

void hclge_inform_vf_promisc_info(struct hclge_vport *vport);

void hclge_dbg_dump_rst_info(struct hclge_dev *hdev);

#endif

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

+29 −0
Original line number Diff line number Diff line
@@ -1549,6 +1549,33 @@ static int hclgevf_reset_prepare_wait(struct hclgevf_dev *hdev) 
	return ret;

}



static void hclgevf_dump_rst_info(struct hclgevf_dev *hdev)

{

	dev_info(&hdev->pdev->dev, "VF function reset count: %u\n",

		 hdev->rst_stats.vf_func_rst_cnt);

	dev_info(&hdev->pdev->dev, "FLR reset count: %u\n",

		 hdev->rst_stats.flr_rst_cnt);

	dev_info(&hdev->pdev->dev, "VF reset count: %u\n",

		 hdev->rst_stats.vf_rst_cnt);

	dev_info(&hdev->pdev->dev, "reset done count: %u\n",

		 hdev->rst_stats.rst_done_cnt);

	dev_info(&hdev->pdev->dev, "HW reset done count: %u\n",

		 hdev->rst_stats.hw_rst_done_cnt);

	dev_info(&hdev->pdev->dev, "reset count: %u\n",

		 hdev->rst_stats.rst_cnt);

	dev_info(&hdev->pdev->dev, "reset fail count: %u\n",

		 hdev->rst_stats.rst_fail_cnt);

	dev_info(&hdev->pdev->dev, "vector0 interrupt enable status: 0x%x\n",

		 hclgevf_read_dev(&hdev->hw, HCLGEVF_MISC_VECTOR_REG_BASE));

	dev_info(&hdev->pdev->dev, "vector0 interrupt status: 0x%x\n",

		 hclgevf_read_dev(&hdev->hw, HCLGEVF_VECTOR0_CMDQ_STAT_REG));

	dev_info(&hdev->pdev->dev, "handshake status: 0x%x\n",

		 hclgevf_read_dev(&hdev->hw, HCLGEVF_CMDQ_TX_DEPTH_REG));

	dev_info(&hdev->pdev->dev, "function reset status: 0x%x\n",

		 hclgevf_read_dev(&hdev->hw, HCLGEVF_RST_ING));

	dev_info(&hdev->pdev->dev, "hdev state: 0x%lx\n", hdev->state);

}



static void hclgevf_reset_err_handle(struct hclgevf_dev *hdev)

{

	/* recover handshake status with IMP when reset fail */
@@ -1563,6 +1590,8 @@ static void hclgevf_reset_err_handle(struct hclgevf_dev *hdev) 
	if (hclgevf_is_reset_pending(hdev)) {

		set_bit(HCLGEVF_RESET_PENDING, &hdev->reset_state);

		hclgevf_reset_task_schedule(hdev);

	} else {

		hclgevf_dump_rst_info(hdev);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE