habanalabs: make print of engines idle mask more readable

The engines idle mask was increased to be an array of 4 u64 entries.
To make the print of this mask more readable, remove the "0x" prefix,
and zero-pad each u64 to 16 bytes if either it isn't zero or if any of
the higher-order u64's is not zero.

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 926f230def56bcbeb53a842750dfc8a89ef82cdc..87ab329e65d49dd5fbb8ae03bfed1c695546a702 100644 (file)
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -386,6 +386,23 @@ bool hl_ctrl_device_operational(struct hl_device *hdev,
        }
 }
 
+static void print_idle_status_mask(struct hl_device *hdev, const char *message,
+                                       u64 idle_mask[HL_BUSY_ENGINES_MASK_EXT_SIZE])
+{
+       u32 pad_width[HL_BUSY_ENGINES_MASK_EXT_SIZE] = {};
+
+       BUILD_BUG_ON(HL_BUSY_ENGINES_MASK_EXT_SIZE != 4);
+
+       pad_width[3] = idle_mask[3] ? 16 : 0;
+       pad_width[2] = idle_mask[2] || pad_width[3] ? 16 : 0;
+       pad_width[1] = idle_mask[1] || pad_width[2] ? 16 : 0;
+       pad_width[0] = idle_mask[0] || pad_width[1] ? 16 : 0;
+
+       dev_err(hdev->dev, "%s (mask %0*llx_%0*llx_%0*llx_%0*llx)\n",
+               message, pad_width[3], idle_mask[3], pad_width[2], idle_mask[2],
+               pad_width[1], idle_mask[1], pad_width[0], idle_mask[0]);
+}
+
 static void hpriv_release(struct kref *ref)
 {
        u64 idle_mask[HL_BUSY_ENGINES_MASK_EXT_SIZE] = {0};
@@ -416,9 +433,8 @@ 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_%llx_%llx)\n",
-                       idle_mask[3], idle_mask[2], idle_mask[1], idle_mask[0]);
+               print_idle_status_mask(hdev, "device is not idle after user context is closed",
+                                       idle_mask);
                reset_device = true;
        }
 
@@ -1673,9 +1689,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_%llx_%llx) after reset\n",
-                       idle_mask[3], idle_mask[2], idle_mask[1], idle_mask[0]);
+                                               HL_BUSY_ENGINES_MASK_EXT_SIZE, NULL)) {
+               print_idle_status_mask(hdev, "device is not idle after reset", idle_mask);
                rc = -EIO;
                goto out_err;
        }