scsi: lpfc: Fix NVME Initiator FirstBurst

First Burst support was not properly indicated in NVMe PRLI.

Correct the bit position and the logic to check and set first burst support.

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

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index b63179d895e20aea298086ec8a4168837fa44500..022060636ae1f663ba263a3df7dd99e6f721ebda 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1998,8 +1998,14 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                        ndlp->nlp_type |= NLP_NVME_TARGET;
                        if (bf_get_be32(prli_disc, nvpr))
                                ndlp->nlp_type |= NLP_NVME_DISCOVERY;
+
+                       /*
+                        * If prli_fba is set, the Target supports FirstBurst.
+                        * If prli_fb_sz is 0, the FirstBurst size is unlimited,
+                        * otherwise it defines the actual size supported by
+                        * the NVME Target.
+                        */
                        if ((bf_get_be32(prli_fba, nvpr) == 1) &&
-                           (bf_get_be32(prli_fb_sz, nvpr) > 0) &&
                            (phba->cfg_nvme_enable_fb) &&
                            (!phba->nvmet_support)) {
                                /* Both sides support FB. The target's first
@@ -2008,6 +2014,13 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                                ndlp->nlp_flag |= NLP_FIRSTBURST;
                                ndlp->nvme_fb_size = bf_get_be32(prli_fb_sz,
                                                                 nvpr);
+
+                               /* Expressed in units of 512 bytes */
+                               if (ndlp->nvme_fb_size)
+                                       ndlp->nvme_fb_size <<=
+                                               LPFC_NVME_FB_SHIFT;
+                               else
+                                       ndlp->nvme_fb_size = LPFC_NVME_MAX_FB;
                        }
                }
 

diff --git a/drivers/scsi/lpfc/lpfc_nvme.h b/drivers/scsi/lpfc/lpfc_nvme.h
index e79f8f75758c5418f3d47b6494fd5f989dd58042..48b0229ebc99d9cbe8dbbe869b0c66db5aac2ca1 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvme.h
+++ b/drivers/scsi/lpfc/lpfc_nvme.h
@@ -27,6 +27,8 @@
 
 #define LPFC_NVME_WAIT_TMO              10
 #define LPFC_NVME_EXPEDITE_XRICNT      8
+#define LPFC_NVME_FB_SHIFT             9
+#define LPFC_NVME_MAX_FB               (1 << 20)       /* 1M */
 
 struct lpfc_nvme_qhandle {
        uint32_t index;         /* WQ index to use */