[SCSI] lpfc 8.3.41: Add first burst support to driver

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 93f222d6671630f75f8c7cf09d55226878101a46..f59aa2124ea27a34dd0bf5b2e76f06088bd25537 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -421,6 +421,7 @@ struct lpfc_vport {
        uint32_t cfg_enable_da_id;
        uint32_t cfg_max_scsicmpl_time;
        uint32_t cfg_tgt_queue_depth;
+       uint32_t cfg_first_burst_size;
 
        uint32_t dev_loss_tmo_changed;
 

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 745ba85a899350afb7a4483b23b1485b0dfff8ec..cb7b779aafe92fb88e859f28028a496030d84f16 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -3949,6 +3949,14 @@ LPFC_VPORT_ATTR_R(fcp_class, 3, 2, 3,
 LPFC_VPORT_ATTR_RW(use_adisc, 0, 0, 1,
                   "Use ADISC on rediscovery to authenticate FCP devices");
 
+/*
+# lpfc_first_burst_size: First burst size to use on the NPorts
+# that support first burst.
+# Value range is [0,65536]. Default value is 0.
+*/
+LPFC_VPORT_ATTR_RW(first_burst_size, 0, 0, 65536,
+                  "First burst size for Targets that support first burst");
+
 /*
 # lpfc_max_scsicmpl_time: Use scsi command completion time to control I/O queue
 # depth. Default value is 0. When the value of this parameter is zero the
@@ -4277,6 +4285,7 @@ struct device_attribute *lpfc_hba_attrs[] = {
        &dev_attr_lpfc_devloss_tmo,
        &dev_attr_lpfc_fcp_class,
        &dev_attr_lpfc_use_adisc,
+       &dev_attr_lpfc_first_burst_size,
        &dev_attr_lpfc_ack0,
        &dev_attr_lpfc_topology,
        &dev_attr_lpfc_scan_down,
@@ -4353,6 +4362,7 @@ struct device_attribute *lpfc_vport_attrs[] = {
        &dev_attr_lpfc_restrict_login,
        &dev_attr_lpfc_fcp_class,
        &dev_attr_lpfc_use_adisc,
+       &dev_attr_lpfc_first_burst_size,
        &dev_attr_lpfc_fdmi_on,
        &dev_attr_lpfc_max_luns,
        &dev_attr_nport_evt_cnt,
@@ -5332,6 +5342,7 @@ lpfc_get_vport_cfgparam(struct lpfc_vport *vport)
        lpfc_restrict_login_init(vport, lpfc_restrict_login);
        lpfc_fcp_class_init(vport, lpfc_fcp_class);
        lpfc_use_adisc_init(vport, lpfc_use_adisc);
+       lpfc_first_burst_size_init(vport, lpfc_first_burst_size);
        lpfc_max_scsicmpl_time_init(vport, lpfc_max_scsicmpl_time);
        lpfc_fdmi_on_init(vport, lpfc_fdmi_on);
        lpfc_discovery_threads_init(vport, lpfc_discovery_threads);

diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index af49fb03dbb890dba4e0fc21a5a704580ab94781..5cecfc5250a18cde7c3fcba2f2f94d55debba491 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -154,6 +154,7 @@ struct lpfc_node_rrq {
 #define NLP_NODEV_REMOVE   0x08000000  /* Defer removal till discovery ends */
 #define NLP_TARGET_REMOVE  0x10000000   /* Target remove in process */
 #define NLP_SC_REQ         0x20000000  /* Target requires authentication */
+#define NLP_FIRSTBURST     0x40000000  /* Target supports FirstBurst */
 #define NLP_RPI_REGISTERED 0x80000000  /* nlp_rpi is valid */
 
 /* ndlp usage management macros */

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 6b8ee7449f16a197b833591ffbc89ae31f21c61d..110445f0c58d91a2ea0ade025f16ee591d3d24ab 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -2122,6 +2122,8 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        }
        npr->estabImagePair = 1;
        npr->readXferRdyDis = 1;
+        if (vport->cfg_first_burst_size)
+               npr->writeXferRdyDis = 1;
 
        /* For FCP support */
        npr->prliType = PRLI_FCP_TYPE;

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 6aaf39a1f1c54e729687f37e74b63298a3d80708..abc361259d6de12bb57c6a9d0f206dbc48b0f6f9 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -690,11 +690,15 @@ lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 
        ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
        ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
+       ndlp->nlp_flag &= ~NLP_FIRSTBURST;
        if (npr->prliType == PRLI_FCP_TYPE) {
                if (npr->initiatorFunc)
                        ndlp->nlp_type |= NLP_FCP_INITIATOR;
-               if (npr->targetFunc)
+               if (npr->targetFunc) {
                        ndlp->nlp_type |= NLP_FCP_TARGET;
+                       if (npr->writeXferRdyDis)
+                               ndlp->nlp_flag |= NLP_FIRSTBURST;
+               }
                if (npr->Retry)
                        ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE;
        }
@@ -1676,12 +1680,16 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        /* Check out PRLI rsp */
        ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
        ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
+       ndlp->nlp_flag &= ~NLP_FIRSTBURST;
        if ((npr->acceptRspCode == PRLI_REQ_EXECUTED) &&
            (npr->prliType == PRLI_FCP_TYPE)) {
                if (npr->initiatorFunc)
                        ndlp->nlp_type |= NLP_FCP_INITIATOR;
-               if (npr->targetFunc)
+               if (npr->targetFunc) {
                        ndlp->nlp_type |= NLP_FCP_TARGET;
+                       if (npr->writeXferRdyDis)
+                               ndlp->nlp_flag |= NLP_FIRSTBURST;
+               }
                if (npr->Retry)
                        ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE;
        }

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 4261469619c292d16b139a55e3625df89dee72b4..1242b6c4308b51eda7311d140c6ca52b76805374 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4387,6 +4387,11 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                if (datadir == DMA_TO_DEVICE) {
                        iocb_cmd->ulpCommand = CMD_FCP_IWRITE64_CR;
                        iocb_cmd->ulpPU = PARM_READ_CHECK;
+                       if (vport->cfg_first_burst_size &&
+                           (pnode->nlp_flag & NLP_FIRSTBURST)) {
+                               piocbq->iocb.un.fcpi.fcpi_XRdy =
+                                       vport->cfg_first_burst_size;
+                       }
                        fcp_cmnd->fcpCntl3 = WRITE_DATA;
                        phba->fc4OutputRequests++;
                } else {