habanalabs: increase the size of busy engines mask

Increase the size of the busy engines mask in 'struct hl_info_hw_idle',
for future ASICs with more than 128 engines.

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 63d0cb7087e8d7c9ed15c4d3ed7fd580752498a8..f5864893237cc27f3d5eec528d66546aa9961660 100644 (file)
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -416,8 +416,9 @@ static void hpriv_release(struct kref *ref)
                device_is_idle = hdev->asic_funcs->is_device_idle(hdev, idle_mask,
                                                        HL_BUSY_ENGINES_MASK_EXT_SIZE, NULL);
        if (!device_is_idle) {
-               dev_err(hdev->dev, "device not idle after user context is closed (0x%llx_%llx)\n",
-                       idle_mask[1], idle_mask[0]);
+               dev_err(hdev->dev,
+                       "device not idle after user context is closed (0x%llx_%llx_%llx_%llx)\n",
+                       idle_mask[3], idle_mask[2], idle_mask[1], idle_mask[0]);
                reset_device = true;
        }
 
@@ -1661,8 +1662,8 @@ kill_processes:
        /* If device is not idle fail the reset process */
        if (!hdev->asic_funcs->is_device_idle(hdev, idle_mask,
                        HL_BUSY_ENGINES_MASK_EXT_SIZE, NULL)) {
-               dev_err(hdev->dev, "device is not idle (mask 0x%llx_%llx) after reset\n",
-                       idle_mask[1], idle_mask[0]);
+               dev_err(hdev->dev, "device is not idle (mask 0x%llx_%llx_%llx_%llx) after reset\n",
+                       idle_mask[3], idle_mask[2], idle_mask[1], idle_mask[0]);
                rc = -EIO;
                goto out_err;
        }

diff --git a/include/uapi/misc/habanalabs.h b/include/uapi/misc/habanalabs.h
index e50cb71df081c3af889c42e07370fa8be8b9170a..3b995e841eb8576afbfc57276b0904c650397fb1 100644 (file)
--- a/include/uapi/misc/habanalabs.h
+++ b/include/uapi/misc/habanalabs.h
@@ -916,7 +916,7 @@ struct hl_info_dram_usage {
        __u64 ctx_dram_mem;
 };
 
-#define HL_BUSY_ENGINES_MASK_EXT_SIZE  2
+#define HL_BUSY_ENGINES_MASK_EXT_SIZE  4
 
 struct hl_info_hw_idle {
        __u32 is_idle;