From patchwork Tue Jan 30 23:58:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 10192927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C92860291 for ; Tue, 30 Jan 2018 23:59:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F1FA27F54 for ; Tue, 30 Jan 2018 23:59:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33F4127FAC; Tue, 30 Jan 2018 23:59:34 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 D040227F54 for ; Tue, 30 Jan 2018 23:59:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176AbeA3X7c (ORCPT ); Tue, 30 Jan 2018 18:59:32 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:33809 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754168AbeA3X72 (ORCPT ); Tue, 30 Jan 2018 18:59:28 -0500 Received: by mail-qt0-f196.google.com with SMTP id a27so19682077qtd.1 for ; Tue, 30 Jan 2018 15:59:28 -0800 (PST) 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=TyYg1jrTwApPGFpuV9nqZlnhLbgsDHSglsKWe15gKsg=; b=O9mMSDiobdRDSVdUFKic5y5UVBmFcKHm46a8uAsZuhYsC8h7n7BfmZaQ266iEh3kXG 903tDdtUOnjZ6ZlZgKIhpdRn0d1BIu/61O+fXbMxkrettzzeMnfp/rCOXcQVy+Vnrzhz qIHDtnzTiPYV8yvAlRnquS+tZGJlF4QTLT4qZjbq8vshnFQxpexzNxZXJ2yPw0PhvBbO DmHBsDOwmaDwNA8fIU2uCSpVVYqVVLXY7d3Kzu3OVyytg4zxAl27/ooRLV4OsI9QwtGK v0oLyKeMNJTfUX8RRJ8LjESSBvDijpeEmgLuaetbYLLjs7T8FrM1n9bicECbGVOHpe+E GDnA== 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=TyYg1jrTwApPGFpuV9nqZlnhLbgsDHSglsKWe15gKsg=; b=MBtk2Fnob3q+QBnFRaatT4VDmuMANQ2olnsstTkTmHa0Bvdg2clz64C9F80jY69FY7 FFLP1snTdowGZF5f0U4Q9zxp/D5eUWeziHWiTKKeM9oaIna5nzPdzWphBy8J+iKRmTCt G5lL3GokMw7qDnWYrdHS4tluAAN1loNdVCuSNwriaeUksC4E3yWEZmO+eDM+xnrwRCt1 qwt48oyqWY9yk+LjPjLpgDq+aP6/71WPQ5j8U4M/C8CHTxUWo3N8hRvNNJ22beUSK3KO BypQZpiS2PyNRdnbr448DUf2K091NtQcvCM5bTVUxepdofcEcqRZOLNd2e6izIVdeDWg 4SFQ== X-Gm-Message-State: AKwxytcp7KDGcGVamNWq4uAgPWvrNm8YGjvGUbpGvmP2a9tmcgRZ9Hy3 ZTHiU8qMWN+MPAepW0txp2UhjA== X-Google-Smtp-Source: AH8x227N4o8tQD3Kh63AK4+Hxl1mRqcp0hvyfQ1P7vCpIdIOFS1SzOOuQ39c1ticQs1azbtAs8z0nw== X-Received: by 10.200.13.74 with SMTP id r10mr49431368qti.133.1517356767967; Tue, 30 Jan 2018 15:59:27 -0800 (PST) Received: from pallmd1.broadcom.com ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id i39sm12438537qte.19.2018.01.30.15.59.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jan 2018 15:59:27 -0800 (PST) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy , James Smart Subject: [PATCH v3 12/19] lpfc: Indicate CONF support in NVMe PRLI Date: Tue, 30 Jan 2018 15:58:56 -0800 Message-Id: <20180130235903.5316-13-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180130235903.5316-1-jsmart2021@gmail.com> References: <20180130235903.5316-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 Revise the NVME PRLI to indicate CONF support. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke --- drivers/scsi/lpfc/lpfc_els.c | 3 ++- drivers/scsi/lpfc/lpfc_hw4.h | 6 +++--- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 234c7c015982..404e1af5e2ab 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -2293,10 +2293,11 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, if (phba->nvmet_support) { bf_set(prli_tgt, npr_nvme, 1); bf_set(prli_disc, npr_nvme, 1); - } else { bf_set(prli_init, npr_nvme, 1); + bf_set(prli_conf, npr_nvme, 1); } + npr_nvme->word1 = cpu_to_be32(npr_nvme->word1); npr_nvme->word4 = cpu_to_be32(npr_nvme->word4); elsiocb->iocb_flag |= LPFC_PRLI_NVME_REQ; diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index ef469129fb71..7c3afc3d3121 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -4346,9 +4346,9 @@ struct lpfc_nvme_prli { #define prli_init_SHIFT 5 #define prli_init_MASK 0x00000001 #define prli_init_WORD word4 -#define prli_recov_SHIFT 8 -#define prli_recov_MASK 0x00000001 -#define prli_recov_WORD word4 +#define prli_conf_SHIFT 7 +#define prli_conf_MASK 0x00000001 +#define prli_conf_WORD word4 uint32_t word5; #define prli_fb_sz_SHIFT 0 #define prli_fb_sz_MASK 0x0000ffff diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index d841aa42f607..bbf1e1342b09 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -2011,9 +2011,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, } } - if (bf_get_be32(prli_recov, nvpr)) - ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE; - lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC, "6029 NVME PRLI Cmpl w1 x%08x " "w4 x%08x w5 x%08x flag x%x, "