Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp854349pxk; Thu, 17 Sep 2020 19:10:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNTwtcFmqoZrx8EKIbJKk7cPPzCwQpRu/EJuGFTr/obY7wmjdDulL+gTZNZJDTjtS8XEJw X-Received: by 2002:a17:906:3aca:: with SMTP id z10mr21606453ejd.419.1600395036930; Thu, 17 Sep 2020 19:10:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600395036; cv=none; d=google.com; s=arc-20160816; b=xBdVojJVMOdIb3vFxJWSmX6gggEMDS9KI93ZQgwVhoZY2eZQFUTXlX0Np4k1erKxWb +ATrKIWkrSwm+4GvqdRb9xA3yACmxx/TjO3uELG5X41niC97HkMmQd3PVilsmBRgQyVR UWbVCekuqnrP4j6cObO2uezNb25dmPzpQXmrPifhN6GT4uG72J+YQxjuNwU2aj0W9dXe l+yrILUHa9NinTuVzFL4+5IKvGmU2loAEhX9bwOZhBVMO/JvVAr/6aR/RFLbO7k2s/uQ XEN+dWO4u5d3Xng4P/xNyTct3bfsqDVrZKVJ3jSKqABd8h47FCkHkrBYVYttoInm/Af0 MNeg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IoO9t4VPOr42G0CC6HrH8WMnhHFf0PXq326zywjgmWQ=; b=kfb/tZUtzspNtLte4KvLkhcJNauOWQfwLv+xyrazexXR88BVRvRQnHIXzcXvFXRQkc ux9yxTKrCayQbhahW4FSS0J84G3YO80O42kYI2S4rDDHZMkkiR/EVxsu3DpYI3h/kxe1 3H6LsZXIAn5fFWZf0zlhX8rYo6F8Ycb66h08cvIxWntzYIJFoPcSUwFWxXciEzg4EXdh SpiCdzJPFd4dX94xuhwUPvcs6P3m3SBJv2H/vE4x4Bdw0Tmk+FtEtMVylPzr2g0wWkuT 9O+N5ZEyMvmdJ3NtO1XBkQRwRJpnETDMO23OFHFGygs50RvH37xcJWtFY5Rq6rdlYjJd 4EzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g2Xku6JN; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cq27si1070028edb.415.2020.09.17.19.10.13; Thu, 17 Sep 2020 19:10:36 -0700 (PDT) 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=@kernel.org header.s=default header.b=g2Xku6JN; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726701AbgIRCGI (ORCPT + 99 others); Thu, 17 Sep 2020 22:06:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:54856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727673AbgIRCF6 (ORCPT ); Thu, 17 Sep 2020 22:05:58 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 845552376F; Fri, 18 Sep 2020 02:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394758; bh=4HjaApKhhtTar4fxqvXTEJ36CBbwBcNfAnhgHrUQsuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2Xku6JNNaH3PS7Sg5D15p88NHJPfUzU8+rbJlEQpaq8VIWztA1Mdvs6qalnJp8iR STdGzOdUJt/ORGVW7Z2g2/fPP6bbHu5YuMxxZKxM9tD7DbEZetJP4ruCTblDKOpmQq 6iVGKd33jg65iUA83qjd7RiymAXYZB8CuAOkoQZQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nilesh Javali , Lee Duncan , Manish Rangankar , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 235/330] scsi: qedi: Fix termination timeouts in session logout Date: Thu, 17 Sep 2020 21:59:35 -0400 Message-Id: <20200918020110.2063155-235-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nilesh Javali [ Upstream commit b9b97e6903032ec56e6dcbe137a9819b74a17fea ] The destroy connection ramrod timed out during session logout. Fix the wait delay for graceful vs abortive termination as per the FW requirements. Link: https://lore.kernel.org/r/20200408064332.19377-7-mrangankar@marvell.com Reviewed-by: Lee Duncan Signed-off-by: Nilesh Javali Signed-off-by: Manish Rangankar Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qedi/qedi_iscsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c index 0f57c80734061..0f2622a48311c 100644 --- a/drivers/scsi/qedi/qedi_iscsi.c +++ b/drivers/scsi/qedi/qedi_iscsi.c @@ -1062,6 +1062,9 @@ static void qedi_ep_disconnect(struct iscsi_endpoint *ep) break; } + if (!abrt_conn) + wait_delay += qedi->pf_params.iscsi_pf_params.two_msl_timer; + qedi_ep->state = EP_STATE_DISCONN_START; ret = qedi_ops->destroy_conn(qedi->cdev, qedi_ep->handle, abrt_conn); if (ret) { -- 2.25.1