Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2257737ybg; Sun, 27 Oct 2019 14:33:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwsBy2gqj86cO/ycoWsm+btlnWrqf06sS5YSqqhdPnLutLVGQiX7mZ0N5j9YqVUBUBrUKsA X-Received: by 2002:a17:906:742:: with SMTP id z2mr225927ejb.32.1572212017984; Sun, 27 Oct 2019 14:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212017; cv=none; d=google.com; s=arc-20160816; b=KEnMFJFksK8z7C1/S8qDdXv2q632GBSjYzfP6vU8rvi+Nw/egNMQ1lVVYpMNa3jmmq Q2PO6UGfoMqbVbaPXn+c/tccpswvZBMPc22rD6kn726ESAHiRsDWHRIXEMM4OfNdyhhg zPR65Ea3CvxQSicAoJMVAo5NV0MPyz7jIs9bUdWaz6DP8rqp34KV4AfY7XGhjmvCDlxO vATssg+ykV+cU2ZVY9lDb1FfPBvw1DZPrNky2zDjfzHJ4C2A2T2NcCYqzur9DYhJRrg4 oo4lYf76iv2K0Ya5P8/OzmBLheX3zrVXrm7e40N6E7Q5dSi+FP6qzxWYH35p9FCPypnJ dDIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HepFUSUl5qutvb/T+k01oDuHIcJ7BVKsRV34W4BnyXA=; b=unYjEt3E7Kiw10SCcQ/ublW65pxsF+MQbxyDLE1iNE/uQ6KicURVoo96kKWAm1Mjwj ItDYDkMHy2bvhf7kzVMoa4jxx/K64KuGAWdrGo+oFCyF2+E7LG1feJ76POGDZ1IlMvW/ W4p6tHIcDWov1MI7PuR8wCqtOaOMAnGgDfRVfX1i0/iJbqwutVQ3UFKbzuD6HjoTriJb UdhtGdw3IxwU57IyBGntnnVer5drh/Wqds8jd6ciT1FPeSAPpMVyhKqQWolKFPbXncXq dDvPBdxNJU264lq9LQ5DUS5Zc7FPJJ84PWC3ZH28jmDaXeymrR8LYmOvdx0XWsSg/xgw WAQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XGfDF0IB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14si2381645edf.199.2019.10.27.14.33.14; Sun, 27 Oct 2019 14:33:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XGfDF0IB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731047AbfJ0VR2 (ORCPT + 99 others); Sun, 27 Oct 2019 17:17:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:37154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731035AbfJ0VRW (ORCPT ); Sun, 27 Oct 2019 17:17:22 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 59633205C9; Sun, 27 Oct 2019 21:17:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211041; bh=N0zoL5YhrO/1NDUD4wR1V+S0xXE5d5+U9/T9JZWM2ZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XGfDF0IBMDBAAhVjy0a0p+yoXsubo95qovkHGSZ8FREUkGvOgYI+6RJC1+2KncS0z WZ2+tbUet89vhf/ySUo0jWkVxD36LKNfAYqhfCMIk+41iQR7eApUU+zZDlx3zrjpA4 WUfAuRprlW+AzA4oABS0eZGJfM0oWiShPt39v0j0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quinn Tran , Himanshu Madhani , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.3 012/197] scsi: qla2xxx: Fix N2N link up fail Date: Sun, 27 Oct 2019 21:58:50 +0100 Message-Id: <20191027203352.341166174@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Quinn Tran [ Upstream commit f3f1938bb673b1b5ad182c4608f5f8a24921eea3 ] During link up/bounce, qla driver would do command flush as part of cleanup. In this case, the flush can intefere with FW state. This patch allows FW to be in control of link up. Link: https://lore.kernel.org/r/20190912180918.6436-7-hmadhani@marvell.com Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_mbx.c | 2 ++ drivers/scsi/qla2xxx/qla_os.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index aadff0124f39f..abfb9c800ce28 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -3905,6 +3905,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha, fcport->dm_login_expire = jiffies + 2*HZ; fcport->scan_state = QLA_FCPORT_FOUND; fcport->n2n_flag = 1; + fcport->keep_nport_handle = 1; if (vha->flags.nvme_enabled) fcport->fc4f_nvme = 1; @@ -4050,6 +4051,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha, fcport->login_retry = vha->hw->login_retry_count; fcport->plogi_nack_done_deadline = jiffies + HZ; fcport->scan_state = QLA_FCPORT_FOUND; + fcport->keep_nport_handle = 1; fcport->n2n_flag = 1; fcport->d_id.b.domain = rptid_entry->u.f2.remote_nport_id[2]; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 12d5f50646fba..2835afbd2edc7 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5150,11 +5150,9 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e) if (dfcp) qlt_schedule_sess_for_deletion(tfcp); - - if (N2N_TOPO(vha->hw)) - fcport->flags &= ~FCF_FABRIC_DEVICE; - if (N2N_TOPO(vha->hw)) { + fcport->flags &= ~FCF_FABRIC_DEVICE; + fcport->keep_nport_handle = 1; if (vha->flags.nvme_enabled) { fcport->fc4f_nvme = 1; fcport->n2n_flag = 1; -- 2.20.1