Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp486765lql; Mon, 11 Mar 2024 08:25:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVQy73lCE7d8aiEzkki1iOucwgvSk5v7nXlNl0yRz+sqFxI15feV670VTjILLh753HZwS/068jJR2hK71db727PpXgJtjpQEfPs4bin7Q== X-Google-Smtp-Source: AGHT+IFrhsx/MElZte1D1CLpt+v2wpWo9+wAs3UrUhMKOWFPISQFCqIwsNfFXYk1nY1Ti16Fdiz6 X-Received: by 2002:a17:907:1603:b0:a45:20e4:e5ed with SMTP id cw3-20020a170907160300b00a4520e4e5edmr3727183ejd.77.1710170756390; Mon, 11 Mar 2024 08:25:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710170756; cv=pass; d=google.com; s=arc-20160816; b=zUjX94mp67EAM0CZe1fcTnczlmib4I88qZ0GujL/1GtjbnyoDJievWH9+oqOOp/ywY nfv5Jj9EzFtUADfEdGnGDkqcMZIXmXWXMozBbMIy9wi1Z93QFIrcEtImoFm1KTOG9nFa fcPbFKahI5EAZa/jLq1G/hXwLD3VFxUpeKHPyqggmartVm08dK/Lg8VVc3YskNZfNq4s 9kaRDRdy1/cxfLlc/4lzMyA1eaEEif1rbYxxsvFzKXyOHHI/UKQA4YRjzYNYHkhdwzog nb/1Z4yYxPD871ZkV9DvLruPlrq+Cn7Z6j6QqnLF2CWygoMSXWnrNzrNXCKf0zqxfiax kbmQ== ARC-Message-Signature: i=2; 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=bXznOUgaRa3edlZ5u8I4ggDeElk7rrdUfpt+ni/wtfs=; fh=ijGJOgpT8CXasYSuzaVI6pLUjTfB0JIHeaY5gg2NwSc=; b=V5+EbqGVYHix46vi1a70wnf9VgI5IFbW90RCNabaBy9T6xqK5YUCjm/UaayzOQAEVv bAhR7/ecy8itY46nPpWRxG8mbjtBMZEm6Yczm8JQWZNzMJrX762sKN0v9Cn+zekGOUq2 RDSH+5UjUg2Nccxiz1gWZMhVbpGguEo8vDxQO+xIhbmSLv3x3VNJPlV67wm5edWoK4ZL ayLef8Iep3RjsMvxjyGNtEi6ArdJC4ktIPCnaCG+3+f4jGnmgUAeZzyvRNCGjQqQQyzn 9L+bumQAYKR8xNNXMv1Nw/9H4Hn5m2/kIhIX8Y9Os6ADqnzjWgzIAd9Ry1uzLsnY32eH N6LQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tAbOqo9+; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99097-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99097-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id bh7-20020a170906a0c700b00a4452eb05fdsi2612435ejb.168.2024.03.11.08.25.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 08:25:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-99097-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tAbOqo9+; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99097-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99097-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 2138C1F27829 for ; Mon, 11 Mar 2024 15:25:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 19C9262A0E; Mon, 11 Mar 2024 15:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tAbOqo9+" 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 22D8C481A7; Mon, 11 Mar 2024 15:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710170046; cv=none; b=qrowSXvSxJqSzt+3ZBt+5Ancf4gCzqTldJzdAsuwtTVkgIG3TTaFU7nA9tRuG6mvE85f9Cw6LNzjSV2rkOzF9cY8+VcBaU7ie/PszdQLWEInOTe+/dhaPro9KCj7N/pIi2TulvcgmstRh8J71380WTjENDjhWN+2H2gz+4Jq2kk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710170046; c=relaxed/simple; bh=vko/+J46uPjjVxQ7eGm2PmvehHWRDiGajfhump5oooI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XBXhBhVMBuBhqBpjwhb5BmfOsyZxRJmhIjFA7HcWKn7oUyWlnKXWNBa8z0203VJiuPxnVi1Hr9X1Ti3Y8ESZtMgCkGkE0f8Fn34eAoT90KuVTvuMPBtmTM/DgVB0eJoALUYLZ7HzDIzvepOaElw0ITG3tGJ6NPodJJDHx5yJcyY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tAbOqo9+; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0C94C43394; Mon, 11 Mar 2024 15:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710170046; bh=vko/+J46uPjjVxQ7eGm2PmvehHWRDiGajfhump5oooI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tAbOqo9+xmGLoKK42RN4u4gI91kwGO4rrJq+7ergpYa99hrp0eTumhD9jhQ3fODF+ ZHybuWbAiefVJYD+7TMHyj4UrnL7/LkrNl8+9nuDKphFgL1pojW9PmVBNzr3+n5+CN 0xE6W0NWKxGhJFHgTNbE2JPZ8YgZNDUl7QyRjrP6u+jjlIqP55omMJV6y3Z/ZVLlYP U/B/IdMFS3YjiOFzEstc3v3fnq+Yy4eD9uOFy7KluXiKS3M1MG2HCeSTl5LyvJKfKS cPJcvsOiONzmo4GUT505dfKRo0dSlk24X+tHnaUJ8ybC8eKeKN9xnEewnwDeV3I2UI a8uSSEaEM2F8Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ranjan Kumar , "Martin K . Petersen" , Sasha Levin , sathya.prakash@broadcom.com, sreekanth.reddy@broadcom.com, suganath-prabu.subramani@broadcom.com, jejb@linux.ibm.com, MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 06/13] scsi: mpt3sas: Prevent sending diag_reset when the controller is ready Date: Mon, 11 Mar 2024 11:13:41 -0400 Message-ID: <20240311151354.318293-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240311151354.318293-1-sashal@kernel.org> References: <20240311151354.318293-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.81 Content-Transfer-Encoding: 8bit From: Ranjan Kumar [ Upstream commit ee0017c3ed8a8abfa4d40e42f908fb38c31e7515 ] If the driver detects that the controller is not ready before sending the first IOC facts command, it will wait for a maximum of 10 seconds for it to become ready. However, even if the controller becomes ready within 10 seconds, the driver will still issue a diagnostic reset. Modify the driver to avoid sending a diag reset if the controller becomes ready within the 10-second wait time. Signed-off-by: Ranjan Kumar Link: https://lore.kernel.org/r/20240221071724.14986-1-ranjan.kumar@broadcom.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 809be43f440dc..8e6ac08e553bb 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -7398,7 +7398,9 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout) return -EFAULT; } - issue_diag_reset: + return 0; + +issue_diag_reset: rc = _base_diag_reset(ioc); return rc; } -- 2.43.0