Commit 8df8cb1e authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: enable device before hw_init() 



Device is now enabled before the hw_init() because part of the
initialization requires communication with the device firmware to get
information that is required for the initialization itself

Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Reviewed-by: default avatarTomer Tayar <ttayar@habana.ai>
parent a04b7cd9

drivers/misc/habanalabs/common/device.c

+12 −4
Original line number Diff line number Diff line
@@ -1033,6 +1033,12 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset, 
		}

	}



	/* Device is now enabled as part of the initialization requires

	 * communication with the device firmware to get information that

	 * is required for the initialization itself

	 */

	hdev->disabled = false;



	rc = hdev->asic_funcs->hw_init(hdev);

	if (rc) {

		dev_err(hdev->dev,
@@ -1040,8 +1046,6 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset, 
		goto out_err;

	}



	hdev->disabled = false;



	/* Check that the communication with the device is working */

	rc = hdev->asic_funcs->test_queues(hdev);

	if (rc) {
@@ -1261,6 +1265,12 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass) 
	 */

	add_cdev_sysfs_on_err = true;



	/* Device is now enabled as part of the initialization requires

	 * communication with the device firmware to get information that

	 * is required for the initialization itself

	 */

	hdev->disabled = false;



	rc = hdev->asic_funcs->hw_init(hdev);

	if (rc) {

		dev_err(hdev->dev, "failed to initialize the H/W\n");
@@ -1268,8 +1278,6 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass) 
		goto out_disabled;

	}



	hdev->disabled = false;



	/* Check that the communication with the device is working */

	rc = hdev->asic_funcs->test_queues(hdev);

	if (rc) {

drivers/misc/habanalabs/common/sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ static ssize_t eeprom_read_handler(struct file *filp, struct kobject *kobj, 
	char *data;

	int rc;



	if (hl_device_disabled_or_in_reset(hdev))

		return -ENODEV;



	if (!max_size)

		return -EINVAL;