1 files changed, 29 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 206bda093da2..a925a3f179f9 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -766,6 +766,29 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
         return ret;
 }
 
+uint8_t *
+qla25xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
+    uint32_t bytes)
+{
+        uint32_t i;
+        uint32_t *dwptr;
+
+        /* Dword reads to flash. */
+        dwptr = (uint32_t *)buf;
+        for (i = 0; i < bytes >> 2; i++, naddr++)
+                dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
+                    flash_data_to_access_addr(FA_VPD_NVRAM_ADDR | naddr)));
+
+        return buf;
+}
+
+int
+qla25xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
+    uint32_t bytes)
+{
+        return qla24xx_write_flash_data(ha, (uint32_t *)buf,
+            FA_VPD_NVRAM_ADDR | naddr, bytes >> 2);
+}
 
 static inline void
 qla2x00_flip_colors(scsi_qla_host_t *ha, uint16_t *pflags)
@@ -919,7 +942,7 @@ qla2x00_beacon_off(struct scsi_qla_host *ha)
         else
                 ha->beacon_color_state = QLA_LED_GRN_ON;
 
-        ha->isp_ops.beacon_blink(ha);   /* This turns green LED off */
+        ha->isp_ops->beacon_blink(ha);  /* This turns green LED off */
 
         ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING;
         ha->fw_options[1] &= ~FO1_DISABLE_GPIO6_7;
@@ -1031,7 +1054,7 @@ qla24xx_beacon_off(struct scsi_qla_host *ha)
         ha->beacon_blink_led = 0;
         ha->beacon_color_state = QLA_LED_ALL_ON;
 
-        ha->isp_ops.beacon_blink(ha);   /* Will flip to all off. */
+        ha->isp_ops->beacon_blink(ha);  /* Will flip to all off. */
 
         /* Give control back to firmware. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -1419,7 +1442,7 @@ qla2x00_suspend_hba(struct scsi_qla_host *ha)
 
         /* Suspend HBA. */
         scsi_block_requests(ha->host);
-        ha->isp_ops.disable_intrs(ha);
+        ha->isp_ops->disable_intrs(ha);
         set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
 
         /* Pause RISC. */
@@ -1705,7 +1728,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 {
         /* Suspend HBA. */
         scsi_block_requests(ha->host);
-        ha->isp_ops.disable_intrs(ha);
+        ha->isp_ops->disable_intrs(ha);
         set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
 
         /* Go with read. */
@@ -1713,7 +1736,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 
         /* Resume HBA. */
         clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
-        ha->isp_ops.enable_intrs(ha);
+        ha->isp_ops->enable_intrs(ha);
         scsi_unblock_requests(ha->host);
 
         return buf;
@@ -1727,7 +1750,7 @@ qla24xx_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 
         /* Suspend HBA. */
         scsi_block_requests(ha->host);
-        ha->isp_ops.disable_intrs(ha);
+        ha->isp_ops->disable_intrs(ha);
         set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
 
         /* Go with write. */