13 files changed, 127 insertions, 184 deletions

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 5205c4e7d6ff..5758b2566d7f 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -1,4 +1,4 @@
-config SCSI_QLA2XXX
+config SCSI_QLA_FC
         tristate "QLogic QLA2XXX Fibre Channel Support"
         depends on PCI && SCSI
         select SCSI_FC_ATTRS
@@ -22,49 +22,57 @@ config SCSI_QLA2XXX
         Upon request, the driver caches the firmware image until
         the driver is unloaded.
 
+        Firmware images can be retrieved from:
+
+                ftp://ftp.qlogic.com/outgoing/linux/firmware/
+
         NOTE: The original method of building firmware-loader
         modules has been deprecated as the firmware-images will
         be removed from the kernel sources.
 
 config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         bool "  Use firmware-loader modules (DEPRECATED)"
-        depends on SCSI_QLA2XXX
+        depends on SCSI_QLA_FC
+        help
+          This option offers you the deprecated firmware-loader
+          modules that have been obsoleted by the usage of the
+          Firmware Loader interface in the qla2xxx driver.
 
 config SCSI_QLA21XX
         tristate "  Build QLogic ISP2100 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 21xx (ISP2100) host adapter family.
 
 config SCSI_QLA22XX
         tristate "  Build QLogic ISP2200 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 22xx (ISP2200) host adapter family.
 
 config SCSI_QLA2300
         tristate "  Build QLogic ISP2300 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
         adapter family.
 
 config SCSI_QLA2322
         tristate "  Build QLogic ISP2322 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 2322 (ISP2322) host adapter family.
 
 config SCSI_QLA6312
         tristate "  Build QLogic ISP63xx firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
         adapter family.
 
 config SCSI_QLA24XX
         tristate "  Build QLogic ISP24xx firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
         adapter family.
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
index 40c0de125889..d028bc50ccf7 100644
--- a/drivers/scsi/qla2xxx/Makefile
+++ b/drivers/scsi/qla2xxx/Makefile
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
                 qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
 
-obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx.o
+obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 
 qla2100-y := ql2100.o ql2100_fw.o
 qla2200-y := ql2200.o ql2200_fw.o
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 2efca52dff50..b17ee62dd1a9 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -541,7 +541,7 @@ struct fc_function_template qla2xxx_transport_functions = {
 void
 qla2x00_init_host_attr(scsi_qla_host_t *ha)
 {
-        fc_host_node_name(ha->host) = wwn_to_u64(ha->init_cb->node_name);
-        fc_host_port_name(ha->host) = wwn_to_u64(ha->init_cb->port_name);
+        fc_host_node_name(ha->host) = wwn_to_u64(ha->node_name);
+        fc_host_port_name(ha->host) = wwn_to_u64(ha->port_name);
         fc_host_supported_classes(ha->host) = FC_COS_CLASS3;
 }
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 5c5d2315cfab..2d9b12ffe09c 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -1003,10 +1003,10 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
         fw = (struct qla24xx_fw_dump *) ha->fw_dump24;
 
         rval = QLA_SUCCESS;
-        fw->hccr = RD_REG_DWORD(&reg->hccr);
+        fw->host_status = RD_REG_DWORD(&reg->host_status);
 
         /* Pause RISC. */
-        if ((fw->hccr & HCCRX_RISC_PAUSE) == 0) {
+        if ((RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE) == 0) {
                 WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_RESET |
                     HCCRX_CLR_HOST_INT);
                 RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
@@ -1021,16 +1021,54 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
                 }
         }
 
