Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

habanalabs: abort reset on invalid request

Browse Source 
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>
This commit is contained in:
Oded Gabbay 2021-11-15 17:13:37 +02:00
parent a1b838adb0
commit ab440d3e39
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/misc/habanalabs/common/device.c
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright 2016-2019 HabanaLabs, Ltd. * Copyright 2016-2021 HabanaLabs, Ltd.
* All Rights Reserved. * 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) 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; 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; int i, rc;
if (!hdev->init_done) { if (!hdev->init_done) {
@ -1039,11 +1039,13 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)
hard_reset = true; hard_reset = true;
} }
if (hdev->reset_upon_device_release && if (hdev->reset_upon_device_release && (flags & HL_DRV_RESET_DEV_RELEASE)) {
(flags & HL_DRV_RESET_DEV_RELEASE)) { if (hard_reset) {
dev_dbg(hdev->dev, dev_crit(hdev->dev,
"Perform %s-reset upon device release\n", "Aborting reset because hard-reset is mutually exclusive with reset-on-device-release\n");
hard_reset ? "hard" : "soft"); return -EINVAL;
}
goto do_reset; goto do_reset;
} }