habanalabs: pass reset flags to reset thread

The reset flags used by the reset thread are currently a mix of
hard-coded values and a specific flag which is passed from the context
that initiates the reset.
To make it easier to pass more flags in future from this context to the
reset thread, modify it to pass all the original reset flags to the
thread.

Signed-off-by: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c
index 720eea0b7e9c7193612d54ae3b5971e6505a80c2..db4168f35c185305e7ba65027afa88fcc07a1266 100644 (file)
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -324,16 +324,12 @@ put_devices:
 static void device_hard_reset_pending(struct work_struct *work)
 {
        struct hl_device_reset_work *device_reset_work =
-               container_of(work, struct hl_device_reset_work,
-                               reset_work.work);
+               container_of(work, struct hl_device_reset_work, reset_work.work);
        struct hl_device *hdev = device_reset_work->hdev;
        u32 flags;
        int rc;
 
-       flags = HL_DRV_RESET_HARD | HL_DRV_RESET_FROM_RESET_THR;
-
-       if (device_reset_work->fw_reset)
-               flags |= HL_DRV_RESET_BYPASS_REQ_TO_FW;
+       flags = device_reset_work->flags | HL_DRV_RESET_FROM_RESET_THR;
 
        rc = hl_device_reset(hdev, flags);
        if ((rc == -EBUSY) && !hdev->device_fini_pending) {
@@ -1040,7 +1036,7 @@ again:
 
                hdev->process_kill_trial_cnt = 0;
 
-               hdev->device_reset_work.fw_reset = fw_reset;
+               hdev->device_reset_work.flags = flags;
 
                /*
                 * Because the reset function can't run from heartbeat work,

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index 93d0a85265bea6b6a602e9b7a0cd319509906a63..722fc8e69fd6fde74d5368bc7fba64295525027a 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -2214,13 +2214,13 @@ struct hwmon_chip_info;
  * @wq: work queue for device reset procedure.
  * @reset_work: reset work to be done.
  * @hdev: habanalabs device structure.
- * @fw_reset: whether f/w will do the reset without us sending them a message to do it.
+ * @flags: reset flags.
  */
 struct hl_device_reset_work {
        struct workqueue_struct         *wq;
        struct delayed_work             reset_work;
        struct hl_device                *hdev;
-       bool                            fw_reset;
+       u32                             flags;
 };
 
 /**