diff options
| author | Oded Gabbay <ogabbay@kernel.org> | 2021-11-15 17:13:37 +0200 |
|---|---|---|
| committer | Oded Gabbay <ogabbay@kernel.org> | 2021-12-26 08:59:06 +0200 |
| commit | ab440d3e39f61018b1f4c1c6bed6ab037f69a82e (patch) | |
| tree | 2e9378c38981b5ea9a8cd47189cacd7c11d162d8 /drivers/misc | |
| parent | a1b838adb080ee4320f257a8280821e47bfb9a1f (diff) | |
| download | linux-ab440d3e39f61018b1f4c1c6bed6ab037f69a82e.tar.gz linux-ab440d3e39f61018b1f4c1c6bed6ab037f69a82e.tar.xz | |
habanalabs: abort reset on invalid request
Hard-reset is mutually exclusive with reset-on-device-release.
Therefore, if such a request arrives to the reset function, abort
the reset and return an error to the callee.
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/habanalabs/common/device.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c index ca74d7815a67..a3d5617da64c 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright 2016-2019 HabanaLabs, Ltd. + * Copyright 2016-2021 HabanaLabs, Ltd. * All Rights Reserved. */ @@ -1020,8 +1020,8 @@ static void handle_reset_trigger(struct hl_device *hdev, u32 flags) */ int hl_device_reset(struct hl_device *hdev, u32 flags) { - u64 idle_mask[HL_BUSY_ENGINES_MASK_EXT_SIZE] = {0}; bool hard_reset, from_hard_reset_thread, fw_reset, hard_instead_soft = false; + u64 idle_mask[HL_BUSY_ENGINES_MASK_EXT_SIZE] = {0}; int i, rc; if (!hdev->init_done) { @@ -1039,11 +1039,13 @@ int hl_device_reset(struct hl_device *hdev, u32 flags) hard_reset = true; } - if (hdev->reset_upon_device_release && - (flags & HL_DRV_RESET_DEV_RELEASE)) { - dev_dbg(hdev->dev, - "Perform %s-reset upon device release\n", - hard_reset ? "hard" : "soft"); + if (hdev->reset_upon_device_release && (flags & HL_DRV_RESET_DEV_RELEASE)) { + if (hard_reset) { + dev_crit(hdev->dev, + "Aborting reset because hard-reset is mutually exclusive with reset-on-device-release\n"); + return -EINVAL; + } + goto do_reset; } |