Commit 0199e639 authored by Tomer Tayar's avatar Tomer Tayar Committed by Ofir Bitton
Browse files

accel/habanalabs: move heartbeat work initialization to early init 



The device heartbeat work is currently initialized at
device_heartbeat_schedule() which is called at the end of
hl_device_init().
However hl_device_init() can fail at a previous step, and in such a
case, a subsequent call to hl_device_fini() will lead to calling
cleanup_resources() and accessing this work uninitialized.

As there is no real need to re-initialize this work every time it is
rescheduled, move this initialization to device_early_init() to be done
once and early enough.

Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOfir Bitton <obitton@habana.ai>
Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
parent 5cb97d74

drivers/accel/habanalabs/common/device.c

+4 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ enum dma_alloc_type { 


#define MEM_SCRUB_DEFAULT_VAL 0x1122334455667788



static void hl_device_heartbeat(struct work_struct *work);



/*

 * hl_set_dram_bar- sets the bar to allow later access to address

 *
@@ -963,6 +965,8 @@ static int device_early_init(struct hl_device *hdev) 
		goto free_cb_mgr;

	}



	INIT_DELAYED_WORK(&hdev->work_heartbeat, hl_device_heartbeat);



	INIT_DELAYED_WORK(&hdev->device_reset_work.reset_work, device_hard_reset_pending);

	hdev->device_reset_work.hdev = hdev;

	hdev->device_fini_pending = 0;
@@ -1604,8 +1608,6 @@ static inline void device_heartbeat_schedule(struct hl_device *hdev) 
	 */

	hdev->eq_heartbeat_received = true;



	INIT_DELAYED_WORK(&hdev->work_heartbeat, hl_device_heartbeat);



	schedule_delayed_work(&hdev->work_heartbeat,

			usecs_to_jiffies(HL_HEARTBEAT_PER_USEC));

}