-        /* Disable interrupts. */
-        WRT_REG_DWORD(&reg->ictrl, 0);
-        RD_REG_DWORD(&reg->ictrl);
-
         if (rval == QLA_SUCCESS) {
                 /* Host interface registers. */
                 dmp_reg = (uint32_t __iomem *)(reg + 0);
                 for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
                         fw->host_reg[cnt] = RD_REG_DWORD(dmp_reg++);
 
+                /* Disable interrupts. */
+                WRT_REG_DWORD(&reg->ictrl, 0);
+                RD_REG_DWORD(&reg->ictrl);
+
+                /* Shadow registers. */
+                WRT_REG_DWORD(&reg->iobase_addr, 0x0F70);
+                RD_REG_DWORD(&reg->iobase_addr);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0000000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[0] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0100000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[1] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0200000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[2] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0300000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[3] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0400000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[4] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0500000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[5] = RD_REG_DWORD(dmp_reg);
+
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
+                WRT_REG_DWORD(dmp_reg, 0xB0600000);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
+                fw->shadow_reg[6] = RD_REG_DWORD(dmp_reg);
+
                 /* Mailbox registers. */
                 mbx_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                 for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
@@ -1308,43 +1346,6 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
                 for (cnt = 0; cnt < 16; cnt++)
                         *iter_reg++ = RD_REG_DWORD(dmp_reg++);
 
-                WRT_REG_DWORD(&reg->iobase_addr, 0x0F70);
-                RD_REG_DWORD(&reg->iobase_addr);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0000000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[0] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0100000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[1] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0200000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[2] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0300000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[3] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0400000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[4] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0500000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[5] = RD_REG_DWORD(dmp_reg);
-
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
-                WRT_REG_DWORD(dmp_reg, 0xB0600000);
-                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
-                fw->shadow_reg[6] = RD_REG_DWORD(dmp_reg);
-
                 /* Local memory controller registers. */
                 iter_reg = fw->lmc_reg;
                 WRT_REG_DWORD(&reg->iobase_addr, 0x3000);
@@ -1677,7 +1678,7 @@ qla24xx_ascii_fw_dump(scsi_qla_host_t *ha)
             ha->fw_major_version, ha->fw_minor_version,
             ha->fw_subminor_version, ha->fw_attributes);
 
-        qla_uprintf(&uiter, "\nHCCR Register\n%04x\n", fw->hccr);
+        qla_uprintf(&uiter, "\nR2H Status Register\n%04x\n", fw->host_status);
 
         qla_uprintf(&uiter, "\nHost Interface Registers");
         for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++) {
@@ -1687,6 +1688,14 @@ qla24xx_ascii_fw_dump(scsi_qla_host_t *ha)
                 qla_uprintf(&uiter, "%08x ", fw->host_reg[cnt]);
         }
 
+        qla_uprintf(&uiter, "\n\nShadow Registers");
+        for (cnt = 0; cnt < sizeof(fw->shadow_reg) / 4; cnt++) {
+                if (cnt % 8 == 0)
+                        qla_uprintf(&uiter, "\n");
+
+                qla_uprintf(&uiter, "%08x ", fw->shadow_reg[cnt]);
+        }
+
         qla_uprintf(&uiter, "\n\nMailbox Registers");
         for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++) {
                 if (cnt % 8 == 0)
@@ -1855,14 +1864,6 @@ qla24xx_ascii_fw_dump(scsi_qla_host_t *ha)
                 qla_uprintf(&uiter, "%08x ", fw->risc_gp_reg[cnt]);
         }
 
