net: hns3: synchronize some print relating to reset issue (8de91e92) · Commits · 戴 / test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2228,7 +2228,7 @@ static void hns3_reset_prepare(struct pci_dev *pdev)
		{
		struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);

		dev_info(&pdev->dev, "hns3 flr prepare\n");
		dev_info(&pdev->dev, "FLR prepare\n");
		if (ae_dev && ae_dev->ops && ae_dev->ops->flr_prepare)
		ae_dev->ops->flr_prepare(ae_dev);
		}
		@@ -2237,7 +2237,7 @@ static void hns3_reset_done(struct pci_dev *pdev)
		{
		struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);

		dev_info(&pdev->dev, "hns3 flr done\n");
		dev_info(&pdev->dev, "FLR done\n");
		if (ae_dev && ae_dev->ops && ae_dev->ops->flr_done)
		ae_dev->ops->flr_done(ae_dev);
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -3442,7 +3442,7 @@ static void hclge_do_reset(struct hclge_dev *hdev)
		u32 val;

		if (hclge_get_hw_reset_stat(handle)) {
		dev_info(&pdev->dev, "Hardware reset not finish\n");
		dev_info(&pdev->dev, "hardware reset not finish\n");
		dev_info(&pdev->dev, "func_rst_reg:0x%x, global_rst_reg:0x%x\n",
		hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING),
		hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG));
		@@ -3451,20 +3451,20 @@ static void hclge_do_reset(struct hclge_dev *hdev)

		switch (hdev->reset_type) {
		case HNAE3_GLOBAL_RESET:
		dev_info(&pdev->dev, "global reset requested\n");
		val = hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG);
		hnae3_set_bit(val, HCLGE_GLOBAL_RESET_BIT, 1);
		hclge_write_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG, val);
		dev_info(&pdev->dev, "Global Reset requested\n");
		break;
		case HNAE3_FUNC_RESET:
		dev_info(&pdev->dev, "PF Reset requested\n");
		dev_info(&pdev->dev, "PF reset requested\n");
		/* schedule again to check later */
		set_bit(HNAE3_FUNC_RESET, &hdev->reset_pending);
		hclge_reset_task_schedule(hdev);
		break;
		default:
		dev_warn(&pdev->dev,
		"Unsupported reset type: %d\n", hdev->reset_type);
		"unsupported reset type: %d\n", hdev->reset_type);
		break;
		}
		}