diff options
| author | Tomer Tayar <ttayar@habana.ai> | 2024-05-13 14:40:35 +0300 |
|---|---|---|
| committer | Ofir Bitton <obitton@habana.ai> | 2024-06-23 09:53:33 +0300 |
| commit | 0199e6392e067299ece25863abd7453e4823f13b (patch) | |
| tree | bb3a1b63512865f5a0db2dbc39b7e4949d9a80ea /drivers/accel | |
| parent | 5cb97d74c3c7ad93750fc3f11875159500380d1c (diff) | |
| download | linux-stable-0199e6392e067299ece25863abd7453e4823f13b.tar.gz linux-stable-0199e6392e067299ece25863abd7453e4823f13b.tar.bz2 linux-stable-0199e6392e067299ece25863abd7453e4823f13b.zip | |
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: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Ofir Bitton <obitton@habana.ai>
Signed-off-by: Ofir Bitton <obitton@habana.ai>
Diffstat (limited to 'drivers/accel')
| -rw-r--r-- | drivers/accel/habanalabs/common/device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c index 050c278e5ddb..e0cf3b4343bb 100644 --- a/drivers/accel/habanalabs/common/device.c +++ b/drivers/accel/habanalabs/common/device.c @@ -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)); } |