From patchwork Tue Jan 2 15:06:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 184386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4499839dyb; Tue, 2 Jan 2024 07:08:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJFjYcV0IdFBkR2lAmyzwSX8IaOWM5dLnKoej5dkXD2QTgEes47f+EfnncsuicqAY2s7Eh X-Received: by 2002:a05:6870:3929:b0:203:6297:b554 with SMTP id b41-20020a056870392900b002036297b554mr17170465oap.111.1704208125995; Tue, 02 Jan 2024 07:08:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704208125; cv=none; d=google.com; s=arc-20160816; b=vOziftnzRNDcFqHfB7eDjplb06B0lmhEY4fg8ZHnzRzHhcbzmPLlEqwDSJqrYGgTrm GbwfiIqHc/7AiFTuYC1GrSsAijHJB9Ddrrgj1SOTmY2nOZNwr+tRuTR6fDmu8bXGQag+ 1eH/yAsAePlF4k7n2revipJUV6HGwFyuYmzKZxnMRMNrfpqrAetxiaHrZg74PuXTMRNU Q775n360SUK7+3S++DDGChEAyQjOlnUUXyvVr3lXg/OqUA6zBZM7n3DwG2G4OQPK1N4P mfUxzWGHr4+RKg0xjTH4Qf3mu9760lN5qvAZfnJcen9NqFfvU/IF/WmewLNmIgcifxUa U8YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=KnjyZ8tLmXwFVZkLvKYIRzeuewg9lZUFf8BqUVY7Q7I=; fh=PceJZ/KGF6ujSpGwn68DXpj5qiXzqwvBM4Q702GUgLM=; b=sRkofD5TiwAJv03bzhuinZl4meqCCqBHbZwpAIloSlUk78BDqA7e2rFosxMYCNRX/C eEZREoWnKb52b1hxcEhZGW1Hqmb+ViGpxW1IQU797HBl/nYikyJgqGPMrbNQHGaCRBcq p/ZQpAQiFCH4mle6SJL3Y0RUxFhafoegEObOQaKpnjlnWf4lRwAibZ+8OgWTSKx3J7cH 3abdn4eex9cw7TZ641hKn/hlf2Ps3lBMn487IMEg7G+fWMRw12LcJqUtqcOUzY50sVqv RyKEr/7+nNBCQf4ir7OHXbVJygsA2iFdPmQxmNWDOY1OHqbRLEBiWM3PsTdcvOEz84t6 PwnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KP1U0QKO; spf=pass (google.com: domain of linux-kernel+bounces-14532-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14532-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w2-20020a1f6202000000b004b71865ad31si3237791vkb.130.2024.01.02.07.08.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 07:08:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14532-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KP1U0QKO; spf=pass (google.com: domain of linux-kernel+bounces-14532-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14532-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B17CF1C223FF for ; Tue, 2 Jan 2024 15:08:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0ADC2156EE; Tue, 2 Jan 2024 15:07:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KP1U0QKO" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A080156C4 for ; Tue, 2 Jan 2024 15:07:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38FA2C433C9; Tue, 2 Jan 2024 15:07:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704208029; bh=8W1aookR1BcvR/0gXIR7y7VRCd9tBn4MkxLxXyNZgJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KP1U0QKObEFiNMkX3FGzm2UxsHn/uU05/ePalYvzSZ7YucStUmiOsGh7gw8A03mp+ i4Y2X9Qto03hggabk2/UiA0RgME3yeAcVm8wnGRpcPz+kpBEubtP6tqdcaQunpbgZx V1KYlAZPDom3hrgQgvUPfa693RmUuKE5fYXtUcY1F4AdaW5axCtiIq/F5g3wsoHgaB H1GoMJglQ2SRVUSKU+7g5w5NvKJIPu0il6f6Qeg5t6LWLY8OFlK3ucyG2jUJDyArZ/ c2aKJR7qN5RdpwYyA/dIDawiXjPKgOBui7Pff4DxBMXS4fraILosRSV2jPzIitf/E5 SoOWo5BeBfa7w== From: Oded Gabbay To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Tomer Tayar Subject: [PATCH 6/6] accel/habanalabs: abort device reset for consecutive heartbeat failures Date: Tue, 2 Jan 2024 17:06:54 +0200 Message-Id: <20240102150654.522555-6-ogabbay@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240102150654.522555-1-ogabbay@kernel.org> References: <20240102150654.522555-1-ogabbay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786991739877889866 X-GMAIL-MSGID: 1786991739877889866 From: Tomer Tayar The mechanism of aborting device reset for consecutive fatal errors is currently only for fatal errors that are reported by FW. A non-responsive FW and consecutive heartbeat failures is also considered fatal, so add them as well to this mechanism to avoid recurring device reset in such a case. Signed-off-by: Tomer Tayar Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/accel/habanalabs/common/device.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c index 15891de6cf39..581fc99ad89b 100644 --- a/drivers/accel/habanalabs/common/device.c +++ b/drivers/accel/habanalabs/common/device.c @@ -1769,14 +1769,16 @@ int hl_device_reset(struct hl_device *hdev, u32 flags) hdev->device_cpu_disabled = false; hdev->reset_info.hard_reset_pending = false; + /* + * Put the device in an unusable state if there are 2 back to back resets due to + * fatal errors. + */ if (hdev->reset_info.reset_trigger_repeated && - (hdev->reset_info.prev_reset_trigger == - HL_DRV_RESET_FW_FATAL_ERR)) { - /* if there 2 back to back resets from FW, - * ensure driver puts the driver in a unusable state - */ + (hdev->reset_info.prev_reset_trigger == HL_DRV_RESET_FW_FATAL_ERR || + hdev->reset_info.prev_reset_trigger == + HL_DRV_RESET_HEARTBEAT)) { dev_crit(hdev->dev, - "%s Consecutive FW fatal errors received, stopping hard reset\n", + "%s Consecutive fatal errors, stopping hard reset\n", dev_name(&(hdev)->pdev->dev)); rc = -EIO; goto out_err;