From nobody Wed Oct 15 22:34:10 2025 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 305012733EC; Sun, 24 Mar 2024 23:35:21 +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=1711323322; cv=none; b=m4h0MEotB0pu8/UVOSpcGNjlgvIyRgcFRiAucLD+cVmcjgTWPn58g5U9A7c5tLEdU94awW3lfSJssponZp+ohDuYPUdh8rh0APhhC/CwmeVkHt3+putiXoRrpwp6xOpT6pJ+I06DzRNyfe5NuqFW2657eG4PHaBPQzg1NSk5YFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323322; c=relaxed/simple; bh=GnWtl6l52l+gUbfZkM8BRybvjTAPzKv3zjCkOuB8YF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ERs2z588yUaqfhMJQG/vy5LTw9mc6DJoKyyCFfEu+QE+L0FTz/J6ChnFI80gJKz52j49mSozNYrgVvy7qLJslevqtL9pz5cB2DXBFpYIqMSrGapQDVBixJViJgXFdeKnybUxA6EaeoBowOyYa9gzFMCf/eMWSHqbYfk0bkeQXGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WJRMwtCE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WJRMwtCE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 678D0C433A6; Sun, 24 Mar 2024 23:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323321; bh=GnWtl6l52l+gUbfZkM8BRybvjTAPzKv3zjCkOuB8YF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJRMwtCEkb9j11WnPVx1r2IxZaUMM0vFrm/TscpzxPjndHUHvcJomQSbZbDo91DYo gPqmLgt+1wGzaKynMcadqrRFRHWIXJDNkXOr7ZkgtmYGqvK4ssryzYf5LSVjO9gmQY vX9MRDBc6y2rsodtxRxm9tH+NUe/wwlAeh86uunOQ5fWK2gHo1okE3QYIgvK1+I3gf h+WOCpc4VMufjRLYrlQrt3ux/ODFSpxE6CahZuYV32yU0zoc7Gj3x30ynDfkdKeSBg oyb4SV/fnA1/6t+9iOYS1YxaNCpJmT7AYqScmJaXCYicXHFxkmKetlZsW62Iw7dQr3 7AgQ+UnF2OYkQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ranjan Kumar , "Martin K . Petersen" , Sasha Levin Subject: [PATCH 5.15 021/317] scsi: mpt3sas: Prevent sending diag_reset when the controller is ready Date: Sun, 24 Mar 2024 19:30:01 -0400 Message-ID: <20240324233458.1352854-22-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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@broadco= m.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/mpt= 3sas_base.c index e524e1fc53fa3..8325875bfc4ed 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -7238,7 +7238,9 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, = int timeout) return -EFAULT; } =20 - issue_diag_reset: + return 0; + +issue_diag_reset: rc =3D _base_diag_reset(ioc); return rc; } --=20 2.43.0