[SCSI] lpfc 8.3.25: Miscellaneous Bug fixes and code cleanup

Miscellaneous Bug fixes and code cleanup

- Fix 16G link speed reporting by adding check for 16G check.
- Change the check and enforcement of MAILBOX_EXT_SIZE (2048B)
  to the check and enforcement of BSG_MBOX_SIZE - sizeof(MAILBOX_t) (3840B).
- Instead of waiting for a fixed amount of time after performing firmware
  reset, the driver shall wait for the Lancer SLIPORT_STATUS register for the
  readiness of the firmware for bring up.
- Add logging to indicate when dynamic parameters are changed.
- Add revision and date to the firmware image format.
- Use revision instead of rev_name to check firmware image version.
- Update temporary offset after memcopy is complete for firmware update.
- Consolidated the use of the macros to get rid of duplicated register
  offset definitions.
- Removed the unused second parameter in routine lpfc_bsg_diag_mode_enter()
- Enable debugfs when debugfs is enabled.
- Update function comments for lpfc_sli4_alloc_xri and lpfc_sli4_init_rpi_hdrs.

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

7 files changed, 129 insertions, 54 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 8ec2c86a49d4..42b583b26139 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -20,6 +20,11 @@
  *******************************************************************/
 
 #include <scsi/scsi_host.h>
+
+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_SCSI_LPFC_DEBUG_FS)
+#define CONFIG_SCSI_LPFC_DEBUG_FS
+#endif
+
 struct lpfc_sli2_slim;
 
 #define LPFC_PCI_DEV_LP         0x1
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 29ccb1519226..bffd86f204dd 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -755,6 +755,47 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,
 }
 
 /**
+ * lpfc_sli4_pdev_status_reg_wait - Wait for pdev status register for readyness
+ * @phba: lpfc_hba pointer.
+ *
+ * Description:
+ * SLI4 interface type-2 device to wait on the sliport status register for
+ * the readyness after performing a firmware reset.
+ *
+ * Returns:
+ * zero for success
+ **/
+static int
+lpfc_sli4_pdev_status_reg_wait(struct lpfc_hba *phba)
+{
+        struct lpfc_register portstat_reg;
+        int i;
+
+
+        lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
+                   &portstat_reg.word0);
+
+        /* wait for the SLI port firmware ready after firmware reset */
+        for (i = 0; i < LPFC_FW_RESET_MAXIMUM_WAIT_10MS_CNT; i++) {
+                msleep(10);
+                lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
+                           &portstat_reg.word0);
+                if (!bf_get(lpfc_sliport_status_err, &portstat_reg))
+                        continue;
+                if (!bf_get(lpfc_sliport_status_rn, &portstat_reg))
+                        continue;
+                if (!bf_get(lpfc_sliport_status_rdy, &portstat_reg))
+                        continue;
+                break;
+        }
+
+        if (i < LPFC_FW_RESET_MAXIMUM_WAIT_10MS_CNT)
+                return 0;
+        else
+                return -EIO;
+}
+
+/**
  * lpfc_sli4_pdev_reg_request - Request physical dev to perform a register acc
  * @phba: lpfc_hba pointer.
  *
@@ -805,7 +846,10 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)
         readl(phba->sli4_hba.conf_regs_memmap_p + LPFC_CTL_PDEV_CTL_OFFSET);
 
         /* delay driver action following IF_TYPE_2 reset */
-        msleep(100);
+        rc = lpfc_sli4_pdev_status_reg_wait(phba);
+
+        if (rc)
+                return -EIO;
 
         init_completion(&online_compl);
         rc = lpfc_workq_post_event(phba, &status, &online_compl,
@@ -895,6 +939,10 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,
 
         if (!phba->cfg_enable_hba_reset)
                 return -EACCES;
+
+        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
+                "3050 lpfc_board_mode set to %s\n", buf);
+
         init_completion(&online_compl);
 
         if(strncmp(buf, "online", sizeof("online") - 1) == 0) {
@@ -1290,6 +1338,10 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr,
         if (phba->sli_rev == LPFC_SLI_REV4)
                 val = 0;
 
+        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
+                "3051 lpfc_poll changed from %d to %d\n",
+                phba->cfg_poll, val);
+
         spin_lock_irq(&phba->hbalock);
 
         old_val = phba->cfg_poll;