-        qla_uprintf(&uiter, "\n\nShadow Registers");
-        for (cnt = 0; cnt < sizeof(fw->shadow_reg) / 4; cnt++) {
-                if (cnt % 8 == 0)
-                        qla_uprintf(&uiter, "\n");
-
-                qla_uprintf(&uiter, "%08x ", fw->shadow_reg[cnt]);
-        }
-
         qla_uprintf(&uiter, "\n\nLMC Registers");
         for (cnt = 0; cnt < sizeof(fw->lmc_reg) / 4; cnt++) {
                 if (cnt % 8 == 0)
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 935a59a8c054..ab6afeaa2f2c 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -227,8 +227,9 @@ struct qla2100_fw_dump {
 #define FW_DUMP_SIZE_24XX       0x2B0000
 
 struct qla24xx_fw_dump {
-        uint32_t hccr;
+        uint32_t host_status;
         uint32_t host_reg[32];
+        uint32_t shadow_reg[7];
         uint16_t mailbox_reg[32];
         uint32_t xseq_gp_reg[128];
         uint32_t xseq_0_reg[16];
@@ -250,7 +251,6 @@ struct qla24xx_fw_dump {
         uint32_t rcvt0_data_dma_reg[32];
         uint32_t rcvt1_data_dma_reg[32];
         uint32_t risc_gp_reg[128];
-        uint32_t shadow_reg[7];
         uint32_t lmc_reg[112];
         uint32_t fpm_hdw_reg[192];
         uint32_t fb_hdw_reg[176];
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index bec81adcf4fd..32be4c14cccb 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -62,6 +62,7 @@ extern int qlport_down_retry;
 extern int ql2xplogiabsentdevice;
 extern int ql2xloginretrycount;
 extern int ql2xfdmienable;
+extern int ql2xprocessrscn;
 
 extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
 
@@ -96,10 +97,7 @@ int __qla2x00_marker(scsi_qla_host_t *, uint16_t, uint16_t, uint8_t);
  * Global Function Prototypes in qla_mbx.c source file.
  */
 extern int
-qla2x00_load_ram(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t);
-
-extern int
-qla2x00_load_ram_ext(scsi_qla_host_t *, dma_addr_t, uint32_t, uint32_t);
+qla2x00_load_ram(scsi_qla_host_t *, dma_addr_t, uint32_t, uint32_t);
 
 extern int
 qla2x00_execute_fw(scsi_qla_host_t *, uint32_t);
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index cd6f7c3cfe68..d620a8e8a614 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -538,6 +538,7 @@ qla2x00_rff_id(scsi_qla_host_t *ha)
         ct_req->req.rff_id.port_id[1] = ha->d_id.b.area;
         ct_req->req.rff_id.port_id[2] = ha->d_id.b.al_pa;
 
+        ct_req->req.rff_id.fc4_feature = BIT_1;
         ct_req->req.rff_id.fc4_type = 0x08;             /* SCSI - FCP */
 
         /* Execute MS IOCB */
@@ -1529,9 +1530,9 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
         eiter->len = __constant_cpu_to_be16(4 + 4);
         if (IS_QLA25XX(ha))
-                eiter->a.sup_speed = __constant_cpu_to_be32(4);
-        else if (IS_QLA24XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(8);
+        else if (IS_QLA24XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(4);
         else if (IS_QLA23XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(2);
         else
@@ -1553,9 +1554,6 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
                 eiter->a.cur_speed = __constant_cpu_to_be32(2);
                 break;
         case 3:
-                eiter->a.cur_speed = __constant_cpu_to_be32(8);
-                break;
-        case 4:
                 eiter->a.cur_speed = __constant_cpu_to_be32(4);
                 break;
         }
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7d973bd9022b..a91fea69ad63 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1014,11 +1014,13 @@ qla24xx_update_fw_options(scsi_qla_host_t *ha)
         int rval;
 
         /* Update Serial Link options. */
-        if ((ha->fw_seriallink_options24[0] & BIT_0) == 0)
+        if ((le16_to_cpu(ha->fw_seriallink_options24[0]) & BIT_0) == 0)
                 return;
 
-        rval = qla2x00_set_serdes_params(ha, ha->fw_seriallink_options24[1],
-            ha->fw_seriallink_options24[2], ha->fw_seriallink_options24[3]);
+        rval = qla2x00_set_serdes_params(ha,
+            le16_to_cpu(ha->fw_seriallink_options24[1]),
+            le16_to_cpu(ha->fw_seriallink_options24[2]),
+            le16_to_cpu(ha->fw_seriallink_options24[3]));
         if (rval != QLA_SUCCESS) {
                 qla_printk(KERN_WARNING, ha,
                     "Unable to update Serial Link options (%x).\n", rval);
@@ -1939,6 +1941,9 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                             "information -- get_port_database=%x, "
                             "loop_id=0x%04x\n",
                             ha->host_no, rval2, new_fcport->loop_id));
+                        DEBUG2(printk("scsi(%ld): Scheduling resync...\n",
+                            ha->host_no));
+                        set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
                         continue;
                 }
 
@@ -2648,7 +2653,8 @@ qla2x00_device_resync(scsi_qla_host_t *ha)
 
                 switch (format) {
                 case 0:
-                        if (!IS_QLA2100(ha) && !IS_QLA2200(ha) &&
+                        if (ql2xprocessrscn &&
+                            !IS_QLA2100(ha) && !IS_QLA2200(ha) &&
                             !IS_QLA6312(ha) && !IS_QLA6322(ha) &&
                             !IS_QLA24XX(ha) && !IS_QLA25XX(ha) &&
                             ha->flags.init_done) {
@@ -3402,6 +3408,8 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
         ha->node_name = icb->node_name;
         ha->port_name = icb->port_name;
 
+        icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);
+
         ha->retry_count = le16_to_cpu(nv->login_retry_count);
 
         /* Set minimum login_timeout to 4 seconds. */
@@ -3667,8 +3675,8 @@ qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr)
                         for (i = 0; i < dlen; i++)
                                 dcode[i] = swab32(dcode[i]);
 
-                        rval = qla2x00_load_ram_ext(ha, ha->request_dma,
-                            risc_addr, dlen);
+                        rval = qla2x00_load_ram(ha, ha->request_dma, risc_addr,
+                            dlen);
                         if (rval) {
                                 DEBUG(printk("scsi(%ld):[ERROR] Failed to load "
                                     "segment %d of firmware\n", ha->host_no,
@@ -3868,8 +3876,8 @@ qla24xx_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)
                         for (i = 0; i < dlen; i++)
                                 dcode[i] = swab32(fwcode[i]);
 
-                        rval = qla2x00_load_ram_ext(ha, ha->request_dma,
-                            risc_addr, dlen);
+                        rval = qla2x00_load_ram(ha, ha->request_dma, risc_addr,
+                            dlen);
                         if (rval) {
                                 DEBUG(printk("scsi(%ld):[ERROR] Failed to load "
                                     "segment %d of firmware\n", ha->host_no,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5181d966fecb..f63af081d4ff 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -519,7 +519,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                  * us, create a new entry in our rscn fcports list and handle
                  * the event like an RSCN.
                  */
-                if (!IS_QLA2100(ha) && !IS_QLA2200(ha) && !IS_QLA6312(ha) &&
+                if (ql2xprocessrscn &&
+                    !IS_QLA2100(ha) && !IS_QLA2200(ha) && !IS_QLA6312(ha) &&
                     !IS_QLA6322(ha) && !IS_QLA24XX(ha) && !IS_QLA25XX(ha) &&
                     ha->flags.init_done && mb[1] != 0xffff &&
                     ((ha->operating_mode == P2P && mb[1] != 0) ||
@@ -963,15 +964,16 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                 break;
 
         case CS_DATA_UNDERRUN:
-                DEBUG2(printk(KERN_INFO
-                    "scsi(%ld:%d:%d) UNDERRUN status detected 0x%x-0x%x.\n",
-                    ha->host_no, cp->device->id, cp->device->lun, comp_status,
-                    scsi_status));
-
                 resid = resid_len;
                 if (scsi_status & SS_RESIDUAL_UNDER) {
                         cp->resid = resid;
                         CMD_RESID_LEN(cp) = resid;
+                } else {
+                        DEBUG2(printk(KERN_INFO
+                            "scsi(%ld:%d:%d) UNDERRUN status detected "
+                            "0x%x-0x%x.\n", ha->host_no, cp->device->id,
+                            cp->device->lun, comp_status, scsi_status));
+
                 }
 
                 /*
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 9746cd1e664b..3099b379de9d 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -196,7 +196,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                         /* Check for pending interrupts. */
                         qla2x00_poll(ha);
 
-                        udelay(10); /* v4.27 */
+                        if (command != MBC_LOAD_RISC_RAM_EXTENDED &&
+                            !ha->flags.mbox_int)
+                                msleep(10);
                 } /* while */
         }
 
@@ -325,113 +327,30 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
         return rval;
 }
 
-/*
- * qla2x00_load_ram
- *      Load adapter RAM using DMA.
- *
- * Input:
- *      ha = adapter block pointer.
- *
- * Returns:
- *      qla2x00 local function return status code.
- *
- * Context:
- *      Kernel context.
- */
 int
-qla2x00_load_ram(scsi_qla_host_t *ha, dma_addr_t req_dma, uint16_t risc_addr,
-    uint16_t risc_code_size)
+qla2x00_load_ram(scsi_qla_host_t *ha, dma_addr_t req_dma, uint32_t risc_addr,
+    uint32_t risc_code_size)
 {
         int rval;
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
-        uint32_t        req_len;
-        dma_addr_t      nml_dma;
-        uint32_t        nml_len;
-        uint32_t        normalized;
-
-        DEBUG11(printk("qla2x00_load_ram(%ld): entered.\n",
-            ha->host_no);)
 
-        req_len = risc_code_size;
-        nml_dma = 0;
-        nml_len = 0;
-
-        normalized = qla2x00_normalize_dma_addr(&req_dma, &req_len, &nml_dma,
-            &nml_len);
-
-        /* Load first segment */
-        mcp->mb[0] = MBC_LOAD_RISC_RAM;
-        mcp->mb[1] = risc_addr;
-        mcp->mb[2] = MSW(req_dma);
-        mcp->mb[3] = LSW(req_dma);
-        mcp->mb[4] = (uint16_t)req_len;
-        mcp->mb[6] = MSW(MSD(req_dma));
-        mcp->mb[7] = LSW(MSD(req_dma));
-        mcp->out_mb = MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_0;
-        mcp->tov = 30;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(ha, mcp);
-
-        /* Load second segment - if necessary */
-        if (normalized && (rval == QLA_SUCCESS)) {
-                mcp->mb[0] = MBC_LOAD_RISC_RAM;
-                mcp->mb[1] = risc_addr + (uint16_t)req_len;
-                mcp->mb[2] = MSW(nml_dma);
-                mcp->mb[3] = LSW(nml_dma);
-                mcp->mb[4] = (uint16_t)nml_len;
-                mcp->mb[6] = MSW(MSD(nml_dma));
-                mcp->mb[7] = LSW(MSD(nml_dma));
-                mcp->out_mb = MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-                mcp->in_mb = MBX_0;
-                mcp->tov = 30;
-                mcp->flags = 0;
-                rval = qla2x00_mailbox_command(ha, mcp);
-        }
+        DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
 
-        if (rval == QLA_SUCCESS) {
-                /* Empty */
-                DEBUG11(printk("qla2x00_load_ram(%ld): done.\n", ha->host_no);)
+        if (MSW(risc_addr) || IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED;
+                mcp->mb[8] = MSW(risc_addr);
+                mcp->out_mb = MBX_8|MBX_0;
         } else {
-                /* Empty */
-                DEBUG2_3_11(printk("qla2x00_load_ram(%ld): failed. rval=%x "
-                    "mb[0]=%x.\n", ha->host_no, rval, mcp->mb[0]);)
+                mcp->mb[0] = MBC_LOAD_RISC_RAM;
+                mcp->out_mb = MBX_0;
         }
-        return rval;
-}
-
-/*
- * qla2x00_load_ram_ext
- *      Load adapter extended RAM using DMA.
- *
- * Input:
- *      ha = adapter block pointer.
- *
- * Returns:
- *      qla2x00 local function return status code.
- *
- * Context:
- *      Kernel context.
- */
-int
-qla2x00_load_ram_ext(scsi_qla_host_t *ha, dma_addr_t req_dma,
-    uint32_t risc_addr, uint32_t risc_code_size)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
-
-        mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED;
         mcp->mb[1] = LSW(risc_addr);
         mcp->mb[2] = MSW(req_dma);
         mcp->mb[3] = LSW(req_dma);
         mcp->mb[6] = MSW(MSD(req_dma));
         mcp->mb[7] = LSW(MSD(req_dma));
-        mcp->mb[8] = MSW(risc_addr);
-        mcp->out_mb = MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
+        mcp->out_mb |= MBX_7|MBX_6|MBX_3|MBX_2|MBX_1;
         if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
                 mcp->mb[4] = MSW(risc_code_size);
                 mcp->mb[5] = LSW(risc_code_size);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 24304300d7b5..4916847d84ec 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -71,6 +71,12 @@ MODULE_PARM_DESC(ql2xfdmienable,
                 "Enables FDMI registratons "
                 "Default is 0 - no FDMI. 1 - perfom FDMI.");
 
+int ql2xprocessrscn;
+module_param(ql2xprocessrscn, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xprocessrscn,
+                "Option to enable port RSCN handling via a series of less"
+                "fabric intrusive ADISCs and PLOGIs.");
+
 /*
  * SCSI host template entry points
  */
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index d54d2a99c3d3..f4d755a643e4 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -573,6 +573,9 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
                 }
         } while (0);
 
+        /* Enable flash write-protection. */
+        qla24xx_write_flash_dword(ha, flash_conf_to_access_addr(0x101), 0x9c);
+
         /* Disable flash write. */
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index f7937f7f9c68..d537192a1edb 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.03-k"
+#define QLA2XXX_VERSION      "8.01.04-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
-#define QLA_DRIVER_PATCH_VER    3
+#define QLA_DRIVER_PATCH_VER    4
 #define QLA_DRIVER_BETA_VER     0