From nobody Tue Jun 23 20:19:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B78CC433EF for ; Sun, 27 Feb 2022 09:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbiB0JpT (ORCPT ); Sun, 27 Feb 2022 04:45:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbiB0JpO (ORCPT ); Sun, 27 Feb 2022 04:45:14 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2876048337 for ; Sun, 27 Feb 2022 01:44:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id ADD3CB80B30 for ; Sun, 27 Feb 2022 09:44:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75CD5C340E9; Sun, 27 Feb 2022 09:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645955075; bh=731TwFGrPC+/K47am47K7HtWat2IngcxyfC/vUPVg2E=; h=From:To:Cc:Subject:Date:From; b=NDuKvBqXfmHOBtOJYjKP1hyGb2IJ/f5jWkvG4/uIVURULKYLBcmOtbXYhbfnK5+3H LqlsEO6vnuQIkao+xN9FtK1Q/rQzhJvXy6RgmA1pes38v9e0PuNtR9qq6jgc5s03me ABnmh3o3xROsO2XCYEzGi+MUHuUjYIqb4E6cQ6IY817kKe1hGnNAba4ru9GKxZkYJL 9bRnZazfjR5s/mgjCynqr0aLpKdMhAjWzLxjuS24+0KLC3QGGkEM9VgCy1ZpTsUGUv Li8ZZFUc6wcyXa7Ji3BAEyzpPRwA+143DFRIk1Efg1H4Z2/b2TMUX9m3UeWSF7+XqG ETYxfgJ7wdu4g== From: Oded Gabbay To: linux-kernel@vger.kernel.org Cc: Tomer Tayar Subject: [PATCH] habanalabs: add an option to delay a device reset Date: Sun, 27 Feb 2022 11:44:30 +0200 Message-Id: <20220227094430.1059796-1-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Tomer Tayar Several H/W events can be sent adjacently, even due to a single error. If a hard-reset is triggered as part of handling one of these events, the following events won't be handled. The debug info from these missed events is important, sometimes even more important than the one that was handled. To allow handling these close events, add an option to delay a device reset and use it when resetting due to H/W events. Signed-off-by: Tomer Tayar Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/device.c | 8 +++++++- drivers/misc/habanalabs/common/habanalabs.h | 4 ++++ drivers/misc/habanalabs/gaudi/gaudi.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanal= abs/common/device.c index d52381d1fbd2..651326cd22fb 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -13,6 +13,8 @@ #include #include =20 +#define HL_RESET_DELAY_USEC 10000 /* 10ms */ + enum hl_device_status hl_device_status(struct hl_device *hdev) { enum hl_device_status status; @@ -980,7 +982,7 @@ int hl_device_reset(struct hl_device *hdev, u32 flags) { bool hard_reset, from_hard_reset_thread, fw_reset, hard_instead_soft =3D = false, reset_upon_device_release =3D false, schedule_hard_reset =3D false, - skip_wq_flush =3D false; + skip_wq_flush, delay_reset; u64 idle_mask[HL_BUSY_ENGINES_MASK_EXT_SIZE] =3D {0}; struct hl_ctx *ctx; int i, rc; @@ -994,6 +996,7 @@ int hl_device_reset(struct hl_device *hdev, u32 flags) from_hard_reset_thread =3D !!(flags & HL_DRV_RESET_FROM_RESET_THR); fw_reset =3D !!(flags & HL_DRV_RESET_BYPASS_REQ_TO_FW); skip_wq_flush =3D !!(flags & HL_DRV_RESET_DEV_RELEASE); + delay_reset =3D !!(flags && HL_DRV_RESET_DELAY); =20 if (!hard_reset && !hdev->asic_prop.supports_soft_reset) { hard_instead_soft =3D true; @@ -1043,6 +1046,9 @@ int hl_device_reset(struct hl_device *hdev, u32 flags) hdev->reset_info.in_reset =3D 1; spin_unlock(&hdev->reset_info.lock); =20 + if (delay_reset) + usleep_range(HL_RESET_DELAY_USEC, HL_RESET_DELAY_USEC << 1); + handle_reset_trigger(hdev, flags); =20 /* This still allows the completion of some KDMA ops */ diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/hab= analabs/common/habanalabs.h index cef4717d0916..1edaf6ab67bd 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -142,6 +142,9 @@ enum hl_mmu_page_table_location { * * - HL_DRV_RESET_FW_FATAL_ERR * Set if reset is due to a fatal error from FW + * + * - HL_DRV_RESET_DELAY + * Set if a delay should be added before the reset */ =20 #define HL_DRV_RESET_HARD (1 << 0) @@ -151,6 +154,7 @@ enum hl_mmu_page_table_location { #define HL_DRV_RESET_DEV_RELEASE (1 << 4) #define HL_DRV_RESET_BYPASS_REQ_TO_FW (1 << 5) #define HL_DRV_RESET_FW_FATAL_ERR (1 << 6) +#define HL_DRV_RESET_DELAY (1 << 7) =20 #define HL_MAX_SOBS_PER_MONITOR 8 =20 diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalab= s/gaudi/gaudi.c index 0eed0efae040..21c2b678ff72 100644 --- a/drivers/misc/habanalabs/gaudi/gaudi.c +++ b/drivers/misc/habanalabs/gaudi/gaudi.c @@ -8199,7 +8199,7 @@ static void gaudi_handle_eqe(struct hl_device *hdev, | HL_DRV_RESET_BYPASS_REQ_TO_FW | fw_fatal_err_flag); else if (hdev->hard_reset_on_fw_events) - hl_device_reset(hdev, HL_DRV_RESET_HARD | fw_fatal_err_flag); + hl_device_reset(hdev, HL_DRV_RESET_HARD | HL_DRV_RESET_DELAY | fw_fatal_= err_flag); else hl_fw_unmask_irq(hdev, event_type); } --=20 2.25.1