@@ -1605,6 +1657,9 @@ static int \
 lpfc_##attr##_set(struct lpfc_hba *phba, uint val) \
 { \
         if (val >= minval && val <= maxval) {\
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT, \
+                        "3052 lpfc_" #attr " changed from %d to %d\n", \
+                        phba->cfg_##attr, val); \
                 phba->cfg_##attr = val;\
                 return 0;\
         }\
@@ -1762,6 +1817,9 @@ static int \
 lpfc_##attr##_set(struct lpfc_vport *vport, uint val) \
 { \
         if (val >= minval && val <= maxval) {\
+                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \
+                        "3053 lpfc_" #attr " changed from %d to %d\n", \
+                        vport->cfg_##attr, val); \
                 vport->cfg_##attr = val;\
                 return 0;\
         }\
@@ -2678,6 +2736,9 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr,
                 if (nolip)
                         return strlen(buf);
 
+                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
+                        "3054 lpfc_topology changed from %d to %d\n",
+                        prev_val, val);
                 err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport));
                 if (err) {
                         phba->cfg_topology = prev_val;
@@ -3101,6 +3162,10 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr,
         if (sscanf(val_buf, "%i", &val) != 1)
                 return -EINVAL;
 
+        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
+                "3055 lpfc_link_speed changed from %d to %d %s\n",
+                phba->cfg_link_speed, val, nolip ? "(nolip)" : "(lip)");
+
         if (((val == LPFC_USER_LINK_SPEED_1G) && !(phba->lmt & LMT_1Gb)) ||
             ((val == LPFC_USER_LINK_SPEED_2G) && !(phba->lmt & LMT_2Gb)) ||
             ((val == LPFC_USER_LINK_SPEED_4G) && !(phba->lmt & LMT_4Gb)) ||
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 7fb0ba4cbfa7..8675aa20642a 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1471,13 +1471,12 @@ send_mgmt_rsp_exit:
 /**
  * lpfc_bsg_diag_mode_enter - process preparing into device diag loopback mode
  * @phba: Pointer to HBA context object.
- * @job: LPFC_BSG_VENDOR_DIAG_MODE
  *
  * This function is responsible for preparing driver for diag loopback
  * on device.
  */
 static int
-lpfc_bsg_diag_mode_enter(struct lpfc_hba *phba, struct fc_bsg_job *job)
+lpfc_bsg_diag_mode_enter(struct lpfc_hba *phba)
 {
         struct lpfc_vport **vports;
         struct Scsi_Host *shost;
@@ -1521,7 +1520,6 @@ lpfc_bsg_diag_mode_enter(struct lpfc_hba *phba, struct fc_bsg_job *job)
 /**
  * lpfc_bsg_diag_mode_exit - exit process from device diag loopback mode
  * @phba: Pointer to HBA context object.
- * @job: LPFC_BSG_VENDOR_DIAG_MODE
  *
  * This function is responsible for driver exit processing of setting up
  * diag loopback mode on device.
@@ -1586,7 +1584,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
                 goto job_error;
         }
 
-        rc = lpfc_bsg_diag_mode_enter(phba, job);
+        rc = lpfc_bsg_diag_mode_enter(phba);
         if (rc)
                 goto job_error;
 
@@ -1758,7 +1756,7 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
                 goto job_error;
         }
 
-        rc = lpfc_bsg_diag_mode_enter(phba, job);
+        rc = lpfc_bsg_diag_mode_enter(phba);
         if (rc)
                 goto job_error;
 
@@ -1982,7 +1980,7 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job)
                 goto job_error;
         }
 
-        rc = lpfc_bsg_diag_mode_enter(phba, job);
+        rc = lpfc_bsg_diag_mode_enter(phba);
         if (rc)
                 goto job_error;
 
@@ -3511,7 +3509,7 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
                 lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
                                 "2947 Issued SLI_CONFIG ext-buffer "
                                 "maibox command, rc:x%x\n", rc);
-                return 1;
+                return SLI_CONFIG_HANDLED;
         }
         lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,
                         "2948 Failed to issue SLI_CONFIG ext-buffer "
@@ -3549,7 +3547,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
         LPFC_MBOXQ_t *pmboxq = NULL;
         MAILBOX_t *pmb;
         uint8_t *mbx;
-        int rc = 0, i;
+        int rc = SLI_CONFIG_NOT_HANDLED, i;
 
         mbox_req =
            (struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd;
@@ -3660,7 +3658,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
                         lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
                                         "2955 Issued SLI_CONFIG ext-buffer "
                                         "maibox command, rc:x%x\n", rc);
-                        return 1;
+                        return SLI_CONFIG_HANDLED;
                 }
                 lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,
                                 "2956 Failed to issue SLI_CONFIG ext-buffer "
@@ -3668,6 +3666,11 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
                 rc = -EPIPE;
         }
 
+        /* wait for additoinal external buffers */
+        job->reply->result = 0;
+        job->job_done(job);
+        return SLI_CONFIG_HANDLED;
+
 job_error:
         if (pmboxq)
                 mempool_free(pmboxq, phba->mbox_mem_pool);
@@ -3959,7 +3962,7 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job,
                         lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
                                         "2969 Issued SLI_CONFIG ext-buffer "
                                         "maibox command, rc:x%x\n", rc);
-                        return 1;
+                        return SLI_CONFIG_HANDLED;
                 }
                 lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,
                                 "2970 Failed to issue SLI_CONFIG ext-buffer "
