Skip to contentSkip to conversation

habanalabs: fix order of status check

PATCH New Oded Gabbay 1 participant 3 messages Dec 29, 2020 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 habanalabs: fix order of status check

When the device is in reset or needs to be reset, the disabled property is don't-care.

---
 drivers/misc/habanalabs/common/device.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/misc/habanalabs/common/device.c +3 -3
index 5871162a8442..0749c92cbcf6 100644
@@ -17,12 +17,12 @@ enum hl_device_status hl_device_status(struct hl_device *hdev)
 {
 	enum hl_device_status status;
 
-	if (hdev->disabled)
-		status = HL_DEVICE_STATUS_MALFUNCTION;
-	else if (atomic_read(&hdev->in_reset))
+	if (atomic_read(&hdev->in_reset))
 		status = HL_DEVICE_STATUS_IN_RESET;
 	else if (hdev->needs_reset)
 		status = HL_DEVICE_STATUS_NEEDS_RESET;
+	else if (hdev->disabled)
+		status = HL_DEVICE_STATUS_MALFUNCTION;
 	else
 		status = HL_DEVICE_STATUS_OPERATIONAL;
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 habanalabs/gaudi: retry loading TPC f/w on -EINTR

If loading the firmware file for the TPC f/w was interrupted, try to do it again, up to 5 times.

---
 drivers/misc/habanalabs/gaudi/gaudi.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +8 -2
index 88d0e4356d59..8c09e4466af8 100644
@@ -838,11 +838,17 @@ static int gaudi_init_tpc_mem(struct hl_device *hdev)
 	size_t fw_size;
 	void *cpu_addr;
 	dma_addr_t dma_handle;
-	int rc;
+	int rc, count = 5;
 
+again:
 	rc = request_firmware(&fw, GAUDI_TPC_FW_FILE, hdev->dev);
+	if (rc == -EINTR && count-- > 0) {
+		msleep(50);
+		goto again;
+	}
+
 	if (rc) {
-		dev_err(hdev->dev, "Firmware file %s is not found!\n",
+		dev_err(hdev->dev, "Failed to load firmware file %s\n",
 				GAUDI_TPC_FW_FILE);
 		goto out;
 	}
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 habanalabs: register to pci shutdown callback

In reply to Oded Gabbay

We need to make sure our device is idle when rebooting a virtual machine. This is done in the driver level.

The firmware will later handle FLR but we want to be extra safe and stop the devices until the FLR is handled.

---
 drivers/misc/habanalabs/common/habanalabs_drv.c | 1 +
 1 file changed, 1 insertion(+)
drivers/misc/habanalabs/common/habanalabs_drv.c +1 -0
index 6bbb6bca6860..032d114f01ea 100644
@@ -544,6 +544,7 @@ static struct pci_driver hl_pci_driver = {
 	.id_table = ids,
 	.probe = hl_pci_probe,
 	.remove = hl_pci_remove,
+	.shutdown = hl_pci_remove,
 	.driver.pm = &hl_pm_ops,
 	.err_handler = &hl_pci_err_handler,
 };
Signature · 1 line
2.25.1