From: Moti Haimovski <mhaimovski@habana.ai>

Date: Thu, 29 Dec 2022 12:44:09 +0200

Subject: [PATCH] habanalabs: extend fatal messages to contain PCI info

References: bsc#1012628

Patch-mainline: 6.2.3

Git-commit: 2a0a839b6a28f7c4c528bb75b740c7f38ef79a37

[ Upstream commit 2a0a839b6a28f7c4c528bb75b740c7f38ef79a37 ]

This commit attaches the PCI device address to driver fatal messages

in order to ease debugging in multi-device setups.

Signed-off-by: Moti Haimovski <mhaimovski@habana.ai>

Reviewed-by: Oded Gabbay <ogabbay@kernel.org>

Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/misc/habanalabs/common/device.c | 38 ++++++++++++++++---------

 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c

index 87ab329e..f7b9c387 100644

--- a/drivers/misc/habanalabs/common/device.c

+++ b/drivers/misc/habanalabs/common/device.c

@@ -1566,7 +1566,8 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)

 		if (rc == -EBUSY) {

 			if (hdev->device_fini_pending) {

 				dev_crit(hdev->dev,

-					"Failed to kill all open processes, stopping hard reset\n");

+					"%s Failed to kill all open processes, stopping hard reset\n",

+					dev_name(&(hdev)->pdev->dev));

 				goto out_err;

 			}

@@ -1576,7 +1577,8 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)

 		if (rc) {

 			dev_crit(hdev->dev,

-				"Failed to kill all open processes, stopping hard reset\n");

+				"%s Failed to kill all open processes, stopping hard reset\n",

+				dev_name(&(hdev)->pdev->dev));

 			goto out_err;

 		}

@@ -1627,14 +1629,16 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)

 			 * ensure driver puts the driver in a unusable state

 			 */

 			dev_crit(hdev->dev,

-				"Consecutive FW fatal errors received, stopping hard reset\n");

+				"%s Consecutive FW fatal errors received, stopping hard reset\n",

+				dev_name(&(hdev)->pdev->dev));

 			rc = -EIO;

 			goto out_err;

 		}

 		if (hdev->kernel_ctx) {

 			dev_crit(hdev->dev,

-				"kernel ctx was alive during hard reset, something is terribly wrong\n");

+				"%s kernel ctx was alive during hard reset, something is terribly wrong\n",

+				dev_name(&(hdev)->pdev->dev));

 			rc = -EBUSY;

 			goto out_err;

 		}

@@ -1752,9 +1756,13 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)

 	hdev->reset_info.needs_reset = false;

 	if (hard_reset)

-		dev_info(hdev->dev, "Successfully finished resetting the device\n");

+		dev_info(hdev->dev,

+			 "Successfully finished resetting the %s device\n",

+			 dev_name(&(hdev)->pdev->dev));

 	else

-		dev_dbg(hdev->dev, "Successfully finished resetting the device\n");

+		dev_dbg(hdev->dev,

+			"Successfully finished resetting the %s device\n",

+			dev_name(&(hdev)->pdev->dev));

 	if (hard_reset) {

 		hdev->reset_info.hard_reset_cnt++;

@@ -1789,7 +1797,9 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)

 	hdev->reset_info.in_compute_reset = 0;

 	if (hard_reset) {

-		dev_err(hdev->dev, "Failed to reset! Device is NOT usable\n");

+		dev_err(hdev->dev,

+			"%s Failed to reset! Device is NOT usable\n",

+			dev_name(&(hdev)->pdev->dev));

 		hdev->reset_info.hard_reset_cnt++;

 	} else if (reset_upon_device_release) {

 		spin_unlock(&hdev->reset_info.lock);

@@ -2186,7 +2196,8 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)

 	}

 	dev_notice(hdev->dev,

-		"Successfully added device to habanalabs driver\n");

+		"Successfully added device %s to habanalabs driver\n",

+		dev_name(&(hdev)->pdev->dev));

 	hdev->init_done = true;

@@ -2235,11 +2246,11 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)

 		device_cdev_sysfs_add(hdev);

 	if (hdev->pdev)

 		dev_err(&hdev->pdev->dev,

-			"Failed to initialize hl%d. Device is NOT usable !\n",

-			hdev->cdev_idx);

+			"Failed to initialize hl%d. Device %s is NOT usable !\n",

+			hdev->cdev_idx, dev_name(&(hdev)->pdev->dev));

 	else

-		pr_err("Failed to initialize hl%d. Device is NOT usable !\n",

-			hdev->cdev_idx);

+		pr_err("Failed to initialize hl%d. Device %s is NOT usable !\n",

+			hdev->cdev_idx, dev_name(&(hdev)->pdev->dev));

 	return rc;

 }

@@ -2295,7 +2306,8 @@ void hl_device_fini(struct hl_device *hdev)

 		if (ktime_compare(ktime_get(), timeout) > 0) {

 			dev_crit(hdev->dev,

-				"Failed to remove device because reset function did not finish\n");

+				"%s Failed to remove device because reset function did not finish\n",

+				dev_name(&(hdev)->pdev->dev));

 			return;

 		}

 	}

-- 

2.35.3