@@ -4039,14 +4042,14 @@ lpfc_bsg_handle_sli_cfg_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
                             struct lpfc_dmabuf *dmabuf)
 {
         struct dfc_mbox_req *mbox_req;
-        int rc;
+        int rc = SLI_CONFIG_NOT_HANDLED;
 
         mbox_req =
            (struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd;
 
         /* mbox command with/without single external buffer */
         if (mbox_req->extMboxTag == 0 && mbox_req->extSeqNum == 0)
-                return SLI_CONFIG_NOT_HANDLED;
+                return rc;
 
         /* mbox command and first external buffer */
         if (phba->mbox_ext_buf_ctx.state == LPFC_BSG_MBOX_IDLE) {
@@ -4249,7 +4252,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
                  * mailbox extension size
                  */
                 if ((transmit_length > receive_length) ||
-                        (transmit_length > MAILBOX_EXT_SIZE)) {
+                        (transmit_length > BSG_MBOX_SIZE - sizeof(MAILBOX_t))) {
                         rc = -ERANGE;
                         goto job_done;
                 }
@@ -4272,7 +4275,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
                 /* receive length cannot be greater than mailbox
                  * extension size
                  */
-                if (receive_length > MAILBOX_EXT_SIZE) {
+                if (receive_length > BSG_MBOX_SIZE - sizeof(MAILBOX_t)) {
                         rc = -ERANGE;
                         goto job_done;
                 }
@@ -4306,7 +4309,8 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
                         bde = (struct ulp_bde64 *)&pmb->un.varWords[4];
 
                         /* bde size cannot be greater than mailbox ext size */
-                        if (bde->tus.f.bdeSize > MAILBOX_EXT_SIZE) {
+                        if (bde->tus.f.bdeSize >
+                            BSG_MBOX_SIZE - sizeof(MAILBOX_t)) {
                                 rc = -ERANGE;
                                 goto job_done;
                         }
@@ -4332,7 +4336,8 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
                                  * mailbox extension size
                                  */
                                 if ((receive_length == 0) ||
-                                    (receive_length > MAILBOX_EXT_SIZE)) {
+                                    (receive_length >
+                                     BSG_MBOX_SIZE - sizeof(MAILBOX_t))) {
                                         rc = -ERANGE;
                                         goto job_done;
                                 }
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 11e26a26b5d1..cc6f7c34ea2a 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -170,15 +170,8 @@ struct lpfc_sli_intf {
 #define LPFC_PCI_FUNC3          3
 #define LPFC_PCI_FUNC4          4
 
-/* SLI4 interface type-2 control register offsets */
-#define LPFC_CTL_PORT_SEM_OFFSET        0x400
-#define LPFC_CTL_PORT_STA_OFFSET        0x404
-#define LPFC_CTL_PORT_CTL_OFFSET        0x408
-#define LPFC_CTL_PORT_ER1_OFFSET        0x40C
-#define LPFC_CTL_PORT_ER2_OFFSET        0x410
+/* SLI4 interface type-2 PDEV_CTL register */
 #define LPFC_CTL_PDEV_CTL_OFFSET        0x414
-
-/* Some SLI4 interface type-2 PDEV_CTL register bits */
 #define LPFC_CTL_PDEV_CTL_DRST          0x00000001
 #define LPFC_CTL_PDEV_CTL_FRST          0x00000002
 #define LPFC_CTL_PDEV_CTL_DD            0x00000004
@@ -515,7 +508,7 @@ struct lpfc_register {
 /* The following BAR0 register sets are defined for if_type 0 and 2 UCNAs. */
 #define LPFC_SLI_INTF                   0x0058
 
-#define LPFC_SLIPORT_IF2_SMPHR          0x0400
+#define LPFC_CTL_PORT_SEM_OFFSET        0x400
 #define lpfc_port_smphr_perr_SHIFT      31
 #define lpfc_port_smphr_perr_MASK       0x1
 #define lpfc_port_smphr_perr_WORD       word0
@@ -575,7 +568,7 @@ struct lpfc_register {
 #define LPFC_POST_STAGE_PORT_READY                      0xC000
 #define LPFC_POST_STAGE_PORT_UE                         0xF000
 
-#define LPFC_SLIPORT_STATUS             0x0404
+#define LPFC_CTL_PORT_STA_OFFSET        0x404
 #define lpfc_sliport_status_err_SHIFT   31
 #define lpfc_sliport_status_err_MASK    0x1
 #define lpfc_sliport_status_err_WORD    word0
@@ -593,7 +586,7 @@ struct lpfc_register {
 #define lpfc_sliport_status_rdy_WORD    word0
 #define MAX_IF_TYPE_2_RESETS    1000
 
-#define LPFC_SLIPORT_CNTRL              0x0408
+#define LPFC_CTL_PORT_CTL_OFFSET        0x408
 #define lpfc_sliport_ctrl_end_SHIFT     30
 #define lpfc_sliport_ctrl_end_MASK      0x1
 #define lpfc_sliport_ctrl_end_WORD      word0
@@ -604,8 +597,8 @@ struct lpfc_register {
 #define lpfc_sliport_ctrl_ip_WORD       word0
 #define LPFC_SLIPORT_INIT_PORT  1
 
-#define LPFC_SLIPORT_ERR_1              0x040C
-#define LPFC_SLIPORT_ERR_2              0x0410
+#define LPFC_CTL_PORT_ER1_OFFSET        0x40C
+#define LPFC_CTL_PORT_ER2_OFFSET        0x410
 
 /* The following Registers apply to SLI4 if_type 0 UCNAs. They typically
  * reside in BAR 2.
@@ -3198,6 +3191,8 @@ struct lpfc_grp_hdr {
 #define lpfc_grp_hdr_id_MASK            0x000000FF
 #define lpfc_grp_hdr_id_WORD            word2
         uint8_t rev_name[128];
+        uint8_t date[12];
+        uint8_t revision[32];
 };
 
 #define FCP_COMMAND 0x0
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 148b98ddbb1d..bf999b2600f4 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2927,6 +2927,8 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)
                                  sizeof fc_host_symbolic_name(shost));
 
         fc_host_supported_speeds(shost) = 0;
+        if (phba->lmt & LMT_16Gb)
+                fc_host_supported_speeds(shost) |= FC_PORTSPEED_16GBIT;
         if (phba->lmt & LMT_10Gb)
                 fc_host_supported_speeds(shost) |= FC_PORTSPEED_10GBIT;
         if (phba->lmt & LMT_8Gb)
@@ -4966,17 +4968,14 @@ out_free_mem:
  * @phba: pointer to lpfc hba data structure.
  *
  * This routine is invoked to post rpi header templates to the
- * HBA consistent with the SLI-4 interface spec.  This routine
+ * port for those SLI4 ports that do not support extents.  This routine
  * posts a PAGE_SIZE memory region to the port to hold up to
- * PAGE_SIZE modulo 64 rpi context headers.
- * No locks are held here because this is an initialization routine
- * called only from probe or lpfc_online when interrupts are not
- * enabled and the driver is reinitializing the device.
+ * PAGE_SIZE modulo 64 rpi context headers.  This is an initialization routine
+ * and should be called only when interrupts are disabled.
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No available memory
- *      -EIO - The mailbox failed to complete successfully.
+ *      -ERROR - otherwise.
  **/
 int
 lpfc_sli4_init_rpi_hdrs(struct lpfc_hba *phba)
@@ -5687,17 +5686,22 @@ lpfc_sli4_bar0_register_memmap(struct lpfc_hba *phba, uint32_t if_type)
                 break;
         case LPFC_SLI_INTF_IF_TYPE_2:
                 phba->sli4_hba.u.if_type2.ERR1regaddr =
-                        phba->sli4_hba.conf_regs_memmap_p + LPFC_SLIPORT_ERR_1;
+                        phba->sli4_hba.conf_regs_memmap_p +
+                                                LPFC_CTL_PORT_ER1_OFFSET;
                 phba->sli4_hba.u.if_type2.ERR2regaddr =
-                        phba->sli4_hba.conf_regs_memmap_p + LPFC_SLIPORT_ERR_2;
+                        phba->sli4_hba.conf_regs_memmap_p +
+                                                LPFC_CTL_PORT_ER2_OFFSET;
                 phba->sli4_hba.u.if_type2.CTRLregaddr =
-                        phba->sli4_hba.conf_regs_memmap_p + LPFC_SLIPORT_CNTRL;
+                        phba->sli4_hba.conf_regs_memmap_p +
+                                                LPFC_CTL_PORT_CTL_OFFSET;
                 phba->sli4_hba.u.if_type2.STATUSregaddr =
-                        phba->sli4_hba.conf_regs_memmap_p + LPFC_SLIPORT_STATUS;
+                        phba->sli4_hba.conf_regs_memmap_p +
+                                                LPFC_CTL_PORT_STA_OFFSET;
                 phba->sli4_hba.SLIINTFregaddr =
                         phba->sli4_hba.conf_regs_memmap_p + LPFC_SLI_INTF;
                 phba->sli4_hba.PSMPHRregaddr =
-                     phba->sli4_hba.conf_regs_memmap_p + LPFC_SLIPORT_IF2_SMPHR;
+                        phba->sli4_hba.conf_regs_memmap_p +
+                                                LPFC_CTL_PORT_SEM_OFFSET;
                 phba->sli4_hba.RQDBregaddr =
                         phba->sli4_hba.conf_regs_memmap_p + LPFC_RQ_DOORBELL;
                 phba->sli4_hba.WQDBregaddr =
@@ -8859,11 +8863,11 @@ lpfc_write_firmware(struct lpfc_hba *phba, const struct firmware *fw)
                 return -EINVAL;
         }
         lpfc_decode_firmware_rev(phba, fwrev, 1);
-        if (strncmp(fwrev, image->rev_name, strnlen(fwrev, 16))) {
+        if (strncmp(fwrev, image->revision, strnlen(image->revision, 16))) {
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                 "3023 Updating Firmware. Current Version:%s "
                                 "New Version:%s\n",
-                                fwrev, image->rev_name);
+                                fwrev, image->revision);
                 for (i = 0; i < LPFC_MBX_WR_CONFIG_MAX_BDE; i++) {
                         dmabuf = kzalloc(sizeof(struct lpfc_dmabuf),
                                          GFP_KERNEL);
@@ -8892,9 +8896,9 @@ lpfc_write_firmware(struct lpfc_hba *phba, const struct firmware *fw)
                                                fw->size - offset);
                                         break;
                                 }
-                                temp_offset += SLI4_PAGE_SIZE;
                                 memcpy(dmabuf->virt, fw->data + temp_offset,
                                        SLI4_PAGE_SIZE);
+                                temp_offset += SLI4_PAGE_SIZE;
                         }
                         rc = lpfc_wr_object(phba, &dma_buffer_list,
                                     (fw->size - offset), &offset);
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 98999bbd8cbf..6740c52e99c4 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -12345,19 +12345,18 @@ lpfc_sli4_post_sgl(struct lpfc_hba *phba,
 }
 
 /**
- * lpfc_sli4_init_rpi_hdrs - Post the rpi header memory region to the port
+ * lpfc_sli4_alloc_xri - Get an available rpi in the device's range
  * @phba: pointer to lpfc hba data structure.
  *
  * This routine is invoked to post rpi header templates to the
- * port for those SLI4 ports that do not support extents.  This routine
- * posts a PAGE_SIZE memory region to the port to hold up to
- * PAGE_SIZE modulo 64 rpi context headers.  This is an initialization routine
- * and should be called only when interrupts are disabled.
+ * HBA consistent with the SLI-4 interface spec.  This routine
+ * posts a SLI4_PAGE_SIZE memory region to the port to hold up to
+ * SLI4_PAGE_SIZE modulo 64 rpi context headers.
  *
- * Return codes
- *      0 - successful
- *      -ERROR - otherwise.
- */
+ * Returns
+ *      A nonzero rpi defined as rpi_base <= rpi < max_rpi if successful
+ *      LPFC_RPI_ALLOC_ERROR if no rpis are available.
+ **/
 uint16_t
 lpfc_sli4_alloc_xri(struct lpfc_hba *phba)
 {
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 4b1703554a26..88387c1c2dcc 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -81,6 +81,8 @@
          (fc_hdr)->fh_f_ctl[1] <<  8 | \
          (fc_hdr)->fh_f_ctl[2])
 
+#define LPFC_FW_RESET_MAXIMUM_WAIT_10MS_CNT 12000
+
 enum lpfc_sli4_queue_type {
         LPFC_EQ,
         LPFC_GCQ,