scsi: lpfc: Indicate CONF support in NVMe PRLI

Revise the NVME PRLI to indicate CONF support.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 234c7c015982bbb671c18b58f04a4760d5a58532..404e1af5e2ab80ab526ba4c8736578a2328671c4 100644 (file)
--- 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 ef469129fb71f03a8b2533a8fe83a7f0bde954bb..7c3afc3d3121ec942e0239018358ccab52ab68f1 100644 (file)
--- 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 d841aa42f607e60b9495450caf6e01863ef7d5a0..bbf1e1342b09359e8803687b68afb5185b7efce4 100644 (file)
--- 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, "