Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9036645pxu; Mon, 28 Dec 2020 05:05:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLitcHsToAbqpkD3mu/iAi9dTDuuoh4EtoEED6Gk84MMrm2KWOsFu5vlLmFzn+lzYv9hvi X-Received: by 2002:a17:906:3b56:: with SMTP id h22mr40568331ejf.491.1609160720017; Mon, 28 Dec 2020 05:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609160720; cv=none; d=google.com; s=arc-20160816; b=PKVEQ0ljERclkkiwjjt6PMDIYyrsoJNlS9e5nFIjm27PbMz28WenGelF3E2tXWUgJh DAomrlOPfO5u7NoY3Vl6pU0+L0tAwHj98mct9zEFt+amQGh9oVvyGhc/00YaYRsTDS6u Ly20dUQjdvkXji4ByhvwEDaQY21SKzL78BPutTtM23uUxd1rJY4GcKqXOiZpv75rHGXo U88d0nE5KjzstoaCsQ4g0u3QVuefRZmWXXsPFN7yU/uAvkDzTUUY0sTifBMXfDs+gOgC yi3WCgDWYdLxqaaWO2iQjzdhIsT4G3gGpudBJJBQzK5HfhZeN3edRnnj/QXuZulQbJd/ WNzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6++shi9pLQ9wPBqfGJXZ8c8VlxbWplKEWPb5f9YQWgY=; b=VN36DucA1xvkzgS0zxUEMwo+ponErgo9TV+ALnou7Nkk6LMjB6k67ifExgRdnBSO6v Vkyd0J2VHsSAeSwZqswIoNHRB2xUJKnDiVcRtsqLIG5XXr9QLfyHSH6ubrVJ/+jFtMwS lkf5Wgih5Bv7ku90WR6PP5DWXplKtDcG+JXefRsYvX/xu7+iqjtFDcLOa8ZHkqu2hHPV 5/DfSYnIfmz5YsmxoZtSwve0mcXYkoRO3ixJrGWG0X1Dt8bVNjkcWSOTwr4vZq1z72rQ cFLvJRNUgStvwWcXxD84b98Fj9W6dKs5Tv6QwlmwFB4v9sOVnZBrxjuLo8sCguWKR7Nv lxpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tOJkxYDK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id do19si18546796ejc.670.2020.12.28.05.04.56; Mon, 28 Dec 2020 05:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tOJkxYDK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729380AbgL1M77 (ORCPT + 99 others); Mon, 28 Dec 2020 07:59:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:55612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728898AbgL1M76 (ORCPT ); Mon, 28 Dec 2020 07:59:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 050F0207C9; Mon, 28 Dec 2020 12:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609160382; bh=uk0DM0zMWvCwM7+u/s74nhU1zvTRlz3ushlb/+OpKVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOJkxYDKm5LKlaFOFNE6vrseBO4qKp0aWipfRghPjcCuMGpCRePpdGs50IrBZJ3Xz F8z102rodVYGITL1EPVQDCFANKFCYmWgcxOnR3FgDD2rNwaEr6WaoQu7bHqNUkLy83 ccCqi1fK0KFG6sXWGROEhB+Elw/aahVxhdp17YJY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sreekanth Reddy , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 033/175] scsi: mpt3sas: Increase IOCInit request timeout to 30s Date: Mon, 28 Dec 2020 13:48:06 +0100 Message-Id: <20201228124854.861668832@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124853.216621466@linuxfoundation.org> References: <20201228124853.216621466@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sreekanth Reddy [ Upstream commit 85dad327d9b58b4c9ce08189a2707167de392d23 ] Currently the IOCInit request message timeout is set to 10s. This is not sufficient in some scenarios such as during HBA FW downgrade operations. Increase the IOCInit request timeout to 30s. Link: https://lore.kernel.org/r/20201130082733.26120-1-sreekanth.reddy@broadcom.com Signed-off-by: Sreekanth Reddy Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 601a93953307d..16716b2644020 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4477,7 +4477,7 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc) r = _base_handshake_req_reply_wait(ioc, sizeof(Mpi2IOCInitRequest_t), (u32 *)&mpi_request, - sizeof(Mpi2IOCInitReply_t), (u16 *)&mpi_reply, 10); + sizeof(Mpi2IOCInitReply_t), (u16 *)&mpi_reply, 30); if (r != 0) { pr_err(MPT3SAS_FMT "%s: handshake failed (r=%d)\n", -- 2.27.0