From patchwork Mon Sep 10 17:30:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 10594629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FCAE920 for ; Mon, 10 Sep 2018 17:31:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 656742933F for ; Mon, 10 Sep 2018 17:31:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5946E29345; Mon, 10 Sep 2018 17:31:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC5412933F for ; Mon, 10 Sep 2018 17:31:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728092AbeIJW0M (ORCPT ); Mon, 10 Sep 2018 18:26:12 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45536 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727535AbeIJW0M (ORCPT ); Mon, 10 Sep 2018 18:26:12 -0400 Received: by mail-pf1-f196.google.com with SMTP id i26-v6so10805995pfo.12 for ; Mon, 10 Sep 2018 10:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vd9ghasoE+72AP+zyD0DCE10cDp2vDpnIZhPq9gdeLY=; b=d7oAxuPPHYoJCjOEJ7UpreZh1IMgjY1+9ckwhI2dGA1ZS0yLN27ulxBcROSsqr/9iY uSO06yNrVL7pNgkXmku3x9GQ/54om/Nzw/4Fn5fxBvIMV/FSYKfJaq4hJFWbrO0Kx8/B 2e+TM5fygc+Vjz4SjSNsIV7y6OSIO/gkD8CneDJufbbjjzg1wrR2uTcjOZ7VHhjV8Wpl rN1997mBborAG0Czn72bx9JD9l8PUQUENnomceFI1jMQ6wkX9SwFFDFYoyKHISE9dX0g YTa2yhCatSkgMNTUFBdAQraxnWMGhexVKC9SM6+0QXUQDkuZny/czRWdpqLhHIIFE+x1 5zvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vd9ghasoE+72AP+zyD0DCE10cDp2vDpnIZhPq9gdeLY=; b=HHMKSmRMJYIA5w/xtAVXBA4aqWtOc/gSZDajgLZ1D4OJKoUJiRRs+iESI8H38rQ2Bv cDPjxunoqx7cxumZvOUg9JmQTKJS/I6LdBgAF1sT2XwUxps53BEps0bRY9tsfnC6kayr 2XS8xoqny6Xr1k5TtNqZQ/YEeECwn/AC9BOS2RmAIPOVQs9iwuHPeAsXuPwhBJkNAe9Q 3g/HDBWb1zq3nP3Jk8OiE/Z7oa3jR0/Nl3ZS6CRvW+XqdowfA/wj++Dwxkx7p1GivtVg p0AM6bDD+cPM9QbBvN9w3KyCXWgPWanh4vXa4TVQX7MvlSBpVGgy+KHomEx7tP7INhbn VJvg== X-Gm-Message-State: APzg51CCtB8MvGZDVFEcKYY1OXA6oGb9/QdBu9I0S267L3MbkbCptm6k 40/fCj7hUyVHBNJhdo7aKj6QvLPR X-Google-Smtp-Source: ANB0VdaHKDVwIPPWWj1WVr8W6q+wo+70+fqAaMPhiGSYdAbHJWGO+7JMQ2/4XMgCkcIQuK4Sd2j4UA== X-Received: by 2002:a63:b44c:: with SMTP id n12-v6mr23994528pgu.337.1536600663458; Mon, 10 Sep 2018 10:31:03 -0700 (PDT) Received: from pallmd1.broadcom.com ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id 6-v6sm22134045pgf.38.2018.09.10.10.31.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Sep 2018 10:31:03 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy , James Smart Subject: [PATCH 01/11] lpfc: Fix GFT_ID and PRLI logic for RSCN Date: Mon, 10 Sep 2018 10:30:41 -0700 Message-Id: <20180910173051.6272-2-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180910173051.6272-1-jsmart2021@gmail.com> References: <20180910173051.6272-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Driver only sends NVME PRLI to a device that also supports FCP. This resuls in remote ports that don't have fc_remote_ports created for them. The driver is clearing the nlp_fc4_type for a ndlp at the wrong time. Fix by moving the nlp_fc4_type clearing to the discovery engine in the DEVICE_RECOVERY state. Also ensure that rport registration is done for all nlp_fc4_types. Signed-off-by: Dick Kennedy Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_ct.c | 5 ----- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 1cbdc892ff95..0eae8051e920 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -471,11 +471,6 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) "Parse GID_FTrsp: did:x%x flg:x%x x%x", Did, ndlp->nlp_flag, vport->fc_flag); - /* Don't assume the rport is always the previous - * FC4 type. - */ - ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME); - /* By default, the driver expects to support FCP FC4 */ if (fc4_type == FC_TYPE_FCP) ndlp->nlp_fc4_type |= NLP_FC4_FCP; diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index eb71877f12f8..235abd50e530 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -4193,7 +4193,7 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, if (new_state == NLP_STE_MAPPED_NODE || new_state == NLP_STE_UNMAPPED_NODE) { - if (ndlp->nlp_fc4_type & NLP_FC4_FCP || + if (ndlp->nlp_fc4_type || ndlp->nlp_DID == Fabric_DID || ndlp->nlp_DID == NameServer_DID || ndlp->nlp_DID == FDMI_DID) { diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index bd9bce9d9974..269808e8480f 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -2318,6 +2318,7 @@ lpfc_device_recov_unmap_node(struct lpfc_vport *vport, lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE); spin_lock_irq(shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME); spin_unlock_irq(shost->host_lock); lpfc_disc_set_adisc(vport, ndlp); @@ -2395,6 +2396,7 @@ lpfc_device_recov_mapped_node(struct lpfc_vport *vport, lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE); spin_lock_irq(shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME); spin_unlock_irq(shost->host_lock); lpfc_disc_set_adisc(vport, ndlp); return ndlp->nlp_state; @@ -2652,6 +2654,7 @@ lpfc_device_recov_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, lpfc_cancel_retry_delay_tmo(vport, ndlp); spin_lock_irq(shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME); spin_unlock_irq(shost->host_lock); return ndlp->nlp_state; }