1 files changed, 36 insertions, 54 deletions

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 270ba3130fde..f0528539bbbc 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -908,27 +908,37 @@ qla82xx_wait_rom_done(struct qla_hw_data *ha)
         return 0;
 }
 
+int
+qla82xx_md_rw_32(struct qla_hw_data *ha, uint32_t off, u32 data, uint8_t flag)
+{
+        uint32_t  off_value, rval = 0;
+
+        WRT_REG_DWORD((void *)(CRB_WINDOW_2M + ha->nx_pcibase),
+            (off & 0xFFFF0000));
+
+        /* Read back value to make sure write has gone through */
+        RD_REG_DWORD((void *)(CRB_WINDOW_2M + ha->nx_pcibase));
+        off_value  = (off & 0x0000FFFF);
+
+        if (flag)
+                WRT_REG_DWORD((void *)
+                    (off_value + CRB_INDIRECT_2M + ha->nx_pcibase),
+                    data);
+        else
+                rval = RD_REG_DWORD((void *)
+                    (off_value + CRB_INDIRECT_2M + ha->nx_pcibase));
+
+        return rval;
+}
+
 static int
 qla82xx_do_rom_fast_read(struct qla_hw_data *ha, int addr, int *valp)
 {
-        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
+        /* Dword reads to flash. */
+        qla82xx_md_rw_32(ha, MD_DIRECT_ROM_WINDOW, (addr & 0xFFFF0000), 1);
+        *valp = qla82xx_md_rw_32(ha, MD_DIRECT_ROM_READ_BASE +
+            (addr & 0x0000FFFF), 0, 0);
 
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ADDRESS, addr);
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 3);
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, 0xb);
-        qla82xx_wait_rom_busy(ha);
-        if (qla82xx_wait_rom_done(ha)) {
-                ql_log(ql_log_fatal, vha, 0x00ba,
-                    "Error waiting for rom done.\n");
-                return -1;
-        }
-        /* Reset abyte_cnt and dummy_byte_cnt */
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
-        udelay(10);
-        cond_resched();
-        qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0);
-        *valp = qla82xx_rd_32(ha, QLA82XX_ROMUSB_ROM_RDATA);
         return 0;
 }
 
@@ -2040,8 +2050,8 @@ qla82xx_intr_handler(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                printk(KERN_INFO
-                        "%s(): NULL response queue pointer.\n", __func__);
+                ql_log(ql_log_info, NULL, 0xb054,
+                    "%s: NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
         ha = rsp->hw;
@@ -3136,12 +3146,7 @@ qla82xx_check_md_needed(scsi_qla_host_t *vha)
         fw_minor_version = ha->fw_minor_version;
         fw_subminor_version = ha->fw_subminor_version;
 
-        rval = qla2x00_get_fw_version(vha, &ha->fw_major_version,
-            &ha->fw_minor_version, &ha->fw_subminor_version,
-            &ha->fw_attributes, &ha->fw_memory_size,
-            ha->mpi_version, &ha->mpi_capabilities,
-            ha->phy_version);
-
+        rval = qla2x00_get_fw_version(vha);
         if (rval != QLA_SUCCESS)
                 return rval;
 
@@ -3150,7 +3155,6 @@ qla82xx_check_md_needed(scsi_qla_host_t *vha)
                         if (fw_major_version != ha->fw_major_version ||
                             fw_minor_version != ha->fw_minor_version ||
                             fw_subminor_version != ha->fw_subminor_version) {
-
                                 ql_log(ql_log_info, vha, 0xb02d,
                                     "Firmware version differs "
                                     "Previous version: %d:%d:%d - "
@@ -3614,7 +3618,7 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
                         for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
                                 sp = req->outstanding_cmds[cnt];
                                 if (sp) {
-                                        if (!sp->ctx ||
+                                        if (!sp->u.scmd.ctx ||
                                             (sp->flags & SRB_FCP_CMND_DMA_VALID)) {
                                                 spin_unlock_irqrestore(
                                                     &ha->hardware_lock, flags);
@@ -3645,29 +3649,6 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
 }
 
 /* Minidump related functions */
-int
-qla82xx_md_rw_32(struct qla_hw_data *ha, uint32_t off, u32 data, uint8_t flag)
-{
-        uint32_t  off_value, rval = 0;
-
-        WRT_REG_DWORD((void *)(CRB_WINDOW_2M + ha->nx_pcibase),
-            (off & 0xFFFF0000));
-
-        /* Read back value to make sure write has gone through */
-        RD_REG_DWORD((void *)(CRB_WINDOW_2M + ha->nx_pcibase));
-        off_value  = (off & 0x0000FFFF);
-
-        if (flag)
-                WRT_REG_DWORD((void *)
-                    (off_value + CRB_INDIRECT_2M + ha->nx_pcibase),
-                    data);
-        else
-                rval = RD_REG_DWORD((void *)
-                    (off_value + CRB_INDIRECT_2M + ha->nx_pcibase));
-
-        return rval;
-}
-
 static int
 qla82xx_minidump_process_control(scsi_qla_host_t *vha,
         qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
@@ -4117,8 +4098,9 @@ qla82xx_md_collect(scsi_qla_host_t *vha)
         data_ptr = (uint32_t *)ha->md_dump;
 
         if (ha->fw_dumped) {
-                ql_log(ql_log_info, vha, 0xb037,
-                    "Firmware dump available to retrive\n");
+                ql_log(ql_log_warn, vha, 0xb037,
+                    "Firmware has been previously dumped (%p) "
+                    "-- ignoring request.\n", ha->fw_dump);
                 goto md_failed;
         }
 
@@ -4161,7 +4143,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha)
 
         total_data_size = ha->md_dump_size;
 
-        ql_dbg(ql_log_info, vha, 0xb03d,
+        ql_dbg(ql_dbg_p3p, vha, 0xb03d,
             "Total minidump data_size 0x%x to be captured\n", total_data_size);
 
         /* Check whether template obtained is valid */
@@ -4284,7 +4266,7 @@ skip_nxt_entry:
         }
 
         if (data_collected != total_data_size) {
-                ql_dbg(ql_log_warn, vha, 0xb043,
+                ql_dbg(ql_dbg_p3p, vha, 0xb043,
                     "MiniDump data mismatch: Data collected: [0x%x],"
                     "total_data_size:[0x%x]\n",
                     data_collected, total_data_size);