Patched in Tegra support.

28 files changed, 3353 insertions, 17027 deletions

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 317a7fdc3b8..6208d562890 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -25,12 +25,3 @@ config SCSI_QLA_FC
         Firmware images can be retrieved from:
 
                 ftp://ftp.qlogic.com/outgoing/linux/firmware/
-
-config TCM_QLA2XXX
-        tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
-        depends on SCSI_QLA_FC && TARGET_CORE
-        select LIBFC
-        select BTREE
-        default n
-        ---help---
-        Say Y here to enable the TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
index dce7d788cdc..5df782f4a09 100644
--- a/drivers/scsi/qla2xxx/Makefile
+++ b/drivers/scsi/qla2xxx/Makefile
@@ -1,6 +1,5 @@
 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_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
-        qla_nx.o qla_target.o
+        qla_nx.o
 
 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
-obj-$(CONFIG_TCM_QLA2XXX) += tcm_qla2xxx.o
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 83d798428c1..a31e05f3bfd 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1,11 +1,10 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
-#include "qla_target.h"
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
@@ -24,29 +23,12 @@ qla2x00_sysfs_read_fw_dump(struct file *filp, struct kobject *kobj,
         struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
 
-        if (!(ha->fw_dump_reading || ha->mctp_dump_reading))
+        if (ha->fw_dump_reading == 0)
                 return 0;
 
-        if (IS_QLA82XX(ha)) {
-                if (off < ha->md_template_size) {
-                        rval = memory_read_from_buffer(buf, count,
-                            &off, ha->md_tmplt_hdr, ha->md_template_size);
-                        return rval;
-                }
-                off -= ha->md_template_size;
-                rval = memory_read_from_buffer(buf, count,
-                    &off, ha->md_dump, ha->md_dump_size);
-                return rval;
-        } else if (ha->mctp_dumped && ha->mctp_dump_reading)
-                return memory_read_from_buffer(buf, count, &off, ha->mctp_dump,
-                    MCTP_DUMP_SIZE);
-        else if (ha->fw_dump_reading)
-                return memory_read_from_buffer(buf, count, &off, ha->fw_dump,
+        return memory_read_from_buffer(buf, count, &off, ha->fw_dump,
                                         ha->fw_dump_len);
-        else
-                return 0;
 }
 
 static ssize_t
@@ -59,6 +41,12 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
         int reading;
 
+        if (IS_QLA82XX(ha)) {
+                ql_dbg(ql_dbg_user, vha, 0x705b,
+                    "Firmware dump not supported for ISP82xx\n");
+                return count;
+        }
+
         if (off != 0)
                 return (0);
 
@@ -71,10 +59,6 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
                 ql_log(ql_log_info, vha, 0x705d,
                     "Firmware dump cleared on (%ld).\n", vha->host_no);
 
-                if (IS_QLA82XX(vha->hw)) {
-                        qla82xx_md_free(vha);
-                        qla82xx_md_prep(vha);
-                }
                 ha->fw_dump_reading = 0;
                 ha->fw_dumped = 0;
                 break;
@@ -91,45 +75,10 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
                 qla2x00_alloc_fw_dump(vha);
                 break;
         case 3:
-                if (IS_QLA82XX(ha)) {
-                        qla82xx_idc_lock(ha);
-                        qla82xx_set_reset_owner(vha);
-                        qla82xx_idc_unlock(ha);
-                } else
-                        qla2x00_system_error(vha);
-                break;
-        case 4:
-                if (IS_QLA82XX(ha)) {
-                        if (ha->md_tmplt_hdr)
-                                ql_dbg(ql_dbg_user, vha, 0x705b,
-                                    "MiniDump supported with this firmware.\n");
-                        else
-                                ql_dbg(ql_dbg_user, vha, 0x709d,
-                                    "MiniDump not supported with this firmware.\n");
-                }
-                break;
-        case 5:
-                if (IS_QLA82XX(ha))
-                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                break;
-        case 6:
-                if (!ha->mctp_dump_reading)
-                        break;
-                ql_log(ql_log_info, vha, 0x70c1,
-                    "MCTP dump cleared on (%ld).\n", vha->host_no);
-                ha->mctp_dump_reading = 0;
-                ha->mctp_dumped = 0;
-                break;
-        case 7:
-                if (ha->mctp_dumped && !ha->mctp_dump_reading) {
-                        ha->mctp_dump_reading = 1;
-                        ql_log(ql_log_info, vha, 0x70c2,
-                            "Raw mctp dump ready for read on (%ld).\n",
-                            vha->host_no);
-                }
+                qla2x00_system_error(vha);
                 break;
         }
-        return count;
+        return (count);
 }
 
 static struct bin_attribute sysfs_fw_dump_attr = {
@@ -173,7 +122,7 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,
 
         if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size ||
             !ha->isp_ops->write_nvram)
-                return -EINVAL;
+                return 0;
 
         /* Checksum NVRAM. */
         if (IS_FWI2_CAPABLE(ha)) {
@@ -216,7 +165,7 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,
         qla2xxx_wake_dpc(vha);
         qla2x00_wait_for_chip_reset(vha);
 
-        return count;
+        return (count);
 }
 
 static struct bin_attribute sysfs_nvram_attr = {
@@ -290,10 +239,10 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
         int val, valid;
 
         if (off)
-                return -EINVAL;
+                return 0;
 
         if (unlikely(pci_channel_offline(ha->pdev)))
-                return -EAGAIN;
+                return 0;
 
         if (sscanf(buf, "%d:%x:%x", &val, &start, &size) < 1)
                 return -EINVAL;
@@ -304,7 +253,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
         case 0:
                 if (ha->optrom_state != QLA_SREADING &&
                     ha->optrom_state != QLA_SWRITING)
-                        return -EINVAL;
+                        break;
 
                 ha->optrom_state = QLA_SWAITING;
 
@@ -317,7 +266,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 break;
         case 1:
                 if (ha->optrom_state != QLA_SWAITING)
-                        return -EINVAL;
+                        break;
 
                 ha->optrom_region_start = start;
                 ha->optrom_region_size = start + size > ha->optrom_size ?
@@ -331,7 +280,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                             "(%x).\n", ha->optrom_region_size);
 
                         ha->optrom_state = QLA_SWAITING;
-                        return -ENOMEM;
+                        return count;
                 }
 
                 if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
@@ -350,7 +299,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 break;
         case 2:
                 if (ha->optrom_state != QLA_SWAITING)
-                        return -EINVAL;
+                        break;
 
                 /*
                  * We need to be more restrictive on which FLASH regions are
@@ -378,8 +327,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 else if (start == (ha->flt_region_boot * 4) ||
                     start == (ha->flt_region_fw * 4))
                         valid = 1;
-                else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha)
-                        || IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))
+                else if (IS_QLA25XX(ha) || IS_QLA8XXX_TYPE(ha))
                         valid = 1;
                 if (!valid) {
                         ql_log(ql_log_warn, vha, 0x7065,
@@ -399,7 +347,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                             "(%x)\n", ha->optrom_region_size);
 
                         ha->optrom_state = QLA_SWAITING;
-                        return -ENOMEM;
+                        return count;
                 }
 
                 ql_dbg(ql_dbg_user, vha, 0x7067,
@@ -410,7 +358,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 break;
         case 3:
                 if (ha->optrom_state != QLA_SWRITING)
-                        return -EINVAL;
+                        break;
 
                 if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
                         ql_log(ql_log_warn, vha, 0x7068,
@@ -426,7 +374,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                     ha->optrom_region_start, ha->optrom_region_size);
                 break;
         default:
-                return -EINVAL;
+                count = -EINVAL;
         }
         return count;
 }
@@ -450,10 +398,10 @@ qla2x00_sysfs_read_vpd(struct file *filp, struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
 
         if (unlikely(pci_channel_offline(ha->pdev)))
-                return -EAGAIN;
+                return 0;
 
         if (!capable(CAP_SYS_ADMIN))
-                return -EINVAL;
+                return 0;
 
         if (IS_NOCACHE_VPD_TYPE(ha))
                 ha->isp_ops->read_optrom(vha, ha->vpd, ha->flt_region_vpd << 2,
@@ -490,17 +438,17 @@ qla2x00_sysfs_write_vpd(struct file *filp, struct kobject *kobj,
 
         /* Update flash version information for 4Gb & above. */
         if (!IS_FWI2_CAPABLE(ha))
-                return -EINVAL;
+                goto done;
 
         tmp_data = vmalloc(256);
         if (!tmp_data) {
                 ql_log(ql_log_warn, vha, 0x706b,
                     "Unable to allocate memory for VPD information update.\n");
-                return -ENOMEM;
+                goto done;
         }
         ha->isp_ops->get_flash_version(vha, tmp_data);
         vfree(tmp_data);
-
+done:
         return count;
 }
 
@@ -557,7 +505,8 @@ do_read:
                             "Unable to read SFP data (%x/%x/%x).\n", rval,
                             addr, offset);
 
-                        return -EIO;
+                        count = 0;
+                        break;
                 }
                 memcpy(buf, ha->sfp_data, SFP_BLOCK_SIZE);
                 buf += SFP_BLOCK_SIZE;
@@ -585,10 +534,9 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
         int type;
-        uint32_t idc_control;
 
         if (off != 0)
-                return -EINVAL;
+                return 0;
 
         type = simple_strtol(buf, NULL, 10);
         switch (type) {
@@ -598,52 +546,32 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
 
                 scsi_block_requests(vha->host);
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                if (IS_QLA82XX(ha)) {
-                        ha->flags.isp82xx_no_md_cap = 1;
-                        qla82xx_idc_lock(ha);
-                        qla82xx_set_reset_owner(vha);
-                        qla82xx_idc_unlock(ha);
-                }
                 qla2xxx_wake_dpc(vha);
                 qla2x00_wait_for_chip_reset(vha);
                 scsi_unblock_requests(vha->host);
                 break;
         case 0x2025d:
-                if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
-                        return -EPERM;
+                if (!IS_QLA81XX(ha))
+                        break;
 
                 ql_log(ql_log_info, vha, 0x706f,
                     "Issuing MPI reset.\n");
 
-                if (IS_QLA83XX(ha)) {
-                        uint32_t idc_control;
-
-                        qla83xx_idc_lock(vha, 0);
-                        __qla83xx_get_idc_control(vha, &idc_control);
-                        idc_control |= QLA83XX_IDC_GRACEFUL_RESET;
-                        __qla83xx_set_idc_control(vha, idc_control);
-                        qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE,
-                            QLA8XXX_DEV_NEED_RESET);
-                        qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);
-                        qla83xx_idc_unlock(vha, 0);
-                        break;
-                } else {
-                        /* Make sure FC side is not in reset */
-                        qla2x00_wait_for_hba_online(vha);
-
-                        /* Issue MPI reset */
-                        scsi_block_requests(vha->host);
-                        if (qla81xx_restart_mpi_firmware(vha) != QLA_SUCCESS)
-                                ql_log(ql_log_warn, vha, 0x7070,
-                                    "MPI reset failed.\n");
-                        scsi_unblock_requests(vha->host);
-                        break;
-                }
+                /* Make sure FC side is not in reset */
+                qla2x00_wait_for_hba_online(vha);
+
+                /* Issue MPI reset */
+                scsi_block_requests(vha->host);
+                if (qla81xx_restart_mpi_firmware(vha) != QLA_SUCCESS)
+                        ql_log(ql_log_warn, vha, 0x7070,
+                            "MPI reset failed.\n");
+                scsi_unblock_requests(vha->host);
+                break;
         case 0x2025e:
                 if (!IS_QLA82XX(ha) || vha != base_vha) {
                         ql_log(ql_log_info, vha, 0x7071,
                             "FCoE ctx reset no supported.\n");
-                        return -EPERM;
+                        return count;
                 }
 
                 ql_log(ql_log_info, vha, 0x7072,
@@ -652,29 +580,6 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 qla2xxx_wake_dpc(vha);
                 qla2x00_wait_for_fcoe_ctx_reset(vha);
                 break;
-        case 0x2025f:
-                if (!IS_QLA8031(ha))
-                        return -EPERM;
-                ql_log(ql_log_info, vha, 0x70bc,
-                    "Disabling Reset by IDC control\n");
-                qla83xx_idc_lock(vha, 0);
-                __qla83xx_get_idc_control(vha, &idc_control);
-                idc_control |= QLA83XX_IDC_RESET_DISABLED;
-                __qla83xx_set_idc_control(vha, idc_control);
-                qla83xx_idc_unlock(vha, 0);
-                break;
-        case 0x20260:
-                if (!IS_QLA8031(ha))
-                        return -EPERM;
-                ql_log(ql_log_info, vha, 0x70bd,
-                    "Enabling Reset by IDC control\n");
-                qla83xx_idc_lock(vha, 0);
-                __qla83xx_get_idc_control(vha, &idc_control);
-                idc_control &= ~QLA83XX_IDC_RESET_DISABLED;
-                __qla83xx_set_idc_control(vha, idc_control);
-                qla83xx_idc_unlock(vha, 0);
-                break;
-
         }
         return count;
 }
@@ -689,6 +594,144 @@ static struct bin_attribute sysfs_reset_attr = {
 };
 
 static ssize_t
+qla2x00_sysfs_write_edc(struct file *filp, struct kobject *kobj,
+                        struct bin_attribute *bin_attr,
+                        char *buf, loff_t off, size_t count)
+{
+        struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+        struct qla_hw_data *ha = vha->hw;
+        uint16_t dev, adr, opt, len;
+        int rval;
+
+        ha->edc_data_len = 0;
+
+        if (!capable(CAP_SYS_ADMIN) || off != 0 || count < 8)
+                return 0;
+
+        if (!ha->edc_data) {
+                ha->edc_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
+                    &ha->edc_data_dma);
+                if (!ha->edc_data) {
+                        ql_log(ql_log_warn, vha, 0x7073,
+                            "Unable to allocate memory for EDC write.\n");
+                        return 0;
+                }
+        }
+
+        dev = le16_to_cpup((void *)&buf[0]);
+        adr = le16_to_cpup((void *)&buf[2]);
+        opt = le16_to_cpup((void *)&buf[4]);
+        len = le16_to_cpup((void *)&buf[6]);
+
+        if (!(opt & BIT_0))
+                if (len == 0 || len > DMA_POOL_SIZE || len > count - 8)
+                        return -EINVAL;
+
+        memcpy(ha->edc_data, &buf[8], len);
+
+        rval = qla2x00_write_sfp(vha, ha->edc_data_dma, ha->edc_data,
+            dev, adr, len, opt);
+        if (rval != QLA_SUCCESS) {
+                ql_log(ql_log_warn, vha, 0x7074,
+                    "Unable to write EDC (%x) %02x:%04x:%02x:%02x\n",
+                    rval, dev, adr, opt, len, buf[8]);
+                return 0;
+        }
+
+        return count;
+}
+
+static struct bin_attribute sysfs_edc_attr = {
+        .attr = {
+                .name = "edc",
+                .mode = S_IWUSR,
+        },
+        .size = 0,
+        .write = qla2x00_sysfs_write_edc,
+};
+
+static ssize_t
+qla2x00_sysfs_write_edc_status(struct file *filp, struct kobject *kobj,
+                        struct bin_attribute *bin_attr,
+                        char *buf, loff_t off, size_t count)
+{
+        struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+        struct qla_hw_data *ha = vha->hw;
+        uint16_t dev, adr, opt, len;
+        int rval;
+
+        ha->edc_data_len = 0;
+
+        if (!capable(CAP_SYS_ADMIN) || off != 0 || count < 8)
+                return 0;
+
+        if (!ha->edc_data) {
+                ha->edc_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
+                    &ha->edc_data_dma);
+                if (!ha->edc_data) {
+                        ql_log(ql_log_warn, vha, 0x708c,
+                            "Unable to allocate memory for EDC status.\n");
+                        return 0;
+                }
+        }
+
+        dev = le16_to_cpup((void *)&buf[0]);
+        adr = le16_to_cpup((void *)&buf[2]);
+        opt = le16_to_cpup((void *)&buf[4]);
+        len = le16_to_cpup((void *)&buf[6]);
+
+        if (!(opt & BIT_0))
+                if (len == 0 || len > DMA_POOL_SIZE)
+                        return -EINVAL;
+
+        memset(ha->edc_data, 0, len);
+        rval = qla2x00_read_sfp(vha, ha->edc_data_dma, ha->edc_data,
+                        dev, adr, len, opt);
+        if (rval != QLA_SUCCESS) {
+                ql_log(ql_log_info, vha, 0x7075,
+                    "Unable to write EDC status (%x) %02x:%04x:%02x.\n",
+                    rval, dev, adr, opt, len);
+                return 0;
+        }
+
+        ha->edc_data_len = len;
+
+        return count;
+}
+
+static ssize_t
+qla2x00_sysfs_read_edc_status(struct file *filp, struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
+                           char *buf, loff_t off, size_t count)
+{
+        struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+        struct qla_hw_data *ha = vha->hw;
+
+        if (!capable(CAP_SYS_ADMIN) || off != 0 || count == 0)
+                return 0;
+
+        if (!ha->edc_data || ha->edc_data_len == 0 || ha->edc_data_len > count)
+                return -EINVAL;
+
+        memcpy(buf, ha->edc_data, ha->edc_data_len);
+
+        return ha->edc_data_len;
+}
+
+static struct bin_attribute sysfs_edc_status_attr = {
+        .attr = {
+                .name = "edc_status",
+                .mode = S_IRUSR | S_IWUSR,
+        },
+        .size = 0,
+        .write = qla2x00_sysfs_write_edc_status,
+        .read = qla2x00_sysfs_read_edc_status,
+};
+
+static ssize_t
 qla2x00_sysfs_read_xgmac_stats(struct file *filp, struct kobject *kobj,
                        struct bin_attribute *bin_attr,
                        char *buf, loff_t off, size_t count)
@@ -762,7 +805,7 @@ qla2x00_sysfs_read_dcbx_tlv(struct file *filp, struct kobject *kobj,
         if (!ha->dcbx_tlv) {
                 ql_log(ql_log_warn, vha, 0x7078,
                     "Unable to allocate memory for DCBX TLV read-data.\n");
-                return -ENOMEM;
+                return 0;
         }
 
 do_read:
@@ -774,7 +817,7 @@ do_read:
         if (rval != QLA_SUCCESS) {
                 ql_log(ql_log_warn, vha, 0x7079,
                     "Unable to read DCBX TLV (%x).\n", rval);
-                return -EIO;
+                count = 0;
         }
 
         memcpy(buf, ha->dcbx_tlv, count);
@@ -803,6 +846,8 @@ static struct sysfs_entry {
         { "vpd", &sysfs_vpd_attr, 1 },
         { "sfp", &sysfs_sfp_attr, 1 },
         { "reset", &sysfs_reset_attr, },
+        { "edc", &sysfs_edc_attr, 2 },
+        { "edc_status", &sysfs_edc_status_attr, 2 },
         { "xgmac_stats", &sysfs_xgmac_stats_attr, 3 },
         { "dcbx_tlv", &sysfs_dcbx_tlv_attr, 3 },
         { NULL },
@@ -820,7 +865,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha)
                         continue;
                 if (iter->is4GBp_only == 2 && !IS_QLA25XX(vha->hw))
                         continue;
-                if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))
+                if (iter->is4GBp_only == 3 && !(IS_QLA8XXX_TYPE(vha->hw)))
                         continue;
 
                 ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
@@ -848,7 +893,7 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha)
                         continue;
                 if (iter->is4GBp_only == 2 && !IS_QLA25XX(ha))
                         continue;
-                if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))
+                if (iter->is4GBp_only == 3 && !!(IS_QLA8XXX_TYPE(vha->hw)))
                         continue;
 
                 sysfs_remove_bin_file(&host->shost_gendev.kobj,
@@ -958,7 +1003,8 @@ qla2x00_link_state_show(struct device *dev, struct device_attribute *attr,
             vha->device_flags & DFLG_NO_CABLE)
                 len = snprintf(buf, PAGE_SIZE, "Link Down\n");
         else if (atomic_read(&vha->loop_state) != LOOP_READY ||
-            qla2x00_reset_active(vha))
+            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
                 len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
         else {
                 len = snprintf(buf, PAGE_SIZE, "Link Up - ");
@@ -1153,7 +1199,7 @@ qla2x00_optrom_gold_fw_version_show(struct device *dev,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA81XX(ha))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
@@ -1166,8 +1212,9 @@ qla2x00_total_isp_aborts_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+        struct qla_hw_data *ha = vha->hw;
         return snprintf(buf, PAGE_SIZE, "%d\n",
-            vha->qla_stats.total_isp_aborts);
+            ha->qla_stats.total_isp_aborts);
 }
 
 static ssize_t
@@ -1199,7 +1246,7 @@ qla2x00_mpi_version_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
+        if (!IS_QLA81XX(ha))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
@@ -1214,7 +1261,7 @@ qla2x00_phy_version_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
+        if (!IS_QLA81XX(ha))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
@@ -1237,7 +1284,7 @@ qla2x00_vlan_id_show(struct device *dev, struct device_attribute *attr,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
-        if (!IS_CNA_CAPABLE(vha->hw))
+        if (!IS_QLA8XXX_TYPE(vha->hw))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%d\n", vha->fcoe_vlan_id);
@@ -1249,7 +1296,7 @@ qla2x00_vn_port_mac_address_show(struct device *dev,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
-        if (!IS_CNA_CAPABLE(vha->hw))
+        if (!IS_QLA8XXX_TYPE(vha->hw))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -1279,13 +1326,14 @@ qla2x00_thermal_temp_show(struct device *dev,
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         temp = frac = 0;
-        if (qla2x00_reset_active(vha))
+        if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
                 ql_log(ql_log_warn, vha, 0x707b,
                     "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
                 rval = qla2x00_get_thermal_temp(vha, &temp, &frac);
         if (rval != QLA_SUCCESS)
-                return snprintf(buf, PAGE_SIZE, "\n");
+                temp = frac = 0;
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d\n", temp, frac);
 }
@@ -1298,7 +1346,8 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
         int rval = QLA_FUNCTION_FAILED;
         uint16_t state[5];
 
-        if (qla2x00_reset_active(vha))
+        if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
                 ql_log(ql_log_warn, vha, 0x707c,
                     "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
@@ -1310,49 +1359,6 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
             state[1], state[2], state[3], state[4]);
 }
 
-static ssize_t
-qla2x00_diag_requests_show(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-
-        if (!IS_BIDI_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
-
-        return snprintf(buf, PAGE_SIZE, "%llu\n", vha->bidi_stats.io_count);
-}
-
-static ssize_t
-qla2x00_diag_megabytes_show(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-
-        if (!IS_BIDI_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
-
-        return snprintf(buf, PAGE_SIZE, "%llu\n",
-            vha->bidi_stats.transfer_bytes >> 20);
-}
-
-static ssize_t
-qla2x00_fw_dump_size_show(struct device *dev, struct device_attribute *attr,
-        char *buf)
-{
-        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t size;
-
-        if (!ha->fw_dumped)
-                size = 0;
-        else if (IS_QLA82XX(ha))
-                size = ha->md_template_size + ha->md_dump_size;
-        else
-                size = ha->fw_dump_len;
-
-        return snprintf(buf, PAGE_SIZE, "%d\n", size);
-}
-
 static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL);
 static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
 static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
@@ -1391,9 +1397,6 @@ static DEVICE_ATTR(vn_port_mac_address, S_IRUGO,
 static DEVICE_ATTR(fabric_param, S_IRUGO, qla2x00_fabric_param_show, NULL);
 static DEVICE_ATTR(fw_state, S_IRUGO, qla2x00_fw_state_show, NULL);
 static DEVICE_ATTR(thermal_temp, S_IRUGO, qla2x00_thermal_temp_show, NULL);
-static DEVICE_ATTR(diag_requests, S_IRUGO, qla2x00_diag_requests_show, NULL);
-static DEVICE_ATTR(diag_megabytes, S_IRUGO, qla2x00_diag_megabytes_show, NULL);
-static DEVICE_ATTR(fw_dump_size, S_IRUGO, qla2x00_fw_dump_size_show, NULL);
 
 struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_driver_version,
@@ -1423,9 +1426,6 @@ struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_fw_state,
         &dev_attr_optrom_gold_fw_version,
         &dev_attr_thermal_temp,
-        &dev_attr_diag_requests,
-        &dev_attr_diag_megabytes,
-        &dev_attr_fw_dump_size,
         NULL,
 };
 
@@ -1463,9 +1463,6 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)
         case PORT_SPEED_10GB:
                 speed = FC_PORTSPEED_10GBIT;
                 break;
-        case PORT_SPEED_16GB:
-                speed = FC_PORTSPEED_16GBIT;
-                break;
         }
         fc_host_speed(shost) = speed;
 }
@@ -1615,14 +1612,11 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
          * At this point all fcport's software-states are cleared.  Perform any
          * final cleanup of firmware resources (PCBs and XCBs).
          */
-        if (fcport->loop_id != FC_NO_LOOP_ID) {
-                if (IS_FWI2_CAPABLE(fcport->vha->hw))
-                        fcport->vha->hw->isp_ops->fabric_logout(fcport->vha,
-                            fcport->loop_id, fcport->d_id.b.domain,
-                            fcport->d_id.b.area, fcport->d_id.b.al_pa);
-                else
-                        qla2x00_port_logout(fcport->vha, fcport);
-        }
+        if (fcport->loop_id != FC_NO_LOOP_ID &&
+            !test_bit(UNLOADING, &fcport->vha->dpc_flags))
+                fcport->vha->hw->isp_ops->fabric_logout(fcport->vha,
+                        fcport->loop_id, fcport->d_id.b.domain,
+                        fcport->d_id.b.area, fcport->d_id.b.al_pa);
 }
 
 static int
@@ -1645,7 +1639,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         dma_addr_t stats_dma;
         struct fc_host_statistics *pfc_host_stat;
 
-        pfc_host_stat = &vha->fc_host_stat;
+        pfc_host_stat = &ha->fc_host_stat;
         memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
 
         if (test_bit(UNLOADING, &vha->dpc_flags))
@@ -1666,7 +1660,9 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         if (IS_FWI2_CAPABLE(ha)) {
                 rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma);
         } else if (atomic_read(&base_vha->loop_state) == LOOP_READY &&
-            !qla2x00_reset_active(vha) && !ha->dpc_active) {
+                    !test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) &&
+                    !test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) &&
+                    !ha->dpc_active) {
                 /* Must be in a 'READY' state for statistics retrieval. */
                 rval = qla2x00_get_link_status(base_vha, base_vha->loop_id,
                                                 stats, stats_dma);
@@ -1688,8 +1684,8 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
                 pfc_host_stat->dumped_frames = stats->dumped_frames;
                 pfc_host_stat->nos_count = stats->nos_rcvd;
         }
-        pfc_host_stat->fcp_input_megabytes = vha->qla_stats.input_bytes >> 20;
-        pfc_host_stat->fcp_output_megabytes = vha->qla_stats.output_bytes >> 20;
+        pfc_host_stat->fcp_input_megabytes = ha->qla_stats.input_bytes >> 20;
+        pfc_host_stat->fcp_output_megabytes = ha->qla_stats.output_bytes >> 20;
 
 done_free:
         dma_pool_free(ha->s_dma_pool, stats, stats_dma);
@@ -1733,31 +1729,12 @@ qla2x00_get_host_port_state(struct Scsi_Host *shost)
         scsi_qla_host_t *vha = shost_priv(shost);
         struct scsi_qla_host *base_vha = pci_get_drvdata(vha->hw->pdev);
 
-        if (!base_vha->flags.online) {
+        if (!base_vha->flags.online)
                 fc_host_port_state(shost) = FC_PORTSTATE_OFFLINE;
-                return;
-        }
-
-        switch (atomic_read(&base_vha->loop_state)) {
-        case LOOP_UPDATE:
-                fc_host_port_state(shost) = FC_PORTSTATE_DIAGNOSTICS;
-                break;
-        case LOOP_DOWN:
-                if (test_bit(LOOP_RESYNC_NEEDED, &base_vha->dpc_flags))
-                        fc_host_port_state(shost) = FC_PORTSTATE_DIAGNOSTICS;
-                else
-                        fc_host_port_state(shost) = FC_PORTSTATE_LINKDOWN;
-                break;
-        case LOOP_DEAD:
-                fc_host_port_state(shost) = FC_PORTSTATE_LINKDOWN;
-                break;
-        case LOOP_READY:
-                fc_host_port_state(shost) = FC_PORTSTATE_ONLINE;
-                break;
-        default:
+        else if (atomic_read(&base_vha->loop_state) == LOOP_TIMEOUT)
                 fc_host_port_state(shost) = FC_PORTSTATE_UNKNOWN;
-                break;
-        }
+        else
+                fc_host_port_state(shost) = FC_PORTSTATE_ONLINE;
 }
 
 static int
@@ -1811,7 +1788,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
                 if (ha->fw_attributes & BIT_4) {
-                        int prot = 0, guard;
+                        int prot = 0;
                         vha->flags.difdix_supported = 1;
                         ql_dbg(ql_dbg_user, vha, 0x7082,
                             "Registered for DIF/DIX type 1 and 3 protection.\n");
@@ -1824,14 +1801,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                             | SHOST_DIX_TYPE1_PROTECTION
                             | SHOST_DIX_TYPE2_PROTECTION
                             | SHOST_DIX_TYPE3_PROTECTION);
-
-                        guard = SHOST_DIX_GUARD_CRC;
-
-                        if (IS_PI_IPGUARD_CAPABLE(ha) &&
-                            (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha)))
-                                guard |= SHOST_DIX_GUARD_IP;
-
-                        scsi_host_set_guard(vha->host, guard);
+                        scsi_host_set_guard(vha->host, SHOST_DIX_GUARD_CRC);
                 } else
                         vha->flags.difdix_supported = 0;
         }
@@ -1852,7 +1822,6 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
         fc_host_supported_speeds(vha->host) =
                 fc_host_supported_speeds(base_vha->host);
 
-        qlt_vport_create(vha, ha);
         qla24xx_vport_disable(fc_vport, disable);
 
         if (ha->flags.cpu_affinity_enabled) {
@@ -1873,7 +1842,6 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                         break;
                 }
         }
-
         if (qos) {
                 ret = qla25xx_create_req_que(ha, options, vha->vp_idx, 0, 0,
                         qos);
@@ -1951,8 +1919,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
                             "Queue delete failed.\n");
         }
 
-        ql_log(ql_log_info, vha, 0x7088, "VP[%d] deleted.\n", id);
         scsi_host_put(vha->host);
+        ql_log(ql_log_info, vha, 0x7088, "VP[%d] deleted.\n", id);
         return 0;
 }
 
@@ -2067,16 +2035,12 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
         fc_host_dev_loss_tmo(vha->host) = ha->port_down_retry_count;
         fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name);
         fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name);
-        fc_host_supported_classes(vha->host) = ha->tgt.enable_class_2 ?
-                        (FC_COS_CLASS2|FC_COS_CLASS3) : FC_COS_CLASS3;
+        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
         fc_host_max_npiv_vports(vha->host) = ha->max_npiv_vports;
         fc_host_npiv_vports_inuse(vha->host) = ha->cur_vport_count;
 
-        if (IS_CNA_CAPABLE(ha))
+        if (IS_QLA8XXX_TYPE(ha))
                 speed = FC_PORTSPEED_10GBIT;
-        else if (IS_QLA2031(ha))
-                speed = FC_PORTSPEED_16GBIT | FC_PORTSPEED_8GBIT |
-                    FC_PORTSPEED_4GBIT;
         else if (IS_QLA25XX(ha))
                 speed = FC_PORTSPEED_8GBIT | FC_PORTSPEED_4GBIT |
                     FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 9f34dedcdad..07d1767cd26 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -11,36 +11,28 @@
 #include <linux/delay.h>
 
 /* BSG support for ELS/CT pass through */
-void
-qla2x00_bsg_job_done(void *data, void *ptr, int res)
+inline srb_t *
+qla2x00_get_ctx_bsg_sp(scsi_qla_host_t *vha, fc_port_t *fcport, size_t size)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
-
-        bsg_job->reply->result = res;
-        bsg_job->job_done(bsg_job);
-        sp->free(vha, sp);
-}
-
-void
-qla2x00_bsg_sp_free(void *data, void *ptr)
-{
-        srb_t *sp = (srb_t *)ptr;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
+        srb_t *sp;
         struct qla_hw_data *ha = vha->hw;
+        struct srb_ctx *ctx;
 
-        dma_unmap_sg(&ha->pdev->dev, bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
-
-        dma_unmap_sg(&ha->pdev->dev, bsg_job->reply_payload.sg_list,
-            bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
+        sp = mempool_alloc(ha->srb_mempool, GFP_KERNEL);
+        if (!sp)
+                goto done;
+        ctx = kzalloc(size, GFP_KERNEL);
+        if (!ctx) {
+                mempool_free(sp, ha->srb_mempool);
+                sp = NULL;
+                goto done;
+        }
 
-        if (sp->type == SRB_CT_CMD ||
-            sp->type == SRB_ELS_CMD_HST)
-                kfree(sp->fcport);
-        mempool_free(sp, vha->hw->srb_mempool);
+        memset(sp, 0, sizeof(*sp));
+        sp->fcport = fcport;
+        sp->ctx = ctx;
+done:
+        return sp;
 }
 
 int
@@ -108,11 +100,20 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
         uint32_t len;
         uint32_t oper;
 
-        if (!(IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) || IS_QLA82XX(ha))) {
+        bsg_job->reply->reply_payload_rcv_len = 0;
+
+        if (!(IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))) {
                 ret = -EINVAL;
                 goto exit_fcp_prio_cfg;
         }
 
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
+                ret = -EBUSY;
+                goto exit_fcp_prio_cfg;
+        }
+
         /* Get the sub command */
         oper = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
 
@@ -219,11 +220,9 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
                 break;
         }
 exit_fcp_prio_cfg:
-        if (!ret)
-                bsg_job->job_done(bsg_job);
+        bsg_job->job_done(bsg_job);
         return ret;
 }
-
 static int
 qla2x00_process_els(struct fc_bsg_job *bsg_job)
 {
@@ -237,6 +236,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
         int req_sg_cnt, rsp_sg_cnt;
         int rval =  (DRIVER_ERROR << 16);
         uint16_t nextlid = 0;
+        struct srb_ctx *els;
 
         if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
                 rport = bsg_job->rport;
@@ -298,6 +298,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
 
                 /* Initialize all required  fields of fcport */
                 fcport->vha = vha;
+                fcport->vp_idx = vha->vp_idx;
                 fcport->d_id.b.al_pa =
                         bsg_job->request->rqst_data.h_els.port_id[0];
                 fcport->d_id.b.area =
@@ -342,21 +343,20 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
         }
 
         /* Alloc SRB structure */
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_bsg_sp(vha, fcport, sizeof(struct srb_ctx));
         if (!sp) {
                 rval = -ENOMEM;
                 goto done_unmap_sg;
         }
 
-        sp->type =
+        els = sp->ctx;
+        els->type =
                 (bsg_job->request->msgcode == FC_BSG_RPT_ELS ?
                 SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST);
-        sp->name =
+        els->name =
                 (bsg_job->request->msgcode == FC_BSG_RPT_ELS ?
                 "bsg_els_rpt" : "bsg_els_hst");
-        sp->u.bsg_job = bsg_job;
-        sp->free = qla2x00_bsg_sp_free;
-        sp->done = qla2x00_bsg_job_done;
+        els->u.bsg_job = bsg_job;
 
         ql_dbg(ql_dbg_user, vha, 0x700a,
             "bsg rqst type: %s els type: %x - loop-id=%x "
@@ -368,6 +368,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
         if (rval != QLA_SUCCESS) {
                 ql_log(ql_log_warn, vha, 0x700e,
                     "qla2x00_start_sp failed = %d\n", rval);
+                kfree(sp->ctx);
                 mempool_free(sp, ha->srb_mempool);
                 rval = -EIO;
                 goto done_unmap_sg;
@@ -388,20 +389,6 @@ done:
         return rval;
 }
 
-inline uint16_t
-qla24xx_calc_ct_iocbs(uint16_t dsds)
-{
-        uint16_t iocbs;
-
-        iocbs = 1;
-        if (dsds > 2) {
-                iocbs += (dsds - 2) / 5;
-                if ((dsds - 2) % 5)
-                        iocbs++;
-        }
-        return iocbs;
-}
-
 static int
 qla2x00_process_ct(struct fc_bsg_job *bsg_job)
 {
@@ -414,6 +401,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
         uint16_t loop_id;
         struct fc_port *fcport;
         char  *type = "FC_BSG_HST_CT";
+        struct srb_ctx *ct;
 
         req_sg_cnt =
                 dma_map_sg(&ha->pdev->dev, bsg_job->request_payload.sg_list,
@@ -483,26 +471,25 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
 
         /* Initialize all required  fields of fcport */
         fcport->vha = vha;
+        fcport->vp_idx = vha->vp_idx;
         fcport->d_id.b.al_pa = bsg_job->request->rqst_data.h_ct.port_id[0];
         fcport->d_id.b.area = bsg_job->request->rqst_data.h_ct.port_id[1];
         fcport->d_id.b.domain = bsg_job->request->rqst_data.h_ct.port_id[2];
         fcport->loop_id = loop_id;
 
         /* Alloc SRB structure */
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_bsg_sp(vha, fcport, sizeof(struct srb_ctx));
         if (!sp) {
                 ql_log(ql_log_warn, vha, 0x7015,
-                    "qla2x00_get_sp failed.\n");
+                    "qla2x00_get_ctx_bsg_sp failed.\n");
                 rval = -ENOMEM;
                 goto done_free_fcport;
         }
 
-        sp->type = SRB_CT_CMD;
-        sp->name = "bsg_ct";
-        sp->iocbs = qla24xx_calc_ct_iocbs(req_sg_cnt + rsp_sg_cnt);
-        sp->u.bsg_job = bsg_job;
-        sp->free = qla2x00_bsg_sp_free;
-        sp->done = qla2x00_bsg_job_done;
+        ct = sp->ctx;
+        ct->type = SRB_CT_CMD;
+        ct->name = "bsg_ct";
+        ct->u.bsg_job = bsg_job;
 
         ql_dbg(ql_dbg_user, vha, 0x7016,
             "bsg rqst type: %s else type: %x - "
@@ -515,6 +502,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
         if (rval != QLA_SUCCESS) {
                 ql_log(ql_log_warn, vha, 0x7017,
                     "qla2x00_start_sp failed=%d.\n", rval);
+                kfree(sp->ctx);
                 mempool_free(sp, ha->srb_mempool);
                 rval = -EIO;
                 goto done_free_fcport;
@@ -531,29 +519,23 @@ done_unmap_sg:
 done:
         return rval;
 }
-/*
- * Set the port configuration to enable the internal or external loopback
- * depending on the loopback mode.
+
+/* Set the port configuration to enable the
+ * internal loopback on ISP81XX
  */
 static inline int
-qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,
-        uint16_t *new_config, uint16_t mode)
+qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
+    uint16_t *new_config)
 {
         int ret = 0;
         int rval = 0;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
+        if (!IS_QLA81XX(ha))
                 goto done_set_internal;
 
-        if (mode == INTERNAL_LOOPBACK)
-                new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
-        else if (mode == EXTERNAL_LOOPBACK)
-                new_config[0] = config[0] | (ENABLE_EXTERNAL_LOOPBACK << 1);
-        ql_dbg(ql_dbg_user, vha, 0x70be,
-             "new_config[0]=%02x\n", (new_config[0] & INTERNAL_LOOPBACK_MASK));
-
-        memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3);
+        new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
+        memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3) ;
 
         ha->notify_dcbx_comp = 1;
         ret = qla81xx_set_port_config(vha, new_config);
@@ -569,17 +551,9 @@ qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,
         if (!wait_for_completion_timeout(&ha->dcbx_comp, (20 * HZ))) {
                 ql_dbg(ql_dbg_user, vha, 0x7022,
                     "State change notification not received.\n");
-                rval = -EINVAL;
-        } else {
-                if (ha->flags.idc_compl_status) {
-                        ql_dbg(ql_dbg_user, vha, 0x70c3,
-                            "Bad status in IDC Completion AEN\n");
-                        rval = -EINVAL;
-                        ha->flags.idc_compl_status = 0;
-                } else
-                        ql_dbg(ql_dbg_user, vha, 0x7023,
-                            "State change received.\n");
-        }
+        } else
+                ql_dbg(ql_dbg_user, vha, 0x7023,
+                    "State change received.\n");
 
         ha->notify_dcbx_comp = 0;
 
@@ -587,9 +561,11 @@ done_set_internal:
         return rval;
 }
 
-/* Disable loopback mode */
+/* Set the port configuration to disable the
+ * internal loopback on ISP81XX
+ */
 static inline int
-qla81xx_reset_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,
+qla81xx_reset_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
     int wait)
 {
         int ret = 0;
@@ -597,17 +573,13 @@ qla81xx_reset_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,
         uint16_t new_config[4];
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
+        if (!IS_QLA81XX(ha))
                 goto done_reset_internal;
 
         memset(new_config, 0 , sizeof(new_config));
         if ((config[0] & INTERNAL_LOOPBACK_MASK) >> 1 ==
-            ENABLE_INTERNAL_LOOPBACK ||
-            (config[0] & INTERNAL_LOOPBACK_MASK) >> 1 ==
-            ENABLE_EXTERNAL_LOOPBACK) {
+                        ENABLE_INTERNAL_LOOPBACK) {
                 new_config[0] = config[0] & ~INTERNAL_LOOPBACK_MASK;
-                ql_dbg(ql_dbg_user, vha, 0x70bf, "new_config[0]=%02x\n",
-                    (new_config[0] & INTERNAL_LOOPBACK_MASK));
                 memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3) ;
 
                 ha->notify_dcbx_comp = wait;
@@ -658,6 +630,13 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
         dma_addr_t rsp_data_dma;
         uint32_t rsp_data_len;
 
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
+                ql_log(ql_log_warn, vha, 0x7018, "Abort active or needed.\n");
+                return -EBUSY;
+        }
+
         if (!vha->flags.online) {
                 ql_log(ql_log_warn, vha, 0x7019, "Host is not online.\n");
                 return -EIO;
@@ -724,9 +703,8 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
 
         elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
 
-        if (atomic_read(&vha->loop_state) == LOOP_READY &&
-            (ha->current_topology == ISP_CFG_F ||
-            ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
+        if ((ha->current_topology == ISP_CFG_F ||
+            (IS_QLA81XX(ha) &&
             le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
             && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
                 elreq.options == EXTERNAL_LOOPBACK) {
@@ -736,33 +714,46 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                 command_sent = INT_DEF_LB_ECHO_CMD;
                 rval = qla2x00_echo_test(vha, &elreq, response);
         } else {
-                if (IS_QLA81XX(ha) || IS_QLA8031(ha)) {
+                if (IS_QLA81XX(ha)) {
                         memset(config, 0, sizeof(config));
                         memset(new_config, 0, sizeof(new_config));
                         if (qla81xx_get_port_config(vha, config)) {
                                 ql_log(ql_log_warn, vha, 0x701f,
                                     "Get port config failed.\n");
+                                bsg_job->reply->reply_payload_rcv_len = 0;
+                                bsg_job->reply->result = (DID_ERROR << 16);
                                 rval = -EPERM;
-                                goto done_free_dma_rsp;
+                                goto done_free_dma_req;
                         }
 
-                        ql_dbg(ql_dbg_user, vha, 0x70c0,
-                            "elreq.options=%04x\n", elreq.options);
-
-                        if (elreq.options == EXTERNAL_LOOPBACK)
-                                if (IS_QLA8031(ha))
-                                        rval = qla81xx_set_loopback_mode(vha,
-                                            config, new_config, elreq.options);
-                                else
-                                        rval = qla81xx_reset_loopback_mode(vha,
-                                            config, 1);
-                        else
-                                rval = qla81xx_set_loopback_mode(vha, config,
-                                    new_config, elreq.options);
-
-                        if (rval) {
-                                rval = -EPERM;
-                                goto done_free_dma_rsp;
+                        if (elreq.options != EXTERNAL_LOOPBACK) {
+                                ql_dbg(ql_dbg_user, vha, 0x7020,
+                                    "Internal: curent port config = %x\n",
+                                    config[0]);
+                                if (qla81xx_set_internal_loopback(vha, config,
+                                        new_config)) {
+                                        ql_log(ql_log_warn, vha, 0x7024,
+                                            "Internal loopback failed.\n");
+                                        bsg_job->reply->reply_payload_rcv_len =
+                                                0;
+                                        bsg_job->reply->result =
+                                                (DID_ERROR << 16);
+                                        rval = -EPERM;
+                                        goto done_free_dma_req;
+                                }
+                        } else {
+                                /* For external loopback to work
+                                 * ensure internal loopback is disabled
+                                 */
+                                if (qla81xx_reset_internal_loopback(vha,
+                                        config, 1)) {
+                                        bsg_job->reply->reply_payload_rcv_len =
+                                                0;
+                                        bsg_job->reply->result =
+                                                (DID_ERROR << 16);
+                                        rval = -EPERM;
+                                        goto done_free_dma_req;
+                                }
                         }
 
                         type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -776,7 +767,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                                 /* Revert back to original port config
                                  * Also clear internal loopback
                                  */
-                                qla81xx_reset_loopback_mode(vha,
+                                qla81xx_reset_internal_loopback(vha,
                                     new_config, 0);
                         }
 
@@ -794,8 +785,10 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                                             "MPI reset failed.\n");
                                 }
 
+                                bsg_job->reply->reply_payload_rcv_len = 0;
+                                bsg_job->reply->result = (DID_ERROR << 16);
                                 rval = -EIO;
-                                goto done_free_dma_rsp;
+                                goto done_free_dma_req;
                         }
                 } else {
                         type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -810,27 +803,35 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                 ql_log(ql_log_warn, vha, 0x702c,
                     "Vendor request %s failed.\n", type);
 
+                fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
+                    sizeof(struct fc_bsg_reply);
+
+                memcpy(fw_sts_ptr, response, sizeof(response));
+                fw_sts_ptr += sizeof(response);
+                *fw_sts_ptr = command_sent;
                 rval = 0;
-                bsg_job->reply->result = (DID_ERROR << 16);
                 bsg_job->reply->reply_payload_rcv_len = 0;
+                bsg_job->reply->result = (DID_ERROR << 16);
         } else {
                 ql_dbg(ql_dbg_user, vha, 0x702d,
                     "Vendor request %s completed.\n", type);
-                bsg_job->reply->result = (DID_OK << 16);
+
+                bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
+                        sizeof(response) + sizeof(uint8_t);
+                bsg_job->reply->reply_payload_rcv_len =
+                        bsg_job->reply_payload.payload_len;
+                fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
+                        sizeof(struct fc_bsg_reply);
+                memcpy(fw_sts_ptr, response, sizeof(response));
+                fw_sts_ptr += sizeof(response);
+                *fw_sts_ptr = command_sent;
+                bsg_job->reply->result = DID_OK;
                 sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
                         bsg_job->reply_payload.sg_cnt, rsp_data,
                         rsp_data_len);
         }
+        bsg_job->job_done(bsg_job);
 
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
-            sizeof(response) + sizeof(uint8_t);
-        fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
-            sizeof(struct fc_bsg_reply);
-        memcpy(fw_sts_ptr, response, sizeof(response));
-        fw_sts_ptr += sizeof(response);
-        *fw_sts_ptr = command_sent;
-
-done_free_dma_rsp:
         dma_free_coherent(&ha->pdev->dev, rsp_data_len,
                 rsp_data, rsp_data_dma);
 done_free_dma_req:
@@ -844,8 +845,6 @@ done_unmap_req_sg:
         dma_unmap_sg(&ha->pdev->dev,
             bsg_job->request_payload.sg_list,
             bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
-        if (!rval)
-                bsg_job->job_done(bsg_job);
         return rval;
 }
 
@@ -858,6 +857,13 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
         int rval = 0;
         uint32_t flag;
 
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+            test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
+                ql_log(ql_log_warn, vha, 0x702e, "Abort active or needed.\n");
+                return -EBUSY;
+        }
+
         if (!IS_QLA84XX(ha)) {
                 ql_dbg(ql_dbg_user, vha, 0x702f, "Not 84xx, exiting.\n");
                 return -EINVAL;
@@ -870,15 +876,16 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
         if (rval) {
                 ql_log(ql_log_warn, vha, 0x7030,
                     "Vendor request 84xx reset failed.\n");
-                rval = (DID_ERROR << 16);
+                rval = bsg_job->reply->reply_payload_rcv_len = 0;
+                bsg_job->reply->result = (DID_ERROR << 16);
 
         } else {
                 ql_dbg(ql_dbg_user, vha, 0x7031,
                     "Vendor request 84xx reset completed.\n");
                 bsg_job->reply->result = DID_OK;
-                bsg_job->job_done(bsg_job);
         }
 
+        bsg_job->job_done(bsg_job);
         return rval;
 }
 
@@ -898,6 +905,11 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
         uint32_t flag;
         uint32_t fw_ver;
 
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags))
+                return -EBUSY;
+
         if (!IS_QLA84XX(ha)) {
                 ql_dbg(ql_dbg_user, vha, 0x7032,
                     "Not 84xx, exiting.\n");
@@ -968,7 +980,9 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
                 ql_log(ql_log_warn, vha, 0x7037,
                     "Vendor request 84xx updatefw failed.\n");
 
-                rval = (DID_ERROR << 16);
+                rval = bsg_job->reply->reply_payload_rcv_len = 0;
+                bsg_job->reply->result = (DID_ERROR << 16);
+
         } else {
                 ql_dbg(ql_dbg_user, vha, 0x7038,
                     "Vendor request 84xx updatefw completed.\n");
@@ -977,6 +991,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
                 bsg_job->reply->result = DID_OK;
         }
 
+        bsg_job->job_done(bsg_job);
         dma_pool_free(ha->s_dma_pool, mn, mn_dma);
 
 done_free_fw_buf:
@@ -986,8 +1001,6 @@ done_unmap_sg:
         dma_unmap_sg(&ha->pdev->dev, bsg_job->request_payload.sg_list,
                 bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
 
-        if (!rval)
-                bsg_job->job_done(bsg_job);
         return rval;
 }
 
@@ -1006,6 +1019,14 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
         uint32_t data_len = 0;
         uint32_t dma_direction = DMA_NONE;
 
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
+                ql_log(ql_log_warn, vha, 0x7039,
+                    "Abort active or needed.\n");
+                return -EBUSY;
+        }
+
         if (!IS_QLA84XX(ha)) {
                 ql_log(ql_log_warn, vha, 0x703a,
                     "Not 84xx, exiting.\n");
@@ -1155,7 +1176,8 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
                 ql_log(ql_log_warn, vha, 0x7043,
                     "Vendor request 84xx mgmt failed.\n");
 
-                rval = (DID_ERROR << 16);
+                rval = bsg_job->reply->reply_payload_rcv_len = 0;
+                bsg_job->reply->result = (DID_ERROR << 16);
 
         } else {
                 ql_dbg(ql_dbg_user, vha, 0x7044,
@@ -1175,6 +1197,8 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
                 }
         }
 
+        bsg_job->job_done(bsg_job);
+
 done_unmap_sg:
         if (mgmt_b)
                 dma_free_coherent(&ha->pdev->dev, data_len, mgmt_b, mgmt_dma);
@@ -1189,8 +1213,6 @@ done_unmap_sg:
 exit_mgmt:
         dma_pool_free(ha->s_dma_pool, mn, mn_dma);
 
-        if (!rval)
-                bsg_job->job_done(bsg_job);
         return rval;
 }
 
@@ -1205,6 +1227,15 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         uint8_t *rsp_ptr = NULL;
 
+        bsg_job->reply->reply_payload_rcv_len = 0;
+
+        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
+                ql_log(ql_log_warn, vha, 0x7045, "abort active or needed.\n");
+                return -EBUSY;
+        }
+
         if (!IS_IIDMA_CAPABLE(vha->hw)) {
                 ql_log(ql_log_info, vha, 0x7046, "iiDMA not supported.\n");
                 return -EINVAL;
@@ -1267,7 +1298,9 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
                     fcport->port_name[3], fcport->port_name[4],
                     fcport->port_name[5], fcport->port_name[6],
                     fcport->port_name[7], rval, fcport->fp_speed, mb[0], mb[1]);
-                rval = (DID_ERROR << 16);
+                rval = 0;
+                bsg_job->reply->result = (DID_ERROR << 16);
+
         } else {
                 if (!port_param->mode) {
                         bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
@@ -1281,9 +1314,9 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
                 }
 
                 bsg_job->reply->result = DID_OK;
-                bsg_job->job_done(bsg_job);
         }
 
+        bsg_job->job_done(bsg_job);
         return rval;
 }
 
@@ -1295,6 +1328,8 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
         int valid = 0;
         struct qla_hw_data *ha = vha->hw;
 
+        bsg_job->reply->reply_payload_rcv_len = 0;
+
         if (unlikely(pci_channel_offline(ha->pdev)))
                 return -EINVAL;
 
@@ -1320,7 +1355,7 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
                     start == (ha->flt_region_fw * 4))
                         valid = 1;
                 else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) ||
-                    IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))
+                    IS_QLA8XXX_TYPE(ha))
                         valid = 1;
                 if (!valid) {
                         ql_log(ql_log_warn, vha, 0x7058,
@@ -1364,9 +1399,6 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
         struct qla_hw_data *ha = vha->hw;
         int rval = 0;
 
-        if (ha->flags.nic_core_reset_hdlr_active)
-                return -EBUSY;
-
         rval = qla2x00_optrom_setup(bsg_job, vha, 0);
         if (rval)
                 return rval;
@@ -1399,9 +1431,6 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
         if (rval)
                 return rval;
 
-        /* Set the isp82xx_no_md_cap not to capture minidump */
-        ha->flags.isp82xx_no_md_cap = 1;
-
         sg_copy_to_buffer(bsg_job->request_payload.sg_list,
             bsg_job->request_payload.sg_cnt, ha->optrom_buffer,
             ha->optrom_region_size);
@@ -1418,418 +1447,6 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
 }
 
 static int
-qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
-        uint8_t bsg[DMA_POOL_SIZE];
-        struct qla_image_version_list *list = (void *)bsg;
-        struct qla_image_version *image;
-        uint32_t count;
-        dma_addr_t sfp_dma;
-        void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
-        if (!sfp) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, list, sizeof(bsg));
-
-        image = list->version;
-        count = list->count;
-        while (count--) {
-                memcpy(sfp, &image->field_info, sizeof(image->field_info));
-                rval = qla2x00_write_sfp(vha, sfp_dma, sfp,
-                    image->field_address.device, image->field_address.offset,
-                    sizeof(image->field_info), image->field_address.option);
-                if (rval) {
-                        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                            EXT_STATUS_MAILBOX;
-                        goto dealloc;
-                }
-                image++;
-        }
-
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-
-dealloc:
-        dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
-
-done:
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->result = DID_OK << 16;
-        bsg_job->job_done(bsg_job);
-
-        return 0;
-}
-
-static int
-qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
-        uint8_t bsg[DMA_POOL_SIZE];
-        struct qla_status_reg *sr = (void *)bsg;
-        dma_addr_t sfp_dma;
-        uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
-        if (!sfp) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, sr, sizeof(*sr));
-
-        rval = qla2x00_read_sfp(vha, sfp_dma, sfp,
-            sr->field_address.device, sr->field_address.offset,
-            sizeof(sr->status_reg), sr->field_address.option);
-        sr->status_reg = *sfp;
-
-        if (rval) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_MAILBOX;
-                goto dealloc;
-        }
-
-        sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
-            bsg_job->reply_payload.sg_cnt, sr, sizeof(*sr));
-
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-
-dealloc:
-        dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
-
-done:
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->reply_payload_rcv_len = sizeof(*sr);
-        bsg_job->reply->result = DID_OK << 16;
-        bsg_job->job_done(bsg_job);
-
-        return 0;
-}
-
-static int
-qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
-        uint8_t bsg[DMA_POOL_SIZE];
-        struct qla_status_reg *sr = (void *)bsg;
-        dma_addr_t sfp_dma;
-        uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
-        if (!sfp) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, sr, sizeof(*sr));
-
-        *sfp = sr->status_reg;
-        rval = qla2x00_write_sfp(vha, sfp_dma, sfp,
-            sr->field_address.device, sr->field_address.offset,
-            sizeof(sr->status_reg), sr->field_address.option);
-
-        if (rval) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_MAILBOX;
-                goto dealloc;
-        }
-
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-
-dealloc:
-        dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
-
-done:
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->result = DID_OK << 16;
-        bsg_job->job_done(bsg_job);
-
-        return 0;
-}
-
-static int
-qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
-        uint8_t bsg[DMA_POOL_SIZE];
-        struct qla_i2c_access *i2c = (void *)bsg;
-        dma_addr_t sfp_dma;
-        uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
-        if (!sfp) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, i2c, sizeof(*i2c));
-
-        memcpy(sfp, i2c->buffer, i2c->length);
-        rval = qla2x00_write_sfp(vha, sfp_dma, sfp,
-            i2c->device, i2c->offset, i2c->length, i2c->option);
-
-        if (rval) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_MAILBOX;
-                goto dealloc;
-        }
-
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-
-dealloc:
-        dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
-
-done:
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->result = DID_OK << 16;
-        bsg_job->job_done(bsg_job);
-
-        return 0;
-}
-
-static int
-qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        int rval = 0;
-        uint8_t bsg[DMA_POOL_SIZE];
-        struct qla_i2c_access *i2c = (void *)bsg;
-        dma_addr_t sfp_dma;
-        uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
-        if (!sfp) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, i2c, sizeof(*i2c));
-
-        rval = qla2x00_read_sfp(vha, sfp_dma, sfp,
-                i2c->device, i2c->offset, i2c->length, i2c->option);
-
-        if (rval) {
-                bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-                    EXT_STATUS_MAILBOX;
-                goto dealloc;
-        }
-
-        memcpy(i2c->buffer, sfp, i2c->length);
-        sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
-            bsg_job->reply_payload.sg_cnt, i2c, sizeof(*i2c));
-
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-
-dealloc:
-        dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
-
-done:
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->reply_payload_rcv_len = sizeof(*i2c);
-        bsg_job->reply->result = DID_OK << 16;
-        bsg_job->job_done(bsg_job);
-
-        return 0;
-}
-
-static int
-qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
-{
-        struct Scsi_Host *host = bsg_job->shost;
-        scsi_qla_host_t *vha = shost_priv(host);
-        struct qla_hw_data *ha = vha->hw;
-        uint16_t thread_id;
-        uint32_t rval = EXT_STATUS_OK;
-        uint16_t req_sg_cnt = 0;
-        uint16_t rsp_sg_cnt = 0;
-        uint16_t nextlid = 0;
-        uint32_t tot_dsds;
-        srb_t *sp = NULL;
-        uint32_t req_data_len = 0;
-        uint32_t rsp_data_len = 0;
-
-        /* Check the type of the adapter */
-        if (!IS_BIDI_CAPABLE(ha)) {
-                ql_log(ql_log_warn, vha, 0x70a0,
-                        "This adapter is not supported\n");
-                rval = EXT_STATUS_NOT_SUPPORTED;
-                goto done;
-        }
-
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                rval =  EXT_STATUS_BUSY;
-                goto done;
-        }
-
-        /* Check if host is online */
-        if (!vha->flags.online) {
-                ql_log(ql_log_warn, vha, 0x70a1,
-                        "Host is not online\n");
-                rval = EXT_STATUS_DEVICE_OFFLINE;
-                goto done;
-        }
-
-        /* Check if cable is plugged in or not */
-        if (vha->device_flags & DFLG_NO_CABLE) {
-                ql_log(ql_log_warn, vha, 0x70a2,
-                        "Cable is unplugged...\n");
-                rval = EXT_STATUS_INVALID_CFG;
-                goto done;
-        }
-
-        /* Check if the switch is connected or not */
-        if (ha->current_topology != ISP_CFG_F) {
-                ql_log(ql_log_warn, vha, 0x70a3,
-                        "Host is not connected to the switch\n");
-                rval = EXT_STATUS_INVALID_CFG;
-                goto done;
-        }
-
-        /* Check if operating mode is P2P */
-        if (ha->operating_mode != P2P) {
-                ql_log(ql_log_warn, vha, 0x70a4,
-                    "Host is operating mode is not P2p\n");
-                rval = EXT_STATUS_INVALID_CFG;
-                goto done;
-        }
-
-        thread_id = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-
-        mutex_lock(&ha->selflogin_lock);
-        if (vha->self_login_loop_id == 0) {
-                /* Initialize all required  fields of fcport */
-                vha->bidir_fcport.vha = vha;
-                vha->bidir_fcport.d_id.b.al_pa = vha->d_id.b.al_pa;
-                vha->bidir_fcport.d_id.b.area = vha->d_id.b.area;
-                vha->bidir_fcport.d_id.b.domain = vha->d_id.b.domain;
-                vha->bidir_fcport.loop_id = vha->loop_id;
-
-                if (qla2x00_fabric_login(vha, &(vha->bidir_fcport), &nextlid)) {
-                        ql_log(ql_log_warn, vha, 0x70a7,
-                            "Failed to login port %06X for bidirectional IOCB\n",
-                            vha->bidir_fcport.d_id.b24);
-                        mutex_unlock(&ha->selflogin_lock);
-                        rval = EXT_STATUS_MAILBOX;
-                        goto done;
-                }
-                vha->self_login_loop_id = nextlid - 1;
-
-        }
-        /* Assign the self login loop id to fcport */
-        mutex_unlock(&ha->selflogin_lock);
-
-        vha->bidir_fcport.loop_id = vha->self_login_loop_id;
-
-        req_sg_cnt = dma_map_sg(&ha->pdev->dev,
-                bsg_job->request_payload.sg_list,
-                bsg_job->request_payload.sg_cnt,
-                DMA_TO_DEVICE);
-
-        if (!req_sg_cnt) {
-                rval = EXT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        rsp_sg_cnt = dma_map_sg(&ha->pdev->dev,
-                bsg_job->reply_payload.sg_list, bsg_job->reply_payload.sg_cnt,
-                DMA_FROM_DEVICE);
-
-        if (!rsp_sg_cnt) {
-                rval = EXT_STATUS_NO_MEMORY;
-                goto done_unmap_req_sg;
-        }
-
-        if ((req_sg_cnt !=  bsg_job->request_payload.sg_cnt) ||
-                (rsp_sg_cnt != bsg_job->reply_payload.sg_cnt)) {
-                ql_dbg(ql_dbg_user, vha, 0x70a9,
-                    "Dma mapping resulted in different sg counts "
-                    "[request_sg_cnt: %x dma_request_sg_cnt: %x reply_sg_cnt: "
-                    "%x dma_reply_sg_cnt: %x]\n",
-                    bsg_job->request_payload.sg_cnt, req_sg_cnt,
-                    bsg_job->reply_payload.sg_cnt, rsp_sg_cnt);
-                rval = EXT_STATUS_NO_MEMORY;
-                goto done_unmap_sg;
-        }
-
-        if (req_data_len != rsp_data_len) {
-                rval = EXT_STATUS_BUSY;
-                ql_log(ql_log_warn, vha, 0x70aa,
-                    "req_data_len != rsp_data_len\n");
-                goto done_unmap_sg;
-        }
-
-        req_data_len = bsg_job->request_payload.payload_len;
-        rsp_data_len = bsg_job->reply_payload.payload_len;
-
-
-        /* Alloc SRB structure */
-        sp = qla2x00_get_sp(vha, &(vha->bidir_fcport), GFP_KERNEL);
-        if (!sp) {
-                ql_dbg(ql_dbg_user, vha, 0x70ac,
-                    "Alloc SRB structure failed\n");
-                rval = EXT_STATUS_NO_MEMORY;
-                goto done_unmap_sg;
-        }
-
-        /*Populate srb->ctx with bidir ctx*/
-        sp->u.bsg_job = bsg_job;
-        sp->free = qla2x00_bsg_sp_free;
-        sp->type = SRB_BIDI_CMD;
-        sp->done = qla2x00_bsg_job_done;
-
-        /* Add the read and write sg count */
-        tot_dsds = rsp_sg_cnt + req_sg_cnt;
-
-        rval = qla2x00_start_bidir(sp, vha, tot_dsds);
-        if (rval != EXT_STATUS_OK)
-                goto done_free_srb;
-        /* the bsg request  will be completed in the interrupt handler */
-        return rval;
-
-done_free_srb:
-        mempool_free(sp, ha->srb_mempool);
-done_unmap_sg:
-        dma_unmap_sg(&ha->pdev->dev,
-            bsg_job->reply_payload.sg_list,
-            bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
-done_unmap_req_sg:
-        dma_unmap_sg(&ha->pdev->dev,
-            bsg_job->request_payload.sg_list,
-            bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
-done:
-
-        /* Return an error vendor specific response
-         * and complete the bsg request
-         */
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = rval;
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        bsg_job->reply->reply_payload_rcv_len = 0;
-        bsg_job->reply->result = (DID_OK) << 16;
-        bsg_job->job_done(bsg_job);
-        /* Always retrun success, vendor rsp carries correct status */
-        return 0;
-}
-
-static int
 qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 {
         switch (bsg_job->request->rqst_data.h_vendor.vendor_cmd[0]) {
@@ -1857,25 +1474,9 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
         case QL_VND_UPDATE_FLASH:
                 return qla2x00_update_optrom(bsg_job);
 
-        case QL_VND_SET_FRU_VERSION:
-                return qla2x00_update_fru_versions(bsg_job);
-
-        case QL_VND_READ_FRU_STATUS:
-                return qla2x00_read_fru_status(bsg_job);
-
-        case QL_VND_WRITE_FRU_STATUS:
-                return qla2x00_write_fru_status(bsg_job);
-
-        case QL_VND_WRITE_I2C:
-                return qla2x00_write_i2c(bsg_job);
-
-        case QL_VND_READ_I2C:
-                return qla2x00_read_i2c(bsg_job);
-
-        case QL_VND_DIAG_IO_CMD:
-                return qla24xx_process_bidir_cmd(bsg_job);
-
         default:
+                bsg_job->reply->result = (DID_ERROR << 16);
+                bsg_job->job_done(bsg_job);
                 return -ENOSYS;
         }
 }
@@ -1889,9 +1490,6 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
         struct Scsi_Host *host;
         scsi_qla_host_t *vha;
 
-        /* In case no data transferred. */
-        bsg_job->reply->reply_payload_rcv_len = 0;
-
         if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
                 rport = bsg_job->rport;
                 fcport = *(fc_port_t **) rport->dd_data;
@@ -1902,15 +1500,8 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
                 vha = shost_priv(host);
         }
 
-        if (qla2x00_reset_active(vha)) {
-                ql_dbg(ql_dbg_user, vha, 0x709f,
-                    "BSG: ISP abort active/needed -- cmd=%d.\n",
-                    bsg_job->request->msgcode);
-                return -EBUSY;
-        }
-
         ql_dbg(ql_dbg_user, vha, 0x7000,
-            "Entered %s msgcode=0x%x.\n", __func__, bsg_job->request->msgcode);
+            "Entered %s msgcode=%d.\n", __func__, bsg_job->request->msgcode);
 
         switch (bsg_job->request->msgcode) {
         case FC_BSG_RPT_ELS:
@@ -1942,6 +1533,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
         int cnt, que;
         unsigned long flags;
         struct req_que *req;
+        struct srb_ctx *sp_bsg;
 
         /* find the bsg job from the active list of commands */
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -1953,9 +1545,11 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
                 for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
                         sp = req->outstanding_cmds[cnt];
                         if (sp) {
-                                if (((sp->type == SRB_CT_CMD) ||
-                                        (sp->type == SRB_ELS_CMD_HST))
-                                        && (sp->u.bsg_job == bsg_job)) {
+                                sp_bsg = sp->ctx;
+
+                                if (((sp_bsg->type == SRB_CT_CMD) ||
+                                        (sp_bsg->type == SRB_ELS_CMD_HST))
+                                        && (sp_bsg->u.bsg_job == bsg_job)) {
                                         spin_unlock_irqrestore(&ha->hardware_lock, flags);
                                         if (ha->isp_ops->abort_command(sp)) {
                                                 ql_log(ql_log_warn, vha, 0x7089,
@@ -1985,6 +1579,7 @@ done:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         if (bsg_job->request->msgcode == FC_BSG_HST_CT)
                 kfree(sp->fcport);
+        kfree(sp->ctx);
         mempool_free(sp, ha->srb_mempool);
         return 0;
 }
diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h
index 37b8b7ba742..0f0f54e35f0 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.h
+++ b/drivers/scsi/qla2xxx/qla_bsg.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -16,44 +16,14 @@
 #define QL_VND_FCP_PRIO_CFG_CMD 0x06
 #define QL_VND_READ_FLASH       0x07
 #define QL_VND_UPDATE_FLASH     0x08
-#define QL_VND_SET_FRU_VERSION  0x0B
-#define QL_VND_READ_FRU_STATUS  0x0C
-#define QL_VND_WRITE_FRU_STATUS 0x0D
-#define QL_VND_DIAG_IO_CMD      0x0A
-#define QL_VND_WRITE_I2C        0x10
-#define QL_VND_READ_I2C         0x11
-
-/* BSG Vendor specific subcode returns */
-#define EXT_STATUS_OK                   0
-#define EXT_STATUS_ERR                  1
-#define EXT_STATUS_BUSY                 2
-#define EXT_STATUS_INVALID_PARAM        6
-#define EXT_STATUS_DATA_OVERRUN         7
-#define EXT_STATUS_DATA_UNDERRUN        8
-#define EXT_STATUS_MAILBOX              11
-#define EXT_STATUS_NO_MEMORY            17
-#define EXT_STATUS_DEVICE_OFFLINE       22
-
-/*
- * To support bidirectional iocb
- * BSG Vendor specific returns
- */
-#define EXT_STATUS_NOT_SUPPORTED        27
-#define EXT_STATUS_INVALID_CFG          28
-#define EXT_STATUS_DMA_ERR              29
-#define EXT_STATUS_TIMEOUT              30
-#define EXT_STATUS_THREAD_FAILED        31
-#define EXT_STATUS_DATA_CMP_FAILED      32
 
 /* BSG definations for interpreting CommandSent field */
 #define INT_DEF_LB_LOOPBACK_CMD         0
 #define INT_DEF_LB_ECHO_CMD             1
 
 /* Loopback related definations */
-#define INTERNAL_LOOPBACK               0xF1
 #define EXTERNAL_LOOPBACK               0xF2
 #define ENABLE_INTERNAL_LOOPBACK        0x02
-#define ENABLE_EXTERNAL_LOOPBACK        0x04
 #define INTERNAL_LOOPBACK_MASK          0x000E
 #define MAX_ELS_FRAME_PAYLOAD           252
 #define ELS_OPCODE_BYTE                 0x10
@@ -171,44 +141,4 @@ struct qla_port_param {
         uint16_t mode;
         uint16_t speed;
 } __attribute__ ((packed));
-
-
-/* FRU VPD */
-
-#define MAX_FRU_SIZE    36
-
-struct qla_field_address {
-        uint16_t offset;
-        uint16_t device;
-        uint16_t option;
-} __packed;
-
-struct qla_field_info {
-        uint8_t version[MAX_FRU_SIZE];
-} __packed;
-
-struct qla_image_version {
-        struct qla_field_address field_address;
-        struct qla_field_info field_info;
-} __packed;
-
-struct qla_image_version_list {
-        uint32_t count;
-        struct qla_image_version version[0];
-} __packed;
-
-struct qla_status_reg {
-        struct qla_field_address field_address;
-        uint8_t status_reg;
-        uint8_t reserved[7];
-} __packed;
-
-struct qla_i2c_access {
-        uint16_t device;
-        uint16_t offset;
-        uint16_t option;
-        uint16_t length;
-        uint8_t  buffer[0x40];
-} __packed;
-
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 53f9e492f9d..d79cd8a5f83 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -11,36 +11,20 @@
  * ----------------------------------------------------------------------
  * |             Level            |   Last Value Used  |     Holes      |
  * ----------------------------------------------------------------------
- * | Module Init and Probe        |       0x0125       | 0x4b,0xba,0xfa |
- * | Mailbox commands             |       0x114f       | 0x111a-0x111b  |
- * |                              |                    | 0x112c-0x112e  |
- * |                              |                    | 0x113a         |
- * | Device Discovery             |       0x2087       | 0x2020-0x2022, |
- * |                              |                    | 0x2016         |
- * | Queue Command and IO tracing |       0x3030       | 0x3006-0x300b  |
- * |                              |                    | 0x3027-0x3028  |
- * |                              |                    | 0x302d-0x302e  |
- * | DPC Thread                   |       0x401d       | 0x4002,0x4013  |
- * | Async Events                 |       0x5071       | 0x502b-0x502f  |
- * |                              |                    | 0x5047,0x5052  |
- * | Timer Routines               |       0x6011       |                |
- * | User Space Interactions      |       0x70c3       | 0x7018,0x702e, |
- * |                              |                    | 0x7039,0x7045, |
- * |                              |                    | 0x7073-0x7075, |
- * |                              |                    | 0x708c,        |
- * |                              |                    | 0x70a5,0x70a6, |
- * |                              |                    | 0x70a8,0x70ab, |
- * |                              |                    | 0x70ad-0x70ae  |
- * | Task Management              |       0x803c       | 0x8025-0x8026  |
- * |                              |                    | 0x800b,0x8039  |
- * | AER/EEH                      |       0x9011       |                |
+ * | Module Init and Probe        |       0x0116       |                |
+ * | Mailbox commands             |       0x1126       |                |
+ * | Device Discovery             |       0x2083       |                |
+ * | Queue Command and IO tracing |       0x302e       |     0x3008     |
+ * | DPC Thread                   |       0x401c       |                |
+ * | Async Events                 |       0x5059       |                |
+ * | Timer Routines               |       0x600d       |                |
+ * | User Space Interactions      |       0x709d       |                |
+ * | Task Management              |       0x8041       |                |
+ * | AER/EEH                      |       0x900f       |                |
  * | Virtual Port                 |       0xa007       |                |
- * | ISP82XX Specific             |       0xb084       | 0xb002,0xb024  |
- * | MultiQ                       |       0xc00c       |                |
- * | Misc                         |       0xd010       |                |
- * | Target Mode                  |       0xe06f       |                |
- * | Target Mode Management       |       0xf071       |                |
- * | Target Mode Task Management  |       0x1000b      |                |
+ * | ISP82XX Specific             |       0xb04f       |                |
+ * | MultiQ                       |       0xc00b       |                |
+ * | Misc                         |       0xd00b       |                |
  * ----------------------------------------------------------------------
  */
 
@@ -98,7 +82,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,
         WRT_REG_WORD(&reg->mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
-        dwords = qla2x00_gid_list_size(ha) / 4;
+        dwords = GID_LIST_SIZE / 4;
         for (cnt = 0; cnt < ram_dwords && rval == QLA_SUCCESS;
             cnt += dwords, addr += dwords) {
                 if (cnt + dwords > ram_dwords)
@@ -273,7 +257,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,
         WRT_MAILBOX_REG(ha, reg, 0, MBC_DUMP_RISC_RAM_EXTENDED);
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
-        words = qla2x00_gid_list_size(ha) / 2;
+        words = GID_LIST_SIZE / 2;
         for (cnt = 0; cnt < ram_words && rval == QLA_SUCCESS;
             cnt += words, addr += words) {
                 if (cnt + words > ram_words)
@@ -384,126 +368,7 @@ qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
 
         memcpy(iter_reg, ha->fce, ntohl(fcec->size));
 
-        return (char *)iter_reg + ntohl(fcec->size);
-}
-
-static inline void *
-qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr,
-        uint32_t **last_chain)
-{
-        struct qla2xxx_mqueue_chain *q;
-        struct qla2xxx_mqueue_header *qh;
-        uint32_t num_queues;
-        int que;
-        struct {
-                int length;
-                void *ring;
-        } aq, *aqp;
-
-        if (!ha->tgt.atio_q_length)
-                return ptr;
-
-        num_queues = 1;
-        aqp = &aq;
-        aqp->length = ha->tgt.atio_q_length;
-        aqp->ring = ha->tgt.atio_ring;
-
-        for (que = 0; que < num_queues; que++) {
-                /* aqp = ha->atio_q_map[que]; */
-                q = ptr;
-                *last_chain = &q->type;
-                q->type = __constant_htonl(DUMP_CHAIN_QUEUE);
-                q->chain_size = htonl(
-                    sizeof(struct qla2xxx_mqueue_chain) +
-                    sizeof(struct qla2xxx_mqueue_header) +
-                    (aqp->length * sizeof(request_t)));
-                ptr += sizeof(struct qla2xxx_mqueue_chain);
-
-                /* Add header. */
-                qh = ptr;
-                qh->queue = __constant_htonl(TYPE_ATIO_QUEUE);
-                qh->number = htonl(que);
-                qh->size = htonl(aqp->length * sizeof(request_t));
-                ptr += sizeof(struct qla2xxx_mqueue_header);
-
-                /* Add data. */
-                memcpy(ptr, aqp->ring, aqp->length * sizeof(request_t));
-
-                ptr += aqp->length * sizeof(request_t);
-        }
-
-        return ptr;
-}
-
-static inline void *
-qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
-{
-        struct qla2xxx_mqueue_chain *q;
-        struct qla2xxx_mqueue_header *qh;
-        struct req_que *req;
-        struct rsp_que *rsp;
-        int que;
-
-        if (!ha->mqenable)
-                return ptr;
-
-        /* Request queues */
-        for (que = 1; que < ha->max_req_queues; que++) {
-                req = ha->req_q_map[que];
-                if (!req)
-                        break;
-
-                /* Add chain. */
-                q = ptr;
-                *last_chain = &q->type;
-                q->type = __constant_htonl(DUMP_CHAIN_QUEUE);
-                q->chain_size = htonl(
-                    sizeof(struct qla2xxx_mqueue_chain) +
-                    sizeof(struct qla2xxx_mqueue_header) +
-                    (req->length * sizeof(request_t)));
-                ptr += sizeof(struct qla2xxx_mqueue_chain);
-
-                /* Add header. */
-                qh = ptr;
-                qh->queue = __constant_htonl(TYPE_REQUEST_QUEUE);
-                qh->number = htonl(que);
-                qh->size = htonl(req->length * sizeof(request_t));
-                ptr += sizeof(struct qla2xxx_mqueue_header);
-
-                /* Add data. */
-                memcpy(ptr, req->ring, req->length * sizeof(request_t));
-                ptr += req->length * sizeof(request_t);
-        }
-
-        /* Response queues */
-        for (que = 1; que < ha->max_rsp_queues; que++) {
-                rsp = ha->rsp_q_map[que];
-                if (!rsp)
-                        break;
-
-                /* Add chain. */
-                q = ptr;
-                *last_chain = &q->type;
-                q->type = __constant_htonl(DUMP_CHAIN_QUEUE);
-                q->chain_size = htonl(
-                    sizeof(struct qla2xxx_mqueue_chain) +
-                    sizeof(struct qla2xxx_mqueue_header) +
-                    (rsp->length * sizeof(response_t)));
-                ptr += sizeof(struct qla2xxx_mqueue_chain);
-
-                /* Add header. */
-                qh = ptr;
-                qh->queue = __constant_htonl(TYPE_RESPONSE_QUEUE);
-                qh->number = htonl(que);
-                qh->size = htonl(rsp->length * sizeof(response_t));
-                ptr += sizeof(struct qla2xxx_mqueue_header);
-
-                /* Add data. */
-                memcpy(ptr, rsp->ring, rsp->length * sizeof(response_t));
-                ptr += rsp->length * sizeof(response_t);
-        }
-
-        return ptr;
+        return iter_reg;
 }
 
 static inline void *
@@ -514,7 +379,7 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
         struct qla2xxx_mq_chain *mq = ptr;
         struct device_reg_25xxmq __iomem *reg;
 
-        if (!ha->mqenable || IS_QLA83XX(ha))
+        if (!ha->mqenable)
                 return ptr;
 
         mq = ptr;
@@ -526,8 +391,8 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
                 ha->max_req_queues : ha->max_rsp_queues;
         mq->count = htonl(que_cnt);
         for (cnt = 0; cnt < que_cnt; cnt++) {
-                reg = (struct device_reg_25xxmq __iomem *)
-                        (ha->mqiobase + cnt * QLA_QUE_PAGE);
+                reg = (struct device_reg_25xxmq *) ((void *)
+                        ha->mqiobase + cnt * QLA_QUE_PAGE);
                 que_idx = cnt * 4;
                 mq->qregs[que_idx] = htonl(RD_REG_DWORD(&reg->req_q_in));
                 mq->qregs[que_idx+1] = htonl(RD_REG_DWORD(&reg->req_q_out));
@@ -538,7 +403,7 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
         return ptr + sizeof(struct qla2xxx_mq_chain);
 }
 
-void
+static void
 qla2xxx_dump_post_process(scsi_qla_host_t *vha, int rval)
 {
         struct qla_hw_data *ha = vha->hw;
@@ -930,8 +795,6 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         struct qla24xx_fw_dump *fw;
         uint32_t        ext_mem_cnt;
         void            *nxt;
-        void            *nxt_chain;
-        uint32_t        *last_chain = NULL;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
 
         if (IS_QLA82XX(ha))
@@ -1150,16 +1013,6 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
         qla24xx_copy_eft(ha, nxt);
 
-        nxt_chain = (void *)ha->fw_dump + ha->chain_offset;
-        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
-        if (last_chain) {
-                ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
-                *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
-        }
-
-        /* Adjust valid length. */
-        ha->fw_dump_len = (nxt_chain - (void *)ha->fw_dump);
-
 qla24xx_fw_dump_failed_0:
         qla2xxx_dump_post_process(base_vha, rval);
 
@@ -1466,17 +1319,12 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         nxt = qla24xx_copy_eft(ha, nxt);
 
         /* Chain entries -- started with MQ. */
-        nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
-        nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
-        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
+        qla25xx_copy_fce(ha, nxt_chain, &last_chain);
         if (last_chain) {
                 ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
                 *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
         }
 
-        /* Adjust valid length. */
-        ha->fw_dump_len = (nxt_chain - (void *)ha->fw_dump);
-
 qla25xx_fw_dump_failed_0:
         qla2xxx_dump_post_process(base_vha, rval);
 
@@ -1785,17 +1633,12 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         nxt = qla24xx_copy_eft(ha, nxt);
 
         /* Chain entries -- started with MQ. */
-        nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
-        nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
-        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
+        qla25xx_copy_fce(ha, nxt_chain, &last_chain);
         if (last_chain) {
                 ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
                 *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
         }
 
-        /* Adjust valid length. */
-        ha->fw_dump_len = (nxt_chain - (void *)ha->fw_dump);
-
 qla81xx_fw_dump_failed_0:
         qla2xxx_dump_post_process(base_vha, rval);
 
@@ -1804,520 +1647,9 @@ qla81xx_fw_dump_failed:
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
-void
-qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
-{
-        int             rval;
-        uint32_t        cnt, reg_data;
-        uint32_t        risc_address;
-        struct qla_hw_data *ha = vha->hw;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-        uint32_t __iomem *dmp_reg;
-        uint32_t        *iter_reg;
-        uint16_t __iomem *mbx_reg;
-        unsigned long   flags;
-        struct qla83xx_fw_dump *fw;
-        uint32_t        ext_mem_cnt;
-        void            *nxt, *nxt_chain;
-        uint32_t        *last_chain = NULL;
-        struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
-
-        risc_address = ext_mem_cnt = 0;
-        flags = 0;
-
-        if (!hardware_locked)
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        if (!ha->fw_dump) {
-                ql_log(ql_log_warn, vha, 0xd00c,
-                    "No buffer available for dump!!!\n");
-                goto qla83xx_fw_dump_failed;
-        }
-
-        if (ha->fw_dumped) {
-                ql_log(ql_log_warn, vha, 0xd00d,
-                    "Firmware has been previously dumped (%p) -- ignoring "
-                    "request...\n", ha->fw_dump);
-                goto qla83xx_fw_dump_failed;
-        }
-        fw = &ha->fw_dump->isp.isp83;
-        qla2xxx_prep_dump(ha, ha->fw_dump);
-
-        fw->host_status = htonl(RD_REG_DWORD(&reg->host_status));
-
-        /* Pause RISC. */
-        rval = qla24xx_pause_risc(reg);
-        if (rval != QLA_SUCCESS)
-                goto qla83xx_fw_dump_failed_0;
-
-        WRT_REG_DWORD(&reg->iobase_addr, 0x6000);
-        dmp_reg = &reg->iobase_window;
-        reg_data = RD_REG_DWORD(dmp_reg);
-        WRT_REG_DWORD(dmp_reg, 0);
-
-        dmp_reg = &reg->unused_4_1[0];
-        reg_data = RD_REG_DWORD(dmp_reg);
-        WRT_REG_DWORD(dmp_reg, 0);
-
-        WRT_REG_DWORD(&reg->iobase_addr, 0x6010);
-        dmp_reg = &reg->unused_4_1[2];
-        reg_data = RD_REG_DWORD(dmp_reg);
-        WRT_REG_DWORD(dmp_reg, 0);
-
-        /* select PCR and disable ecc checking and correction */
-        WRT_REG_DWORD(&reg->iobase_addr, 0x0F70);
-        RD_REG_DWORD(&reg->iobase_addr);
-        WRT_REG_DWORD(&reg->iobase_select, 0x60000000); /* write to F0h = PCR */
-
-        /* Host/Risc registers. */
-        iter_reg = fw->host_risc_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7000, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x7010, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7040, 16, iter_reg);
-
-        /* PCIe registers. */
-        WRT_REG_DWORD(&reg->iobase_addr, 0x7C00);
-        RD_REG_DWORD(&reg->iobase_addr);
-        WRT_REG_DWORD(&reg->iobase_window, 0x01);
-        dmp_reg = &reg->iobase_c4;
-        fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg++));
-        fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg++));
-        fw->pcie_regs[2] = htonl(RD_REG_DWORD(dmp_reg));
-        fw->pcie_regs[3] = htonl(RD_REG_DWORD(&reg->iobase_window));
-
-        WRT_REG_DWORD(&reg->iobase_window, 0x00);
-        RD_REG_DWORD(&reg->iobase_window);
-
-        /* Host interface registers. */
-        dmp_reg = &reg->flash_addr;
-        for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
-                fw->host_reg[cnt] = htonl(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);
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0000000);
-        fw->shadow_reg[0] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0100000);
-        fw->shadow_reg[1] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0200000);
-        fw->shadow_reg[2] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0300000);
-        fw->shadow_reg[3] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0400000);
-        fw->shadow_reg[4] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0500000);
-        fw->shadow_reg[5] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0600000);
-        fw->shadow_reg[6] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0700000);
-        fw->shadow_reg[7] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0800000);
-        fw->shadow_reg[8] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0900000);
-        fw->shadow_reg[9] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        WRT_REG_DWORD(&reg->iobase_select, 0xB0A00000);
-        fw->shadow_reg[10] = htonl(RD_REG_DWORD(&reg->iobase_sdata));
-
-        /* RISC I/O register. */
-        WRT_REG_DWORD(&reg->iobase_addr, 0x0010);
-        fw->risc_io_reg = htonl(RD_REG_DWORD(&reg->iobase_window));
-
-        /* Mailbox registers. */
-        mbx_reg = &reg->mailbox0;
-        for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-                fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));
-
-        /* Transfer sequence registers. */
-        iter_reg = fw->xseq_gp_reg;
-        iter_reg = qla24xx_read_window(reg, 0xBE00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBE70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBF60, 16, iter_reg);
-        qla24xx_read_window(reg, 0xBF70, 16, iter_reg);
-
-        iter_reg = fw->xseq_0_reg;
-        iter_reg = qla24xx_read_window(reg, 0xBFC0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xBFD0, 16, iter_reg);
-        qla24xx_read_window(reg, 0xBFE0, 16, iter_reg);
-
-        qla24xx_read_window(reg, 0xBFF0, 16, fw->xseq_1_reg);
-
-        qla24xx_read_window(reg, 0xBEF0, 16, fw->xseq_2_reg);
-
-        /* Receive sequence registers. */
-        iter_reg = fw->rseq_gp_reg;
-        iter_reg = qla24xx_read_window(reg, 0xFE00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFE70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xFF60, 16, iter_reg);
-        qla24xx_read_window(reg, 0xFF70, 16, iter_reg);
-
-        iter_reg = fw->rseq_0_reg;
-        iter_reg = qla24xx_read_window(reg, 0xFFC0, 16, iter_reg);
-        qla24xx_read_window(reg, 0xFFD0, 16, iter_reg);
-
-        qla24xx_read_window(reg, 0xFFE0, 16, fw->rseq_1_reg);
-        qla24xx_read_window(reg, 0xFFF0, 16, fw->rseq_2_reg);
-        qla24xx_read_window(reg, 0xFEF0, 16, fw->rseq_3_reg);
-
-        /* Auxiliary sequence registers. */
-        iter_reg = fw->aseq_gp_reg;
-        iter_reg = qla24xx_read_window(reg, 0xB000, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB010, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB020, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB030, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB040, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB050, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB060, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB070, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB100, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB110, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB120, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB130, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB140, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB150, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0xB160, 16, iter_reg);
-        qla24xx_read_window(reg, 0xB170, 16, iter_reg);
-
-        iter_reg = fw->aseq_0_reg;
-        iter_reg = qla24xx_read_window(reg, 0xB0C0, 16, iter_reg);
-        qla24xx_read_window(reg, 0xB0D0, 16, iter_reg);
-
-        qla24xx_read_window(reg, 0xB0E0, 16, fw->aseq_1_reg);
-        qla24xx_read_window(reg, 0xB0F0, 16, fw->aseq_2_reg);
-        qla24xx_read_window(reg, 0xB1F0, 16, fw->aseq_3_reg);
-
-        /* Command DMA registers. */
-        iter_reg = fw->cmd_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7100, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x7120, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x7130, 16, iter_reg);
-        qla24xx_read_window(reg, 0x71F0, 16, iter_reg);
-
-        /* Queues. */
-        iter_reg = fw->req0_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7200, 8, iter_reg);
-        dmp_reg = &reg->iobase_q;
-        for (cnt = 0; cnt < 7; cnt++)
-                *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
-
-        iter_reg = fw->resp0_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7300, 8, iter_reg);
-        dmp_reg = &reg->iobase_q;
-        for (cnt = 0; cnt < 7; cnt++)
-                *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
-
-        iter_reg = fw->req1_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7400, 8, iter_reg);
-        dmp_reg = &reg->iobase_q;
-        for (cnt = 0; cnt < 7; cnt++)
-                *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
-
-        /* Transmit DMA registers. */
-        iter_reg = fw->xmt0_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7600, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7610, 16, iter_reg);
-
-        iter_reg = fw->xmt1_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7620, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7630, 16, iter_reg);
-
-        iter_reg = fw->xmt2_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7640, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7650, 16, iter_reg);
-
-        iter_reg = fw->xmt3_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7660, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7670, 16, iter_reg);
-
-        iter_reg = fw->xmt4_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7680, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7690, 16, iter_reg);
-
-        qla24xx_read_window(reg, 0x76A0, 16, fw->xmt_data_dma_reg);
-
-        /* Receive DMA registers. */
-        iter_reg = fw->rcvt0_data_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7700, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7710, 16, iter_reg);
-
-        iter_reg = fw->rcvt1_data_dma_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7720, 16, iter_reg);
-        qla24xx_read_window(reg, 0x7730, 16, iter_reg);
-
-        /* RISC registers. */
-        iter_reg = fw->risc_gp_reg;
-        iter_reg = qla24xx_read_window(reg, 0x0F00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x0F60, 16, iter_reg);
-        qla24xx_read_window(reg, 0x0F70, 16, iter_reg);
-
-        /* Local memory controller registers. */
-        iter_reg = fw->lmc_reg;
-        iter_reg = qla24xx_read_window(reg, 0x3000, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3010, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3020, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3030, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3040, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3050, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x3060, 16, iter_reg);
-        qla24xx_read_window(reg, 0x3070, 16, iter_reg);
-
-        /* Fibre Protocol Module registers. */
-        iter_reg = fw->fpm_hdw_reg;
-        iter_reg = qla24xx_read_window(reg, 0x4000, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4010, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4020, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4030, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4040, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4050, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4060, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4070, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4080, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x4090, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x40A0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x40B0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x40C0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x40D0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x40E0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x40F0, 16, iter_reg);
-
-        /* RQ0 Array registers. */
-        iter_reg = fw->rq0_array_reg;
-        iter_reg = qla24xx_read_window(reg, 0x5C00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C80, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5C90, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5CA0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5CB0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5CC0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5CD0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5CE0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x5CF0, 16, iter_reg);
-
-        /* RQ1 Array registers. */
-        iter_reg = fw->rq1_array_reg;
-        iter_reg = qla24xx_read_window(reg, 0x5D00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D80, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5D90, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5DA0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5DB0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5DC0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5DD0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5DE0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x5DF0, 16, iter_reg);
-
-        /* RP0 Array registers. */
-        iter_reg = fw->rp0_array_reg;
-        iter_reg = qla24xx_read_window(reg, 0x5E00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E80, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5E90, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5EA0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5EB0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5EC0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5ED0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5EE0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x5EF0, 16, iter_reg);
-
-        /* RP1 Array registers. */
-        iter_reg = fw->rp1_array_reg;
-        iter_reg = qla24xx_read_window(reg, 0x5F00, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F10, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F20, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F30, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F40, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F50, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F60, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F70, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F80, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5F90, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5FA0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5FB0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5FC0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5FD0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x5FE0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x5FF0, 16, iter_reg);
-
-        iter_reg = fw->at0_array_reg;
-        iter_reg = qla24xx_read_window(reg, 0x7080, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x7090, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x70A0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x70B0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x70C0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x70D0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x70E0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x70F0, 16, iter_reg);
-
-        /* I/O Queue Control registers. */
-        qla24xx_read_window(reg, 0x7800, 16, fw->queue_control_reg);
-
-        /* Frame Buffer registers. */
-        iter_reg = fw->fb_hdw_reg;
-        iter_reg = qla24xx_read_window(reg, 0x6000, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6010, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6020, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6030, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6040, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6060, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6070, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6100, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6130, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6150, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6170, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6190, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x61B0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x61C0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6530, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6540, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6550, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6560, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6570, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6580, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x6590, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x65A0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x65B0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x65C0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x65D0, 16, iter_reg);
-        iter_reg = qla24xx_read_window(reg, 0x65E0, 16, iter_reg);
-        qla24xx_read_window(reg, 0x6F00, 16, iter_reg);
-
-        /* Multi queue registers */
-        nxt_chain = qla25xx_copy_mq(ha, (void *)ha->fw_dump + ha->chain_offset,
-            &last_chain);
-
-        rval = qla24xx_soft_reset(ha);
-        if (rval != QLA_SUCCESS) {
-                ql_log(ql_log_warn, vha, 0xd00e,
-                    "SOFT RESET FAILED, forcing continuation of dump!!!\n");
-                rval = QLA_SUCCESS;
-
-                ql_log(ql_log_warn, vha, 0xd00f, "try a bigger hammer!!!\n");
-
-                WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_RESET);
-                RD_REG_DWORD(&reg->hccr);
-
-                WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-                RD_REG_DWORD(&reg->hccr);
-
-                WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_RESET);
-                RD_REG_DWORD(&reg->hccr);
-
-                for (cnt = 30000; cnt && (RD_REG_WORD(&reg->mailbox0)); cnt--)
-                        udelay(5);
-
-                if (!cnt) {
-                        nxt = fw->code_ram;
-                        nxt += sizeof(fw->code_ram);
-                        nxt += (ha->fw_memory_size - 0x100000 + 1);
-                        goto copy_queue;
-                } else
-                        ql_log(ql_log_warn, vha, 0xd010,
-                            "bigger hammer success?\n");
-        }
-
-        rval = qla24xx_dump_memory(ha, fw->code_ram, sizeof(fw->code_ram),
-            &nxt);
-        if (rval != QLA_SUCCESS)
-                goto qla83xx_fw_dump_failed_0;
-
-copy_queue:
-        nxt = qla2xxx_copy_queues(ha, nxt);
-
-        nxt = qla24xx_copy_eft(ha, nxt);
-
-        /* Chain entries -- started with MQ. */
-        nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
-        nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
-        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
-        if (last_chain) {
-                ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
-                *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
-        }
-
-        /* Adjust valid length. */
-        ha->fw_dump_len = (nxt_chain - (void *)ha->fw_dump);
-
-qla83xx_fw_dump_failed_0:
-        qla2xxx_dump_post_process(base_vha, rval);
-
-qla83xx_fw_dump_failed:
-        if (!hardware_locked)
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
 /****************************************************************************/
 /*                         Driver Debug Functions.                          */
 /****************************************************************************/
-
-static inline int
-ql_mask_match(uint32_t level)
-{
-        if (ql2xextended_error_logging == 1)
-                ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK;
-        return (level & ql2xextended_error_logging) == level;
-}
-
 /*
  * This function is for formatting and logging debug information.
  * It is to be used when vha is available. It formats the message
@@ -2332,37 +1664,40 @@ ql_mask_match(uint32_t level)
  * msg:   The message to be displayed.
  */
 void
-ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)
-{
-        va_list va;
-        struct va_format vaf;
+ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, char *msg, ...) {
 
-        if (!ql_mask_match(level))
-                return;
+        char pbuf[QL_DBG_BUF_LEN];
+        va_list ap;
+        uint32_t len;
+        struct pci_dev *pdev = NULL;
 
-        va_start(va, fmt);
+        memset(pbuf, 0, QL_DBG_BUF_LEN);
 
-        vaf.fmt = fmt;
-        vaf.va = &va;
+        va_start(ap, msg);
 
-        if (vha != NULL) {
-                const struct pci_dev *pdev = vha->hw->pdev;
-                /* <module-name> <pci-name> <msg-id>:<host> Message */
-                pr_warn("%s [%s]-%04x:%ld: %pV",
-                        QL_MSGHDR, dev_name(&(pdev->dev)), id + ql_dbg_offset,
-                        vha->host_no, &vaf);
-        } else {
-                pr_warn("%s [%s]-%04x: : %pV",
-                        QL_MSGHDR, "0000:00:00.0", id + ql_dbg_offset, &vaf);
+        if ((level & ql2xextended_error_logging) == level) {
+                if (vha != NULL) {
+                        pdev = vha->hw->pdev;
+                        /* <module-name> <pci-name> <msg-id>:<host> Message */
+                        sprintf(pbuf, "%s [%s]-%04x:%ld: ", QL_MSGHDR,
+                            dev_name(&(pdev->dev)), id + ql_dbg_offset,
+                            vha->host_no);
+                } else
+                        sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,
+                            "0000:00:00.0", id + ql_dbg_offset);
+
+                len = strlen(pbuf);
+                vsprintf(pbuf+len, msg, ap);
+                pr_warning("%s", pbuf);
         }
 
-        va_end(va);
+        va_end(ap);
 
 }
 
 /*
  * This function is for formatting and logging debug information.
- * It is to be used when vha is not available and pci is available,
+ * It is to be used when vha is not available and pci is availble,
  * i.e., before host allocation. It formats the message and logs it
  * to the messages file.
  * parameters:
@@ -2375,27 +1710,31 @@ ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)
  * msg:   The message to be displayed.
  */
 void
-ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id,
-           const char *fmt, ...)
-{
-        va_list va;
-        struct va_format vaf;
+ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id, char *msg, ...) {
+
+        char pbuf[QL_DBG_BUF_LEN];
+        va_list ap;
+        uint32_t len;
 
         if (pdev == NULL)
                 return;
-        if (!ql_mask_match(level))
-                return;
 
-        va_start(va, fmt);
+        memset(pbuf, 0, QL_DBG_BUF_LEN);
 
-        vaf.fmt = fmt;
-        vaf.va = &va;
+        va_start(ap, msg);
+
+        if ((level & ql2xextended_error_logging) == level) {
+                /* <module-name> <dev-name>:<msg-id> Message */
+                sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,
+                    dev_name(&(pdev->dev)), id + ql_dbg_offset);
+
+                len = strlen(pbuf);
+                vsprintf(pbuf+len, msg, ap);
+                pr_warning("%s", pbuf);
+        }
 
-        /* <module-name> <dev-name>:<msg-id> Message */
-        pr_warn("%s [%s]-%04x: : %pV",
-                QL_MSGHDR, dev_name(&(pdev->dev)), id + ql_dbg_offset, &vaf);
+        va_end(ap);
 
-        va_end(va);
 }
 
 /*
@@ -2412,52 +1751,52 @@ ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id,
  * msg:   The message to be displayed.
  */
 void
-ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)
-{
-        va_list va;
-        struct va_format vaf;
-        char pbuf[128];
+ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, char *msg, ...) {
 
-        if (level > ql_errlev)
-                return;
+        char pbuf[QL_DBG_BUF_LEN];
+        va_list ap;
+        uint32_t len;
+        struct pci_dev *pdev = NULL;
 
-        if (vha != NULL) {
-                const struct pci_dev *pdev = vha->hw->pdev;
-                /* <module-name> <msg-id>:<host> Message */
-                snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x:%ld: ",
-                        QL_MSGHDR, dev_name(&(pdev->dev)), id, vha->host_no);
-        } else {
-                snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x: : ",
-                        QL_MSGHDR, "0000:00:00.0", id);
-        }
-        pbuf[sizeof(pbuf) - 1] = 0;
-
-        va_start(va, fmt);
-
-        vaf.fmt = fmt;
-        vaf.va = &va;
-
-        switch (level) {
-        case ql_log_fatal: /* FATAL LOG */
-                pr_crit("%s%pV", pbuf, &vaf);
-                break;
-        case ql_log_warn:
-                pr_err("%s%pV", pbuf, &vaf);
-                break;
-        case ql_log_info:
-                pr_warn("%s%pV", pbuf, &vaf);
-                break;
-        default:
-                pr_info("%s%pV", pbuf, &vaf);
-                break;
+        memset(pbuf, 0, QL_DBG_BUF_LEN);
+
+        va_start(ap, msg);
+
+        if (level <= ql_errlev) {
+                if (vha != NULL) {
+                        pdev = vha->hw->pdev;
+                        /* <module-name> <msg-id>:<host> Message */
+                        sprintf(pbuf, "%s [%s]-%04x:%ld: ", QL_MSGHDR,
+                            dev_name(&(pdev->dev)), id, vha->host_no);
+                } else
+                        sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,
+                            "0000:00:00.0", id);
+
+                len = strlen(pbuf);
+                        vsprintf(pbuf+len, msg, ap);
+
+                switch (level) {
+                case 0: /* FATAL LOG */
+                        pr_crit("%s", pbuf);
+                        break;
+                case 1:
+                        pr_err("%s", pbuf);
+                        break;
+                case 2:
+                        pr_warn("%s", pbuf);
+                        break;
+                default:
+                        pr_info("%s", pbuf);
+                        break;
+                }
         }
 
-        va_end(va);
+        va_end(ap);
 }
 
 /*
  * This function is for formatting and logging log messages.
- * It is to be used when vha is not available and pci is available,
+ * It is to be used when vha is not available and pci is availble,
  * i.e., before host allocation. It formats the message and logs
  * it to the messages file. All the messages are logged irrespective
  * of the value of ql2xextended_error_logging.
@@ -2470,44 +1809,43 @@ ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)
  * msg:   The message to be displayed.
  */
 void
-ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id,
-           const char *fmt, ...)
-{
-        va_list va;
-        struct va_format vaf;
-        char pbuf[128];
+ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id, char *msg, ...) {
+
+        char pbuf[QL_DBG_BUF_LEN];
+        va_list ap;
+        uint32_t len;
 
         if (pdev == NULL)
                 return;
-        if (level > ql_errlev)
-                return;
 
-        /* <module-name> <dev-name>:<msg-id> Message */
-        snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x: : ",
-                 QL_MSGHDR, dev_name(&(pdev->dev)), id);
-        pbuf[sizeof(pbuf) - 1] = 0;
-
-        va_start(va, fmt);
-
-        vaf.fmt = fmt;
-        vaf.va = &va;
-
-        switch (level) {
-        case ql_log_fatal: /* FATAL LOG */
-                pr_crit("%s%pV", pbuf, &vaf);
-                break;
-        case ql_log_warn:
-                pr_err("%s%pV", pbuf, &vaf);
-                break;
-        case ql_log_info:
-                pr_warn("%s%pV", pbuf, &vaf);
-                break;
-        default:
-                pr_info("%s%pV", pbuf, &vaf);
-                break;
+        memset(pbuf, 0, QL_DBG_BUF_LEN);
+
+        va_start(ap, msg);
+
+        if (level <= ql_errlev) {
+                /* <module-name> <dev-name>:<msg-id> Message */
+                sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,
+                    dev_name(&(pdev->dev)), id);
+
+                len = strlen(pbuf);
+                vsprintf(pbuf+len, msg, ap);
+                switch (level) {
+                case 0: /* FATAL LOG */
+                        pr_crit("%s", pbuf);
+                        break;
+                case 1:
+                        pr_err("%s", pbuf);
+                        break;
+                case 2:
+                        pr_warn("%s", pbuf);
+                        break;
+                default:
+                        pr_info("%s", pbuf);
+                        break;
+                }
         }
 
-        va_end(va);
+        va_end(ap);
 }
 
 void
@@ -2520,20 +1858,20 @@ ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)
         struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;
         uint16_t __iomem *mbx_reg;
 
-        if (!ql_mask_match(level))
-                return;
+        if ((level & ql2xextended_error_logging) == level) {
 
-        if (IS_QLA82XX(ha))
-                mbx_reg = &reg82->mailbox_in[0];
-        else if (IS_FWI2_CAPABLE(ha))
-                mbx_reg = &reg24->mailbox0;
-        else
-                mbx_reg = MAILBOX_REG(ha, reg, 0);
-
-        ql_dbg(level, vha, id, "Mailbox registers:\n");
-        for (i = 0; i < 6; i++)
-                ql_dbg(level, vha, id,
-                    "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));
+                if (IS_QLA82XX(ha))
+                        mbx_reg = &reg82->mailbox_in[0];
+                else if (IS_FWI2_CAPABLE(ha))
+                        mbx_reg = &reg24->mailbox0;
+                else
+                        mbx_reg = MAILBOX_REG(ha, reg, 0);
+
+                ql_dbg(level, vha, id, "Mailbox registers:\n");
+                for (i = 0; i < 6; i++)
+                        ql_dbg(level, vha, id,
+                            "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));
+        }
 }
 
 
@@ -2543,25 +1881,24 @@ ql_dump_buffer(uint32_t level, scsi_qla_host_t *vha, int32_t id,
 {
         uint32_t cnt;
         uint8_t c;
-
-        if (!ql_mask_match(level))
-                return;
-
-        ql_dbg(level, vha, id, " 0   1   2   3   4   5   6   7   8   "
-            "9  Ah  Bh  Ch  Dh  Eh  Fh\n");
-        ql_dbg(level, vha, id, "----------------------------------"
-            "----------------------------\n");
-
-        ql_dbg(level, vha, id, " ");
-        for (cnt = 0; cnt < size;) {
-                c = *b++;
-                printk("%02x", (uint32_t) c);
-                cnt++;
-                if (!(cnt % 16))
-                        printk("\n");
-                else
-                        printk("  ");
+        if ((level & ql2xextended_error_logging) == level) {
+
+                ql_dbg(level, vha, id, " 0   1   2   3   4   5   6   7   8   "
+                    "9  Ah  Bh  Ch  Dh  Eh  Fh\n");
+                ql_dbg(level, vha, id, "----------------------------------"
+                    "----------------------------\n");
+
+                ql_dbg(level, vha, id, "");
+                for (cnt = 0; cnt < size;) {
+                        c = *b++;
+                        printk("%02x", (uint32_t) c);
+                        cnt++;
+                        if (!(cnt % 16))
+                                printk("\n");
+                        else
+                                printk("  ");
+                }
+                if (cnt % 16)
+                        ql_dbg(level, vha, id, "\n");
         }
-        if (cnt % 16)
-                ql_dbg(level, vha, id, "\n");
 }
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 8f911c0b1e7..98a377b9901 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -165,54 +165,6 @@ struct qla81xx_fw_dump {
         uint32_t ext_mem[1];
 };
 
-struct qla83xx_fw_dump {
-        uint32_t host_status;
-        uint32_t host_risc_reg[48];
-        uint32_t pcie_regs[4];
-        uint32_t host_reg[32];
-        uint32_t shadow_reg[11];
-        uint32_t risc_io_reg;
-        uint16_t mailbox_reg[32];
-        uint32_t xseq_gp_reg[256];
-        uint32_t xseq_0_reg[48];
-        uint32_t xseq_1_reg[16];
-        uint32_t xseq_2_reg[16];
-        uint32_t rseq_gp_reg[256];
-        uint32_t rseq_0_reg[32];
-        uint32_t rseq_1_reg[16];
-        uint32_t rseq_2_reg[16];
-        uint32_t rseq_3_reg[16];
-        uint32_t aseq_gp_reg[256];
-        uint32_t aseq_0_reg[32];
-        uint32_t aseq_1_reg[16];
-        uint32_t aseq_2_reg[16];
-        uint32_t aseq_3_reg[16];
-        uint32_t cmd_dma_reg[64];
-        uint32_t req0_dma_reg[15];
-        uint32_t resp0_dma_reg[15];
-        uint32_t req1_dma_reg[15];
-        uint32_t xmt0_dma_reg[32];
-        uint32_t xmt1_dma_reg[32];
-        uint32_t xmt2_dma_reg[32];
-        uint32_t xmt3_dma_reg[32];
-        uint32_t xmt4_dma_reg[32];
-        uint32_t xmt_data_dma_reg[16];
-        uint32_t rcvt0_data_dma_reg[32];
-        uint32_t rcvt1_data_dma_reg[32];
-        uint32_t risc_gp_reg[128];
-        uint32_t lmc_reg[128];
-        uint32_t fpm_hdw_reg[256];
-        uint32_t rq0_array_reg[256];
-        uint32_t rq1_array_reg[256];
-        uint32_t rp0_array_reg[256];
-        uint32_t rp1_array_reg[256];
-        uint32_t queue_control_reg[16];
-        uint32_t fb_hdw_reg[432];
-        uint32_t at0_array_reg[128];
-        uint32_t code_ram[0x2400];
-        uint32_t ext_mem[1];
-};
-
 #define EFT_NUM_BUFFERS         4
 #define EFT_BYTES_PER_BUFFER    0x4000
 #define EFT_SIZE                ((EFT_BYTES_PER_BUFFER) * (EFT_NUM_BUFFERS))
@@ -240,24 +192,9 @@ struct qla2xxx_mq_chain {
         uint32_t qregs[4 * QLA_MQ_SIZE];
 };
 
-struct qla2xxx_mqueue_header {
-        uint32_t queue;
-#define TYPE_REQUEST_QUEUE      0x1
-#define TYPE_RESPONSE_QUEUE     0x2
-#define TYPE_ATIO_QUEUE         0x3
-        uint32_t number;
-        uint32_t size;
-};
-
-struct qla2xxx_mqueue_chain {
-        uint32_t type;
-        uint32_t chain_size;
-};
-
 #define DUMP_CHAIN_VARIANT      0x80000000
 #define DUMP_CHAIN_FCE          0x7FFFFAF0
 #define DUMP_CHAIN_MQ           0x7FFFFAF1
-#define DUMP_CHAIN_QUEUE        0x7FFFFAF2
 #define DUMP_CHAIN_LAST         0x80000000
 
 struct qla2xxx_fw_dump {
@@ -291,12 +228,10 @@ struct qla2xxx_fw_dump {
                 struct qla24xx_fw_dump isp24;
                 struct qla25xx_fw_dump isp25;
                 struct qla81xx_fw_dump isp81;
-                struct qla83xx_fw_dump isp83;
         } isp;
 };
 
 #define QL_MSGHDR "qla2xxx"
-#define QL_DBG_DEFAULT1_MASK    0x1e400000
 
 #define ql_log_fatal            0 /* display fatal errors */
 #define ql_log_warn             1 /* display critical errors */
@@ -309,15 +244,15 @@ struct qla2xxx_fw_dump {
 
 extern int ql_errlev;
 
-void __attribute__((format (printf, 4, 5)))
-ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);
-void __attribute__((format (printf, 4, 5)))
-ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);
+void
+ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);
+void
+ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);
 
-void __attribute__((format (printf, 4, 5)))
-ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);
-void __attribute__((format (printf, 4, 5)))
-ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);
+void
+ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);
+void
+ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);
 
 /* Debug Levels */
 /* The 0x40000000 is the max value any debug level can have
@@ -340,11 +275,5 @@ ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);
 #define ql_dbg_misc     0x00010000 /* For dumping everything that is not
                                     * not covered by upper categories
                                     */
-#define ql_dbg_verbose  0x00008000 /* More verbosity for each level
-                                    * This is to be used with other levels where
-                                    * more verbosity is required. It might not
-                                    * be applicable to all the levels.
-                                    */
-#define ql_dbg_tgt      0x00004000 /* Target mode */
-#define ql_dbg_tgt_mgt  0x00002000 /* Target mode management */
-#define ql_dbg_tgt_tmr  0x00001000 /* Target mode task management */
+
+#define QL_DBG_BUF_LEN  512
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6e7727f46d4..a03eaf40f37 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -44,7 +44,6 @@
  * ISP2100 HBAs.
  */
 #define MAILBOX_REGISTER_COUNT_2100     8
-#define MAILBOX_REGISTER_COUNT_2200     24
 #define MAILBOX_REGISTER_COUNT          32
 
 #define QLA2200A_RISC_ROM_VER   4
@@ -115,82 +114,6 @@
 #define WRT_REG_DWORD(addr, data)       writel(data,addr)
 
 /*
- * ISP83XX specific remote register addresses
- */
-#define QLA83XX_LED_PORT0                       0x00201320
-#define QLA83XX_LED_PORT1                       0x00201328
-#define QLA83XX_IDC_DEV_STATE           0x22102384
-#define QLA83XX_IDC_MAJOR_VERSION       0x22102380
-#define QLA83XX_IDC_MINOR_VERSION       0x22102398
-#define QLA83XX_IDC_DRV_PRESENCE        0x22102388
-#define QLA83XX_IDC_DRIVER_ACK          0x2210238c
-#define QLA83XX_IDC_CONTROL                     0x22102390
-#define QLA83XX_IDC_AUDIT                       0x22102394
-#define QLA83XX_IDC_LOCK_RECOVERY       0x2210239c
-#define QLA83XX_DRIVER_LOCKID           0x22102104
-#define QLA83XX_DRIVER_LOCK                     0x8111c028
-#define QLA83XX_DRIVER_UNLOCK           0x8111c02c
-#define QLA83XX_FLASH_LOCKID            0x22102100
-#define QLA83XX_FLASH_LOCK                      0x8111c010
-#define QLA83XX_FLASH_UNLOCK            0x8111c014
-#define QLA83XX_DEV_PARTINFO1           0x221023e0
-#define QLA83XX_DEV_PARTINFO2           0x221023e4
-#define QLA83XX_FW_HEARTBEAT            0x221020b0
-#define QLA83XX_PEG_HALT_STATUS1        0x221020a8
-#define QLA83XX_PEG_HALT_STATUS2        0x221020ac
-
-/* 83XX: Macros defining 8200 AEN Reason codes */
-#define IDC_DEVICE_STATE_CHANGE BIT_0
-#define IDC_PEG_HALT_STATUS_CHANGE BIT_1
-#define IDC_NIC_FW_REPORTED_FAILURE BIT_2
-#define IDC_HEARTBEAT_FAILURE BIT_3
-
-/* 83XX: Macros defining 8200 AEN Error-levels */
-#define ERR_LEVEL_NON_FATAL 0x1
-#define ERR_LEVEL_RECOVERABLE_FATAL 0x2
-#define ERR_LEVEL_UNRECOVERABLE_FATAL 0x4
-
-/* 83XX: Macros for IDC Version */
-#define QLA83XX_SUPP_IDC_MAJOR_VERSION 0x01
-#define QLA83XX_SUPP_IDC_MINOR_VERSION 0x0
-
-/* 83XX: Macros for scheduling dpc tasks */
-#define QLA83XX_NIC_CORE_RESET 0x1
-#define QLA83XX_IDC_STATE_HANDLER 0x2
-#define QLA83XX_NIC_CORE_UNRECOVERABLE 0x3
-
-/* 83XX: Macros for defining IDC-Control bits */
-#define QLA83XX_IDC_RESET_DISABLED BIT_0
-#define QLA83XX_IDC_GRACEFUL_RESET BIT_1
-
-/* 83XX: Macros for different timeouts */
-#define QLA83XX_IDC_INITIALIZATION_TIMEOUT 30
-#define QLA83XX_IDC_RESET_ACK_TIMEOUT 10
-#define QLA83XX_MAX_LOCK_RECOVERY_WAIT (2 * HZ)
-
-/* 83XX: Macros for defining class in DEV-Partition Info register */
-#define QLA83XX_CLASS_TYPE_NONE         0x0
-#define QLA83XX_CLASS_TYPE_NIC          0x1
-#define QLA83XX_CLASS_TYPE_FCOE         0x2
-#define QLA83XX_CLASS_TYPE_ISCSI        0x3
-
-/* 83XX: Macros for IDC Lock-Recovery stages */
-#define IDC_LOCK_RECOVERY_STAGE1        0x1 /* Stage1: Intent for
-                                             * lock-recovery
-                                             */
-#define IDC_LOCK_RECOVERY_STAGE2        0x2 /* Stage2: Perform lock-recovery */
-
-/* 83XX: Macros for IDC Audit type */
-#define IDC_AUDIT_TIMESTAMP             0x0 /* IDC-AUDIT: Record timestamp of
-                                             * dev-state change to NEED-RESET
-                                             * or NEED-QUIESCENT
-                                             */
-#define IDC_AUDIT_COMPLETION            0x1 /* IDC-AUDIT: Record duration of
-                                             * reset-recovery completion is
-                                             * second
-                                             */
-
-/*
  * The ISP2312 v2 chip cannot access the FLASH/GPIO registers via MMIO in an
  * 133Mhz slot.
  */
@@ -201,18 +124,17 @@
  * Fibre Channel device definitions.
  */
 #define WWN_SIZE                8       /* Size of WWPN, WWN & WWNN */
-#define MAX_FIBRE_DEVICES_2100  512
-#define MAX_FIBRE_DEVICES_2400  2048
-#define MAX_FIBRE_DEVICES_LOOP  128
-#define MAX_FIBRE_DEVICES_MAX   MAX_FIBRE_DEVICES_2400
-#define LOOPID_MAP_SIZE         (ha->max_fibre_devices)
+#define MAX_FIBRE_DEVICES       512
 #define MAX_FIBRE_LUNS          0xFFFF
+#define MAX_RSCN_COUNT          32
 #define MAX_HOST_COUNT          16
 
 /*
  * Host adapter default definitions.
  */
 #define MAX_BUSES               1  /* We only have one bus today */
+#define MAX_TARGETS_2100        MAX_FIBRE_DEVICES
+#define MAX_TARGETS_2200        MAX_FIBRE_DEVICES
 #define MIN_LUNS                8
 #define MAX_LUNS                MAX_FIBRE_LUNS
 #define MAX_CMDS_PER_LUN        255
@@ -263,7 +185,6 @@
 #define RESPONSE_ENTRY_CNT_2100         64      /* Number of response entries.*/
 #define RESPONSE_ENTRY_CNT_2300         512     /* Number of response entries.*/
 #define RESPONSE_ENTRY_CNT_MQ           128     /* Number of response entries.*/
-#define ATIO_ENTRY_CNT_24XX             4096    /* Number of ATIO entries. */
 
 struct req_que;
 
@@ -280,12 +201,20 @@ struct sd_dif_tuple {
 /*
  * SCSI Request Block
  */
-struct srb_cmd {
+typedef struct srb {
+        atomic_t ref_count;
+        struct fc_port *fcport;
+        uint32_t handle;
+
         struct scsi_cmnd *cmd;          /* Linux SCSI command pkt */
+
+        uint16_t flags;
+
         uint32_t request_sense_length;
         uint8_t *request_sense_ptr;
+
         void *ctx;
-};
+} srb_t;
 
 /*
  * SRB flag definitions
@@ -324,7 +253,10 @@ struct srb_iocb {
         } u;
 
         struct timer_list timer;
-        void (*timeout)(void *);
+
+        void (*done)(srb_t *);
+        void (*free)(srb_t *);
+        void (*timeout)(srb_t *);
 };
 
 /* Values for srb_ctx type */
@@ -335,38 +267,15 @@ struct srb_iocb {
 #define SRB_CT_CMD      5
 #define SRB_ADISC_CMD   6
 #define SRB_TM_CMD      7
-#define SRB_SCSI_CMD    8
-#define SRB_BIDI_CMD    9
 
-typedef struct srb {
-        atomic_t ref_count;
-        struct fc_port *fcport;
-        uint32_t handle;
-        uint16_t flags;
+struct srb_ctx {
         uint16_t type;
         char *name;
-        int iocbs;
         union {
-                struct srb_iocb iocb_cmd;
+                struct srb_iocb *iocb_cmd;
                 struct fc_bsg_job *bsg_job;
-                struct srb_cmd scmd;
         } u;
-        void (*done)(void *, void *, int);
-        void (*free)(void *, void *);
-} srb_t;
-
-#define GET_CMD_SP(sp) (sp->u.scmd.cmd)
-#define SET_CMD_SP(sp, cmd) (sp->u.scmd.cmd = cmd)
-#define GET_CMD_CTX_SP(sp) (sp->u.scmd.ctx)
-
-#define GET_CMD_SENSE_LEN(sp) \
-        (sp->u.scmd.request_sense_length)
-#define SET_CMD_SENSE_LEN(sp, len) \
-        (sp->u.scmd.request_sense_length = len)
-#define GET_CMD_SENSE_PTR(sp) \
-        (sp->u.scmd.request_sense_ptr)
-#define SET_CMD_SENSE_PTR(sp, ptr) \
-        (sp->u.scmd.request_sense_ptr = ptr)
+};
 
 struct msg_echo_lb {
         dma_addr_t send_dma;
@@ -672,20 +581,6 @@ typedef struct {
 #define MBA_DISCARD_RND_FRAME   0x8048  /* discard RND frame due to error. */
 #define MBA_REJECTED_FCP_CMD    0x8049  /* rejected FCP_CMD. */
 
-/* 83XX FCoE specific */
-#define MBA_IDC_AEN             0x8200  /* FCoE: NIC Core state change AEN */
-
-/* Interrupt type codes */
-#define INTR_ROM_MB_SUCCESS             0x1
-#define INTR_ROM_MB_FAILED              0x2
-#define INTR_MB_SUCCESS                 0x10
-#define INTR_MB_FAILED                  0x11
-#define INTR_ASYNC_EVENT                0x12
-#define INTR_RSP_QUE_UPDATE             0x13
-#define INTR_RSP_QUE_UPDATE_83XX        0x14
-#define INTR_ATIO_QUE_UPDATE            0x1C
-#define INTR_ATIO_RSP_QUE_UPDATE        0x1D
-
 /* ISP mailbox loopback echo diagnostic error code */
 #define MBS_LB_RESET    0x17
 /*
@@ -756,10 +651,8 @@ typedef struct {
 #define MBC_DIAGNOSTIC_LOOP_BACK        0x45    /* Diagnostic loop back. */
 #define MBC_ONLINE_SELF_TEST            0x46    /* Online self-test. */
 #define MBC_ENHANCED_GET_PORT_DATABASE  0x47    /* Get port database + login */
-#define MBC_CONFIGURE_VF                0x4b    /* Configure VFs */
 #define MBC_RESET_LINK_STATUS           0x52    /* Reset Link Error Status */
 #define MBC_IOCB_COMMAND_A64            0x54    /* Execute IOCB command (64) */
-#define MBC_PORT_LOGOUT                 0x56    /* Port Logout request */
 #define MBC_SEND_RNID_ELS               0x57    /* Send RNID ELS request */
 #define MBC_SET_RNID_PARAMS             0x59    /* Set RNID parameters */
 #define MBC_GET_RNID_PARAMS             0x5a    /* Data Rate */
@@ -810,7 +703,6 @@ typedef struct {
 #define MBC_SEND_RNFT_ELS               0x5e    /* Send RNFT ELS request */
 #define MBC_GET_LINK_PRIV_STATS         0x6d    /* Get link & private data. */
 #define MBC_SET_VENDOR_ID               0x76    /* Set Vendor ID. */
-#define MBC_PORT_RESET                  0x120   /* Port Reset */
 #define MBC_SET_PORT_CONFIG             0x122   /* Set port configuration */
 #define MBC_GET_PORT_CONFIG             0x123   /* Get port configuration */
 
@@ -1328,27 +1220,11 @@ typedef struct {
  * ISP queue - response queue entry definition.
  */
 typedef struct {
-        uint8_t         entry_type;             /* Entry type. */
-        uint8_t         entry_count;            /* Entry count. */
-        uint8_t         sys_define;             /* System defined. */
-        uint8_t         entry_status;           /* Entry Status. */
-        uint32_t        handle;                 /* System defined handle */
-        uint8_t         data[52];
+        uint8_t         data[60];
         uint32_t        signature;
 #define RESPONSE_PROCESSED      0xDEADDEAD      /* Signature */
 } response_t;
 
-/*
- * ISP queue - ATIO queue entry definition.
- */
-struct atio {
-        uint8_t         entry_type;             /* Entry type. */
-        uint8_t         entry_count;            /* Entry count. */
-        uint8_t         data[58];
-        uint32_t        signature;
-#define ATIO_PROCESSED 0xDEADDEAD               /* Signature */
-};
-
 typedef union {
         uint16_t extended;
         struct {
@@ -1468,10 +1344,9 @@ typedef struct {
 } cont_a64_entry_t;
 
 #define PO_MODE_DIF_INSERT      0
-#define PO_MODE_DIF_REMOVE      1
-#define PO_MODE_DIF_PASS        2
-#define PO_MODE_DIF_REPLACE     3
-#define PO_MODE_DIF_TCP_CKSUM   6
+#define PO_MODE_DIF_REMOVE      BIT_0
+#define PO_MODE_DIF_PASS        BIT_1
+#define PO_MODE_DIF_REPLACE     (BIT_0 + BIT_1)
 #define PO_ENABLE_DIF_BUNDLING  BIT_8
 #define PO_ENABLE_INCR_GUARD_SEED       BIT_3
 #define PO_DISABLE_INCR_REF_TAG BIT_5
@@ -1603,13 +1478,6 @@ typedef struct {
 #define CS_RETRY                0x82    /* Driver defined */
 #define CS_LOOP_DOWN_ABORT      0x83    /* Driver defined */
 
-#define CS_BIDIR_RD_OVERRUN                     0x700
-#define CS_BIDIR_RD_WR_OVERRUN                  0x707
-#define CS_BIDIR_RD_OVERRUN_WR_UNDERRUN         0x715
-#define CS_BIDIR_RD_UNDERRUN                    0x1500
-#define CS_BIDIR_RD_UNDERRUN_WR_OVERRUN         0x1507
-#define CS_BIDIR_RD_WR_UNDERRUN                 0x1515
-#define CS_BIDIR_DMA                            0x200
 /*
  * Status entry status flags
  */
@@ -1837,13 +1705,10 @@ typedef struct fc_port {
         struct fc_rport *rport, *drport;
         u32 supported_classes;
 
+        uint16_t vp_idx;
         uint8_t fc4_type;
-        uint8_t scan_state;
 } fc_port_t;
 
-#define QLA_FCPORT_SCAN_NONE    0
-#define QLA_FCPORT_SCAN_FOUND   1
-
 /*
  * Fibre channel port/lun states.
  */
@@ -1867,7 +1732,6 @@ static const char * const port_state_str[] = {
 #define FCF_LOGIN_NEEDED        BIT_1
 #define FCF_FCP2_DEVICE         BIT_2
 #define FCF_ASYNC_SENT          BIT_3
-#define FCF_CONF_COMP_SUPPORTED BIT_4
 
 /* No loop ID flag. */
 #define FC_NO_LOOP_ID           0x1000
@@ -1895,6 +1759,7 @@ static const char * const port_state_str[] = {
 
 #define GID_PT_CMD      0x1A1
 #define GID_PT_REQ_SIZE (16 + 4)
+#define GID_PT_RSP_SIZE (16 + (MAX_FIBRE_DEVICES * 4))
 
 #define GPN_ID_CMD      0x112
 #define GPN_ID_REQ_SIZE (16 + 4)
@@ -2184,9 +2049,7 @@ struct ct_sns_rsp {
                 } ga_nxt;
 
                 struct {
-                        /* Assume the largest number of targets for the union */
-                        struct ct_sns_gid_pt_data
-                            entries[MAX_FIBRE_DEVICES_MAX];
+                        struct ct_sns_gid_pt_data entries[MAX_FIBRE_DEVICES];
                 } gid_pt;
 
                 struct {
@@ -2247,11 +2110,7 @@ struct ct_sns_pkt {
 
 #define GID_PT_SNS_SCMD_LEN     6
 #define GID_PT_SNS_CMD_SIZE     28
-/*
- * Assume MAX_FIBRE_DEVICES_2100 as these defines are only used with older
- * adapters.
- */
-#define GID_PT_SNS_DATA_SIZE    (MAX_FIBRE_DEVICES_2100 * 4 + 16)
+#define GID_PT_SNS_DATA_SIZE    (MAX_FIBRE_DEVICES * 4 + 16)
 
 #define GPN_ID_SNS_SCMD_LEN     6
 #define GPN_ID_SNS_CMD_SIZE     28
@@ -2299,6 +2158,7 @@ struct gid_list_info {
         uint16_t loop_id;       /* ISP23XX         -- 6 bytes. */
         uint16_t reserved_1;    /* ISP24XX         -- 8 bytes. */
 };
+#define GID_LIST_SIZE (sizeof(struct gid_list_info) * MAX_FIBRE_DEVICES)
 
 /* NPIV */
 typedef struct vport_info {
@@ -2384,7 +2244,6 @@ struct isp_operations {
         int (*get_flash_version) (struct scsi_qla_host *, void *);
         int (*start_scsi) (srb_t *);
         int (*abort_isp) (struct scsi_qla_host *);
-        int (*iospace_config)(struct qla_hw_data*);
 };
 
 /* MSI-X Support *************************************************************/
@@ -2399,7 +2258,6 @@ struct isp_operations {
 #define QLA_MIDX_DEFAULT        0
 #define QLA_MIDX_RSP_Q          1
 #define QLA_PCI_MSIX_CONTROL    0xa2
-#define QLA_83XX_PCI_MSIX_CONTROL       0x92
 
 struct scsi_qla_host;
 
@@ -2474,21 +2332,16 @@ struct qla_statistics {
         uint64_t output_bytes;
 };
 
-struct bidi_statistics {
-        unsigned long long io_count;
-        unsigned long long transfer_bytes;
-};
-
 /* Multi queue support */
 #define MBC_INITIALIZE_MULTIQ 0x1f
 #define QLA_QUE_PAGE 0X1000
 #define QLA_MQ_SIZE 32
 #define QLA_MAX_QUEUES 256
 #define ISP_QUE_REG(ha, id) \
-        ((ha->mqenable || IS_QLA83XX(ha)) ? \
-        ((device_reg_t __iomem *)(ha->mqiobase) +\
+        ((ha->mqenable) ? \
+        ((void *)(ha->mqiobase) +\
         (QLA_QUE_PAGE * id)) :\
-        ((device_reg_t __iomem *)(ha->iobase)))
+        ((void *)(ha->iobase)))
 #define QLA_REQ_QUE_ID(tag) \
         ((tag < QLA_MAX_QUEUES && tag > 0) ? tag : 0)
 #define QLA_DEFAULT_QUE_QOS 5
@@ -2545,40 +2398,6 @@ struct qlfc_fw {
         uint32_t len;
 };
 
-struct qlt_hw_data {
-        /* Protected by hw lock */
-        uint32_t enable_class_2:1;
-        uint32_t enable_explicit_conf:1;
-        uint32_t ini_mode_force_reverse:1;
-        uint32_t node_name_set:1;
-
-        dma_addr_t atio_dma;    /* Physical address. */
-        struct atio *atio_ring; /* Base virtual address */
-        struct atio *atio_ring_ptr;     /* Current address. */
-        uint16_t atio_ring_index; /* Current index. */
-        uint16_t atio_q_length;
-
-        void *target_lport_ptr;
-        struct qla_tgt_func_tmpl *tgt_ops;
-        struct qla_tgt *qla_tgt;
-        struct qla_tgt_cmd *cmds[MAX_OUTSTANDING_COMMANDS];
-        uint16_t current_handle;
-
-        struct qla_tgt_vp_map *tgt_vp_map;
-        struct mutex tgt_mutex;
-        struct mutex tgt_host_action_mutex;
-
-        int saved_set;
-        uint16_t saved_exchange_count;
-        uint32_t saved_firmware_options_1;
-        uint32_t saved_firmware_options_2;
-        uint32_t saved_firmware_options_3;
-        uint8_t saved_firmware_options[2];
-        uint8_t saved_add_firmware_options[2];
-
-        uint8_t tgt_node_name[WWN_SIZE];
-};
-
 /*
  * Qlogic host adapter specific data structure.
 */
@@ -2615,16 +2434,11 @@ struct qla_hw_data {
                 uint32_t        disable_msix_handshake  :1;
                 uint32_t        fcp_prio_enabled        :1;
                 uint32_t        isp82xx_fw_hung:1;
-                uint32_t        nic_core_hung:1;
 
                 uint32_t        quiesce_owner:1;
                 uint32_t        thermal_supported:1;
-                uint32_t        nic_core_reset_hdlr_active:1;
-                uint32_t        nic_core_reset_owner:1;
-                uint32_t        isp82xx_no_md_cap:1;
-                uint32_t        host_shutting_down:1;
-                uint32_t        idc_compl_status:1;
-                /* 32 bits */
+                uint32_t        isp82xx_reset_hdlr_active:1;
+                /* 26 bits */
         } flags;
 
         /* This spinlock is used to protect "io transactions", you must
@@ -2643,7 +2457,6 @@ struct qla_hw_data {
 #define MIN_IOBASE_LEN          0x100
 /* Multi queue data structs */
         device_reg_t __iomem *mqiobase;
-        device_reg_t __iomem *msixbase;
         uint16_t        msix_count;
         uint8_t         mqenable;
         struct req_que **req_q_map;
@@ -2668,7 +2481,6 @@ struct qla_hw_data {
         atomic_t        loop_down_timer;         /* loop down timer */
         uint8_t         link_down_timeout;       /* link down timeout */
         uint16_t        max_loop_id;
-        uint16_t        max_fibre_devices;      /* Maximum number of targets */
 
         uint16_t        fb_rev;
         uint16_t        min_external_loopid;    /* First external loop Id */
@@ -2678,7 +2490,6 @@ struct qla_hw_data {
 #define PORT_SPEED_2GB  0x01
 #define PORT_SPEED_4GB  0x03
 #define PORT_SPEED_8GB  0x04
-#define PORT_SPEED_16GB 0x05
 #define PORT_SPEED_10GB 0x13
         uint16_t        link_data_rate;         /* F/W operating speed */
 
@@ -2700,8 +2511,6 @@ struct qla_hw_data {
 #define PCI_DEVICE_ID_QLOGIC_ISP2532    0x2532
 #define PCI_DEVICE_ID_QLOGIC_ISP8432    0x8432
 #define PCI_DEVICE_ID_QLOGIC_ISP8001    0x8001
-#define PCI_DEVICE_ID_QLOGIC_ISP8031    0x8031
-#define PCI_DEVICE_ID_QLOGIC_ISP2031    0x2031
         uint32_t        device_type;
 #define DT_ISP2100                      BIT_0
 #define DT_ISP2200                      BIT_1
@@ -2718,9 +2527,7 @@ struct qla_hw_data {
 #define DT_ISP8432                      BIT_12
 #define DT_ISP8001                      BIT_13
 #define DT_ISP8021                      BIT_14
-#define DT_ISP2031                      BIT_15
-#define DT_ISP8031                      BIT_16
-#define DT_ISP_LAST                     (DT_ISP8031 << 1)
+#define DT_ISP_LAST                     (DT_ISP8021 << 1)
 
 #define DT_T10_PI                       BIT_25
 #define DT_IIDMA                        BIT_26
@@ -2744,30 +2551,26 @@ struct qla_hw_data {
 #define IS_QLA2532(ha)  (DT_MASK(ha) & DT_ISP2532)
 #define IS_QLA8432(ha)  (DT_MASK(ha) & DT_ISP8432)
 #define IS_QLA8001(ha)  (DT_MASK(ha) & DT_ISP8001)
-#define IS_QLA81XX(ha)  (IS_QLA8001(ha))
 #define IS_QLA82XX(ha)  (DT_MASK(ha) & DT_ISP8021)
-#define IS_QLA2031(ha)  (DT_MASK(ha) & DT_ISP2031)
-#define IS_QLA8031(ha)  (DT_MASK(ha) & DT_ISP8031)
 
 #define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \
                         IS_QLA6312(ha) || IS_QLA6322(ha))
 #define IS_QLA24XX(ha)  (IS_QLA2422(ha) || IS_QLA2432(ha))
 #define IS_QLA54XX(ha)  (IS_QLA5422(ha) || IS_QLA5432(ha))
 #define IS_QLA25XX(ha)  (IS_QLA2532(ha))
-#define IS_QLA83XX(ha)  (IS_QLA2031(ha) || IS_QLA8031(ha))
 #define IS_QLA84XX(ha)  (IS_QLA8432(ha))
 #define IS_QLA24XX_TYPE(ha)     (IS_QLA24XX(ha) || IS_QLA54XX(ha) || \
                                 IS_QLA84XX(ha))
-#define IS_CNA_CAPABLE(ha)      (IS_QLA81XX(ha) || IS_QLA82XX(ha) || \
-                                IS_QLA8031(ha))
+#define IS_QLA81XX(ha)          (IS_QLA8001(ha))
+#define IS_QLA8XXX_TYPE(ha)     (IS_QLA81XX(ha) || IS_QLA82XX(ha))
 #define IS_QLA2XXX_MIDTYPE(ha)  (IS_QLA24XX(ha) || IS_QLA84XX(ha) || \
                                 IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
-                                IS_QLA82XX(ha) || IS_QLA83XX(ha))
-#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
-#define IS_NOPOLLING_TYPE(ha)   ((IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
-                        IS_QLA83XX(ha)) && (ha)->flags.msix_enabled)
-#define IS_FAC_REQUIRED(ha)     (IS_QLA81XX(ha) || IS_QLA83XX(ha))
-#define IS_NOCACHE_VPD_TYPE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
+                                IS_QLA82XX(ha))
+#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha))
+#define IS_NOPOLLING_TYPE(ha)   ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && \
+                                (ha)->flags.msix_enabled)
+#define IS_FAC_REQUIRED(ha)     (IS_QLA81XX(ha))
+#define IS_NOCACHE_VPD_TYPE(ha) (IS_QLA81XX(ha))
 #define IS_ALOGIO_CAPABLE(ha)   (IS_QLA23XX(ha) || IS_FWI2_CAPABLE(ha))
 
 #define IS_T10_PI_CAPABLE(ha)   ((ha)->device_type & DT_T10_PI)
@@ -2776,18 +2579,6 @@ struct qla_hw_data {
 #define IS_ZIO_SUPPORTED(ha)    ((ha)->device_type & DT_ZIO_SUPPORTED)
 #define IS_OEM_001(ha)          ((ha)->device_type & DT_OEM_001)
 #define HAS_EXTENDED_IDS(ha)    ((ha)->device_type & DT_EXTENDED_IDS)
-#define IS_CT6_SUPPORTED(ha)    ((ha)->device_type & DT_CT6_SUPPORTED)
-#define IS_MQUE_CAPABLE(ha)     ((ha)->mqenable || IS_QLA83XX(ha))
-#define IS_BIDI_CAPABLE(ha)     ((IS_QLA25XX(ha) || IS_QLA2031(ha)))
-/* Bit 21 of fw_attributes decides the MCTP capabilities */
-#define IS_MCTP_CAPABLE(ha)     (IS_QLA2031(ha) && \
-                                ((ha)->fw_attributes_ext[0] & BIT_0))
-#define IS_PI_UNINIT_CAPABLE(ha)        (IS_QLA83XX(ha))
-#define IS_PI_IPGUARD_CAPABLE(ha)       (IS_QLA83XX(ha))
-#define IS_PI_DIFB_DIX0_CAPABLE(ha)     (0)
-#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha) (IS_QLA83XX(ha))
-#define IS_PI_SPLIT_DET_CAPABLE(ha)     (IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \
-    (((ha)->fw_attributes_h << 16 | (ha)->fw_attributes) & BIT_22))
 
         /* HBA serial number */
         uint8_t         serial0;
@@ -2826,6 +2617,10 @@ struct qla_hw_data {
         void            *sfp_data;
         dma_addr_t      sfp_data_dma;
 
+        uint8_t         *edc_data;
+        dma_addr_t      edc_data_dma;
+        uint16_t        edc_data_len;
+
 #define XGMAC_DATA_SIZE 4096
         void            *xgmac_data;
         dma_addr_t      xgmac_data_dma;
@@ -2854,8 +2649,6 @@ struct qla_hw_data {
         void            *async_pd;
         dma_addr_t      async_pd_dma;
 
-        void            *swl;
-
         /* These are used by mailbox operations. */
         volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT];
 
@@ -2871,15 +2664,12 @@ struct qla_hw_data {
         struct completion mbx_intr_comp;  /* Used for completion notification */
         struct completion dcbx_comp;    /* For set port config notification */
         int notify_dcbx_comp;
-        struct mutex selflogin_lock;
 
         /* Basic firmware related information. */
         uint16_t        fw_major_version;
         uint16_t        fw_minor_version;
         uint16_t        fw_subminor_version;
         uint16_t        fw_attributes;
-        uint16_t        fw_attributes_h;
-        uint16_t        fw_attributes_ext[2];
         uint32_t        fw_memory_size;
         uint32_t        fw_transfer_size;
         uint32_t        fw_srisc_address;
@@ -2903,12 +2693,7 @@ struct qla_hw_data {
         int             fw_dump_reading;
         dma_addr_t      eft_dma;
         void            *eft;
-/* Current size of mctp dump is 0x086064 bytes */
-#define MCTP_DUMP_SIZE  0x086064
-        dma_addr_t      mctp_dump_dma;
-        void            *mctp_dump;
-        int             mctp_dumped;
-        int             mctp_dump_reading;
+
         uint32_t        chain_offset;
         struct dentry *dfs_dir;
         struct dentry *dfs_fce;
@@ -2984,6 +2769,7 @@ struct qla_hw_data {
                                         /* ISP2322: red, green, amber. */
         uint16_t        zio_mode;
         uint16_t        zio_timer;
+        struct fc_host_statistics fc_host_stat;
 
         struct qla_msix_entry *msix_entries;
 
@@ -2996,6 +2782,7 @@ struct qla_hw_data {
         int             cur_vport_count;
 
         struct qla_chip_state_84xx *cs84xx;
+        struct qla_statistics qla_stats;
         struct isp_operations *isp_ops;
         struct workqueue_struct *wq;
         struct qlfc_fw fw_buf;
@@ -3020,8 +2807,8 @@ struct qla_hw_data {
         unsigned long   mn_win_crb;
         unsigned long   ms_win_crb;
         int             qdr_sn_window;
-        uint32_t        fcoe_dev_init_timeout;
-        uint32_t        fcoe_reset_timeout;
+        uint32_t        nx_dev_init_timeout;
+        uint32_t        nx_reset_timeout;
         rwlock_t        hw_lock;
         uint16_t        portnum;                /* port number */
         int             link_width;
@@ -3035,28 +2822,6 @@ struct qla_hw_data {
 
         uint8_t fw_type;
         __le32 file_prd_off;    /* File firmware product offset */
-
-        uint32_t        md_template_size;
-        void            *md_tmplt_hdr;
-        dma_addr_t      md_tmplt_hdr_dma;
-        void            *md_dump;
-        uint32_t        md_dump_size;
-
-        void            *loop_id_map;
-
-        /* QLA83XX IDC specific fields */
-        uint32_t        idc_audit_ts;
-
-        /* DPC low-priority workqueue */
-        struct workqueue_struct *dpc_lp_wq;
-        struct work_struct idc_aen;
-        /* DPC high-priority workqueue */
-        struct workqueue_struct *dpc_hp_wq;
-        struct work_struct nic_core_reset;
-        struct work_struct idc_state_handler;
-        struct work_struct nic_core_unrecoverable;
-
-        struct qlt_hw_data tgt;
 };
 
 /*
@@ -3076,6 +2841,7 @@ typedef struct scsi_qla_host {
         volatile struct {
                 uint32_t        init_done               :1;
                 uint32_t        online                  :1;
+                uint32_t        rscn_queue_overflow     :1;
                 uint32_t        reset_active            :1;
 
                 uint32_t        management_server_logged_in :1;
@@ -3114,7 +2880,6 @@ typedef struct scsi_qla_host {
 #define FCOE_CTX_RESET_NEEDED   18      /* Initiate FCoE context reset */
 #define MPI_RESET_NEEDED        19      /* Initiate MPI FW reset */
 #define ISP_QUIESCE_NEEDED      20      /* Driver need some quiescence */
-#define SCR_PENDING             21      /* SCR in target mode */
 
         uint32_t        device_flags;
 #define SWITCH_FOUND            BIT_0
@@ -3123,13 +2888,6 @@ typedef struct scsi_qla_host {
 
         /* ISP configuration data. */
         uint16_t        loop_id;                /* Host adapter loop id */
-        uint16_t        self_login_loop_id;     /* host adapter loop id
-                                                 * get it on self login
-                                                 */
-        fc_port_t       bidir_fcport;           /* fcport used for bidir cmnds
-                                                 * no need of allocating it for
-                                                 * each command
-                                                 */
 
         port_id_t       d_id;                   /* Host adapter port id */
         uint8_t         marker_needed;
@@ -3137,6 +2895,11 @@ typedef struct scsi_qla_host {
 
 
 
+        /* RSCN queue. */
+        uint32_t rscn_queue[MAX_RSCN_COUNT];
+        uint8_t rscn_in_ptr;
+        uint8_t rscn_out_ptr;
+
         /* Timeout timers. */
         uint8_t         loop_down_abort_time;    /* port down timer */
         atomic_t        loop_down_timer;         /* loop down timer */
@@ -3181,22 +2944,10 @@ typedef struct scsi_qla_host {
         struct req_que *req;
         int             fw_heartbeat_counter;
         int             seconds_since_last_heartbeat;
-        struct fc_host_statistics fc_host_stat;
-        struct qla_statistics qla_stats;
-        struct bidi_statistics bidi_stats;
 
         atomic_t        vref_count;
 } scsi_qla_host_t;
 
-#define SET_VP_IDX      1
-#define SET_AL_PA       2
-#define RESET_VP_IDX    3
-#define RESET_AL_PA     4
-struct qla_tgt_vp_map {
-        uint8_t idx;
-        scsi_qla_host_t *vha;
-};
-
 /*
  * Macros to help code, maintain, etc.
  */
@@ -3220,6 +2971,10 @@ struct qla_tgt_vp_map {
         atomic_dec(&__vha->vref_count);                      \
 } while (0)
 
+
+#define qla_printk(level, ha, format, arg...) \
+        dev_printk(level , &((ha)->pdev->dev) , format , ## arg)
+
 /*
  * qla2x00 local function return status codes
  */
@@ -3244,6 +2999,7 @@ struct qla_tgt_vp_map {
 #define QLA_ABORTED                     0x105
 #define QLA_SUSPENDED                   0x106
 #define QLA_BUSY                        0x107
+#define QLA_RSCNS_HANDLED               0x108
 #define QLA_ALREADY_REGISTERED          0x109
 
 #define NVRAM_DELAY()           udelay(10)
@@ -3259,7 +3015,6 @@ struct qla_tgt_vp_map {
 #define OPTROM_SIZE_25XX        0x200000
 #define OPTROM_SIZE_81XX        0x400000
 #define OPTROM_SIZE_82XX        0x800000
-#define OPTROM_SIZE_83XX        0x1000000
 
 #define OPTROM_BURST_SIZE       0x1000
 #define OPTROM_BURST_DWORDS     (OPTROM_BURST_SIZE / 4)
diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
index 706c4f7bc7c..0b4c2b794c6 100644
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -114,7 +114,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))
                 goto out;
         if (!ha->fce)
                 goto out;
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index be6d61a89ed..aa69486dc06 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -381,44 +381,6 @@ struct init_cb_24xx {
 /*
  * ISP queue - command entry structure definition.
  */
-#define COMMAND_BIDIRECTIONAL 0x75
-struct cmd_bidir {
-        uint8_t entry_type;             /* Entry type. */
-        uint8_t entry_count;            /* Entry count. */
-        uint8_t sys_define;             /* System defined */
-        uint8_t entry_status;           /* Entry status. */
-
-        uint32_t handle;                /* System handle. */
-
-        uint16_t nport_handle;          /* N_PORT hanlde. */
-
-        uint16_t timeout;               /* Commnad timeout. */
-
-        uint16_t wr_dseg_count;         /* Write Data segment count. */
-        uint16_t rd_dseg_count;         /* Read Data segment count. */
-
-        struct scsi_lun lun;            /* FCP LUN (BE). */
-
-        uint16_t control_flags;         /* Control flags. */
-#define BD_WRAP_BACK                    BIT_3
-#define BD_READ_DATA                    BIT_1
-#define BD_WRITE_DATA                   BIT_0
-
-        uint16_t fcp_cmnd_dseg_len;             /* Data segment length. */
-        uint32_t fcp_cmnd_dseg_address[2];      /* Data segment address. */
-
-        uint16_t reserved[2];                   /* Reserved */
-
-        uint32_t rd_byte_count;                 /* Total Byte count Read. */
-        uint32_t wr_byte_count;                 /* Total Byte count write. */
-
-        uint8_t port_id[3];                     /* PortID of destination port.*/
-        uint8_t vp_index;
-
-        uint32_t fcp_data_dseg_address[2];      /* Data segment address. */
-        uint16_t fcp_data_dseg_len;             /* Data segment length. */
-};
-
 #define COMMAND_TYPE_6  0x48            /* Command Type 6 entry */
 struct cmd_type_6 {
         uint8_t entry_type;             /* Entry type. */
@@ -1092,27 +1054,6 @@ struct device_reg_24xx {
         uint32_t unused_6[2];           /* Gap. */
         uint32_t iobase_sdata;
 };
-/* RISC-RISC semaphore register PCI offet */
-#define RISC_REGISTER_BASE_OFFSET       0x7010
-#define RISC_REGISTER_WINDOW_OFFET      0x6
-
-/* RISC-RISC semaphore/flag register (risc address 0x7016) */
-
-#define RISC_SEMAPHORE          0x1UL
-#define RISC_SEMAPHORE_WE       (RISC_SEMAPHORE << 16)
-#define RISC_SEMAPHORE_CLR      (RISC_SEMAPHORE_WE | 0x0UL)
-#define RISC_SEMAPHORE_SET      (RISC_SEMAPHORE_WE | RISC_SEMAPHORE)
-
-#define RISC_SEMAPHORE_FORCE            0x8000UL
-#define RISC_SEMAPHORE_FORCE_WE         (RISC_SEMAPHORE_FORCE << 16)
-#define RISC_SEMAPHORE_FORCE_CLR        (RISC_SEMAPHORE_FORCE_WE | 0x0UL)
-#define RISC_SEMAPHORE_FORCE_SET        \
-                (RISC_SEMAPHORE_FORCE_WE | RISC_SEMAPHORE_FORCE)
-
-/* RISC semaphore timeouts (ms) */
-#define TIMEOUT_SEMAPHORE               2500
-#define TIMEOUT_SEMAPHORE_FORCE         2000
-#define TIMEOUT_TOTAL_ELAPSED           4500
 
 /* Trace Control *************************************************************/
 
@@ -1189,7 +1130,7 @@ struct mid_db_entry_24xx {
 /*
  * Virtual Port Control IOCB
  */
-#define VP_CTRL_IOCB_TYPE       0x30    /* Virtual Port Control entry. */
+#define VP_CTRL_IOCB_TYPE       0x30    /* Vitual Port Control entry. */
 struct vp_ctrl_entry_24xx {
         uint8_t entry_type;             /* Entry type. */
         uint8_t entry_count;            /* Entry count. */
@@ -1225,7 +1166,7 @@ struct vp_ctrl_entry_24xx {
 /*
  * Modify Virtual Port Configuration IOCB
  */
-#define VP_CONFIG_IOCB_TYPE     0x31    /* Virtual Port Config entry. */
+#define VP_CONFIG_IOCB_TYPE     0x31    /* Vitual Port Config entry. */
 struct vp_config_entry_24xx {
         uint8_t entry_type;             /* Entry type. */
         uint8_t entry_count;            /* Entry count. */
@@ -1386,11 +1327,6 @@ struct qla_flt_header {
 #define FLT_REG_GOLD_FW         0x2f
 #define FLT_REG_FCP_PRIO_0      0x87
 #define FLT_REG_FCP_PRIO_1      0x88
-#define FLT_REG_FCOE_FW         0xA4
-#define FLT_REG_FCOE_VPD_0      0xA9
-#define FLT_REG_FCOE_NVRAM_0    0xAA
-#define FLT_REG_FCOE_VPD_1      0xAB
-#define FLT_REG_FCOE_NVRAM_1    0xAC
 
 struct qla_flt_region {
         uint32_t code;
@@ -1558,14 +1494,6 @@ struct access_chip_rsp_84xx {
 #define MBC_GET_XGMAC_STATS     0x7a
 #define MBC_GET_DCBX_PARAMS     0x51
 
-/*
- * ISP83xx mailbox commands
- */
-#define MBC_WRITE_REMOTE_REG            0x0001 /* Write remote register */
-#define MBC_READ_REMOTE_REG             0x0009 /* Read remote register */
-#define MBC_RESTART_NIC_FIRMWARE        0x003d /* Restart NIC firmware */
-#define MBC_SET_ACCESS_CONTROL          0x003e /* Access control command */
-
 /* Flash access control option field bit definitions */
 #define FAC_OPT_FORCE_SEMAPHORE         BIT_15
 #define FAC_OPT_REQUESTOR_ID            BIT_14
@@ -1947,7 +1875,4 @@ struct qla_fcp_prio_cfg {
 #define FA_NPIV_CONF0_ADDR_81   0xD1000
 #define FA_NPIV_CONF1_ADDR_81   0xD2000
 
-/* 83XX Flash locations -- occupies second 8MB region. */
-#define FA_FLASH_LAYOUT_ADDR_83 0xFC400
-
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 2411d1a12b2..29b1a3e2823 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -48,7 +48,7 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *);
 
 extern int qla2x00_abort_isp(scsi_qla_host_t *);
 extern void qla2x00_abort_isp_cleanup(scsi_qla_host_t *);
-extern void qla2x00_quiesce_io(scsi_qla_host_t *);
+extern void qla82xx_quiescent_state_cleanup(scsi_qla_host_t *);
 
 extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
 
@@ -71,19 +71,13 @@ extern void qla2x00_async_logout_done(struct scsi_qla_host *, fc_port_t *,
     uint16_t *);
 extern void qla2x00_async_adisc_done(struct scsi_qla_host *, fc_port_t *,
     uint16_t *);
+extern void qla2x00_async_tm_cmd_done(struct scsi_qla_host *, fc_port_t *,
+        struct srb_iocb *);
 extern void *qla2x00_alloc_iocbs(struct scsi_qla_host *, srb_t *);
 extern int qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *, fc_port_t *);
 
 extern fc_port_t *
 qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t );
-
-extern int __qla83xx_set_idc_control(scsi_qla_host_t *, uint32_t);
-extern int __qla83xx_get_idc_control(scsi_qla_host_t *, uint32_t *);
-extern void qla83xx_idc_audit(scsi_qla_host_t *, int);
-extern int qla83xx_nic_core_reset(scsi_qla_host_t *);
-extern void qla83xx_reset_ownership(scsi_qla_host_t *);
-extern int qla2xxx_mctp_dump(scsi_qla_host_t *);
-
 /*
  * Global Data in qla_os.c source file.
  */
@@ -110,8 +104,6 @@ extern int ql2xenablehba_err_chk;
 extern int ql2xtargetreset;
 extern int ql2xdontresethba;
 extern unsigned int ql2xmaxlun;
-extern int ql2xmdcapmask;
-extern int ql2xmdenable;
 
 extern int qla2x00_loop_reset(scsi_qla_host_t *);
 extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
@@ -141,20 +133,6 @@ extern void qla2x00_relogin(struct scsi_qla_host *);
 extern void qla2x00_do_work(struct scsi_qla_host *);
 extern void qla2x00_free_fcports(struct scsi_qla_host *);
 
-extern void qla83xx_schedule_work(scsi_qla_host_t *, int);
-extern void qla83xx_service_idc_aen(struct work_struct *);
-extern void qla83xx_nic_core_unrecoverable_work(struct work_struct *);
-extern void qla83xx_idc_state_handler_work(struct work_struct *);
-extern void qla83xx_nic_core_reset_work(struct work_struct *);
-
-extern void qla83xx_idc_lock(scsi_qla_host_t *, uint16_t);
-extern void qla83xx_idc_unlock(scsi_qla_host_t *, uint16_t);
-extern int qla83xx_idc_state_handler(scsi_qla_host_t *);
-extern int qla83xx_set_drv_presence(scsi_qla_host_t *vha);
-extern int __qla83xx_set_drv_presence(scsi_qla_host_t *vha);
-extern int qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
-extern int __qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
-
 /*
  * Global Functions in qla_mid.c source file.
  */
@@ -176,7 +154,8 @@ extern void qla2x00_do_dpc_all_vps(scsi_qla_host_t *);
 extern int qla24xx_vport_create_req_sanity_check(struct fc_vport *);
 extern scsi_qla_host_t * qla24xx_create_vhost(struct fc_vport *);
 
-extern void qla2x00_sp_free_dma(void *, void *);
+extern void qla2x00_sp_compl(struct qla_hw_data *, srb_t *);
+
 extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
 
 extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
@@ -197,7 +176,6 @@ extern int  qla2x00_vp_abort_isp(scsi_qla_host_t *);
 /*
  * Global Function Prototypes in qla_iocb.c source file.
  */
-
 extern uint16_t qla2x00_calc_iocbs_32(uint16_t);
 extern uint16_t qla2x00_calc_iocbs_64(uint16_t);
 extern void qla2x00_build_scsi_iocbs_32(srb_t *, cmd_entry_t *, uint16_t);
@@ -210,11 +188,7 @@ extern int qla2x00_start_sp(srb_t *);
 extern uint16_t qla24xx_calc_iocbs(scsi_qla_host_t *, uint16_t);
 extern void qla24xx_build_scsi_iocbs(srb_t *, struct cmd_type_7 *, uint16_t);
 extern int qla24xx_dif_start_scsi(srb_t *);
-extern int qla2x00_start_bidir(srb_t *, struct scsi_qla_host *, uint32_t);
-extern unsigned long qla2x00_get_async_timeout(struct scsi_qla_host *);
 
-extern void *qla2x00_alloc_iocbs(scsi_qla_host_t *, srb_t *);
-extern int qla2x00_issue_marker(scsi_qla_host_t *, int);
 
 /*
  * Global Function Prototypes in qla_mbx.c source file.
@@ -229,7 +203,8 @@ extern int
 qla2x00_execute_fw(scsi_qla_host_t *, uint32_t);
 
 extern int
-qla2x00_get_fw_version(scsi_qla_host_t *);
+qla2x00_get_fw_version(scsi_qla_host_t *, uint16_t *, uint16_t *, uint16_t *,
+    uint16_t *, uint32_t *, uint8_t *, uint32_t *, uint8_t *);
 
 extern int
 qla2x00_get_fw_options(scsi_qla_host_t *, uint16_t *);
@@ -266,9 +241,6 @@ extern int
 qla2x00_init_firmware(scsi_qla_host_t *, uint16_t);
 
 extern int
-qla2x00_get_node_name_list(scsi_qla_host_t *, void **, int *);
-
-extern int
 qla2x00_get_port_database(scsi_qla_host_t *, fc_port_t *, uint8_t);
 
 extern int
@@ -397,12 +369,6 @@ qla81xx_get_port_config(scsi_qla_host_t *, uint16_t *);
 extern int
 qla81xx_set_port_config(scsi_qla_host_t *, uint16_t *);
 
-extern int
-qla2x00_port_logout(scsi_qla_host_t *, struct fc_port *);
-
-extern int
-qla2x00_dump_mctp_data(scsi_qla_host_t *, dma_addr_t, uint32_t, uint32_t);
-
 /*
  * Global Function Prototypes in qla_isr.c source file.
  */
@@ -416,8 +382,6 @@ extern int qla2x00_request_irqs(struct qla_hw_data *, struct rsp_que *);
 extern void qla2x00_free_irqs(scsi_qla_host_t *);
 
 extern int qla2x00_get_data_rate(scsi_qla_host_t *);
-extern const char *qla2x00_get_link_speed_str(struct qla_hw_data *, uint16_t);
-
 /*
  * Global Function Prototypes in qla_sup.c source file.
  */
@@ -443,14 +407,6 @@ extern void qla2x00_beacon_blink(struct scsi_qla_host *);
 extern int qla24xx_beacon_on(struct scsi_qla_host *);
 extern int qla24xx_beacon_off(struct scsi_qla_host *);
 extern void qla24xx_beacon_blink(struct scsi_qla_host *);
-extern void qla83xx_beacon_blink(struct scsi_qla_host *);
-extern int qla82xx_beacon_on(struct scsi_qla_host *);
-extern int qla82xx_beacon_off(struct scsi_qla_host *);
-extern int qla83xx_wr_reg(scsi_qla_host_t *, uint32_t, uint32_t);
-extern int qla83xx_rd_reg(scsi_qla_host_t *, uint32_t, uint32_t *);
-extern int qla83xx_restart_nic_firmware(scsi_qla_host_t *);
-extern int qla83xx_access_control(scsi_qla_host_t *, uint16_t, uint32_t,
-    uint32_t, uint16_t *);
 
 extern uint8_t *qla2x00_read_optrom_data(struct scsi_qla_host *, uint8_t *,
     uint32_t, uint32_t);
@@ -486,7 +442,6 @@ extern void qla2x00_dump_buffer_zipped(uint8_t *, uint32_t);
 extern void ql_dump_regs(uint32_t, scsi_qla_host_t *, int32_t);
 extern void ql_dump_buffer(uint32_t, scsi_qla_host_t *, int32_t,
         uint8_t *, uint32_t);
-extern void qla2xxx_dump_post_process(scsi_qla_host_t *, int);
 
 /*
  * Global Function Prototypes in qla_gs.c source file.
@@ -558,6 +513,7 @@ extern void qla24xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t);
 /* PCI related functions */
 extern int qla82xx_pci_config(struct scsi_qla_host *);
 extern int qla82xx_pci_mem_read_2M(struct qla_hw_data *, u64, void *, int);
+extern char *qla82xx_pci_info_str(struct scsi_qla_host *, char *);
 extern int qla82xx_pci_region_offset(struct pci_dev *, int);
 extern int qla82xx_iospace_config(struct qla_hw_data *);
 
@@ -580,11 +536,6 @@ extern int qla82xx_restart_isp(scsi_qla_host_t *);
 
 /* IOCB related functions */
 extern int qla82xx_start_scsi(srb_t *);
-extern void qla2x00_sp_free(void *, void *);
-extern void qla2x00_sp_timeout(unsigned long);
-extern void qla2x00_bsg_job_done(void *, void *, int);
-extern void qla2x00_bsg_sp_free(void *, void *);
-extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);
 
 /* Interrupt related */
 extern irqreturn_t qla82xx_intr_handler(int, void *);
@@ -598,6 +549,7 @@ extern void qla82xx_init_flags(struct qla_hw_data *);
 
 /* ISP 8021 hardware related */
 extern void qla82xx_set_drv_active(scsi_qla_host_t *);
+extern void qla82xx_crb_win_unlock(struct qla_hw_data *);
 extern int qla82xx_wr_32(struct qla_hw_data *, ulong, u32);
 extern int qla82xx_rd_32(struct qla_hw_data *, ulong);
 extern int qla82xx_rdmem(struct qla_hw_data *, u64, void *, int);
@@ -609,22 +561,15 @@ extern uint32_t  qla82xx_wait_for_state_change(scsi_qla_host_t *, uint32_t);
 extern int qla82xx_idc_lock(struct qla_hw_data *);
 extern void qla82xx_idc_unlock(struct qla_hw_data *);
 extern int qla82xx_device_state_handler(scsi_qla_host_t *);
-extern void qla8xxx_dev_failed_handler(scsi_qla_host_t *);
 extern void qla82xx_clear_qsnt_ready(scsi_qla_host_t *);
 
 extern void qla2x00_set_model_info(scsi_qla_host_t *, uint8_t *,
     size_t, char *);
 extern int qla82xx_mbx_intr_enable(scsi_qla_host_t *);
 extern int qla82xx_mbx_intr_disable(scsi_qla_host_t *);
-extern void qla82xx_start_iocbs(scsi_qla_host_t *);
+extern void qla82xx_start_iocbs(srb_t *);
 extern int qla82xx_fcoe_ctx_reset(scsi_qla_host_t *);
-extern int qla82xx_check_md_needed(scsi_qla_host_t *);
 extern void qla82xx_chip_reset_cleanup(scsi_qla_host_t *);
-extern int qla81xx_set_led_config(scsi_qla_host_t *, uint16_t *);
-extern int qla81xx_get_led_config(scsi_qla_host_t *, uint16_t *);
-extern int qla82xx_mbx_beacon_ctl(scsi_qla_host_t *, int);
-extern char *qdev_state(uint32_t);
-extern void qla82xx_clear_pending_mbx(scsi_qla_host_t *);
 
 /* BSG related functions */
 extern int qla24xx_bsg_request(struct fc_bsg_job *);
@@ -634,17 +579,4 @@ extern int qla2x00_issue_iocb_timeout(scsi_qla_host_t *, void *,
         dma_addr_t, size_t, uint32_t);
 extern int qla2x00_get_idma_speed(scsi_qla_host_t *, uint16_t,
         uint16_t *, uint16_t *);
-
-/* 83xx related functions */
-extern void qla83xx_fw_dump(scsi_qla_host_t *, int);
-
-/* Minidump related functions */
-extern int qla82xx_md_get_template_size(scsi_qla_host_t *);
-extern int qla82xx_md_get_template(scsi_qla_host_t *);
-extern int qla82xx_md_alloc(scsi_qla_host_t *);
-extern void qla82xx_md_free(scsi_qla_host_t *);
-extern int qla82xx_md_collect(scsi_qla_host_t *);
-extern void qla82xx_md_prep(scsi_qla_host_t *);
-extern void qla82xx_set_reset_owner(scsi_qla_host_t *);
-
 #endif /* _QLA_GBL_H */
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 01efc0e9cc3..37937aa3c3b 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1,11 +1,10 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
-#include "qla_target.h"
 
 static int qla2x00_sns_ga_nxt(scsi_qla_host_t *, fc_port_t *);
 static int qla2x00_sns_gid_pt(scsi_qla_host_t *, sw_info_t *);
@@ -218,9 +217,6 @@ qla2x00_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)
                 memcpy(fcport->port_name, ct_rsp->rsp.ga_nxt.port_name,
                     WWN_SIZE);
 
-                fcport->fc4_type = (ct_rsp->rsp.ga_nxt.fc4_types[2] & BIT_0) ?
-                    FC4_TYPE_FCP_SCSI : FC4_TYPE_OTHER;
-
                 if (ct_rsp->rsp.ga_nxt.port_type != NS_N_PORT_TYPE &&
                     ct_rsp->rsp.ga_nxt.port_type != NS_NL_PORT_TYPE)
                         fcport->d_id.b.domain = 0xf0;
@@ -244,12 +240,6 @@ qla2x00_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)
         return (rval);
 }
 
-static inline int
-qla2x00_gid_pt_rsp_size(scsi_qla_host_t *vha)
-{
-        return vha->hw->max_fibre_devices * 4 + 16;
-}
-
 /**
  * qla2x00_gid_pt() - SNS scan for fabric devices via GID_PT command.
  * @ha: HA context
@@ -271,21 +261,20 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
 
         struct ct_sns_gid_pt_data *gid_data;
         struct qla_hw_data *ha = vha->hw;
-        uint16_t gid_pt_rsp_size;
 
         if (IS_QLA2100(ha) || IS_QLA2200(ha))
                 return qla2x00_sns_gid_pt(vha, list);
 
         gid_data = NULL;
-        gid_pt_rsp_size = qla2x00_gid_pt_rsp_size(vha);
+
         /* Issue GID_PT */
         /* Prepare common MS IOCB */
         ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GID_PT_REQ_SIZE,
-            gid_pt_rsp_size);
+            GID_PT_RSP_SIZE);
 
         /* Prepare CT request */
         ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, GID_PT_CMD,
-            gid_pt_rsp_size);
+            GID_PT_RSP_SIZE);
         ct_rsp = &ha->ct_sns->p.rsp;
 
         /* Prepare CT arguments -- port_type */
@@ -303,7 +292,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 /* Set port IDs in switch info list. */
-                for (i = 0; i < ha->max_fibre_devices; i++) {
+                for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                         gid_data = &ct_rsp->rsp.gid_pt.entries[i];
                         list[i].d_id.b.domain = gid_data->port_id[0];
                         list[i].d_id.b.area = gid_data->port_id[1];
@@ -324,7 +313,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
                  * single call.  Return a failed status, and let GA_NXT handle
                  * the overload.
                  */
-                if (i == ha->max_fibre_devices)
+                if (i == MAX_FIBRE_DEVICES)
                         rval = QLA_FUNCTION_FAILED;
         }
 
@@ -341,7 +330,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
 int
 qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         uint16_t        i;
 
         ms_iocb_entry_t *ms_pkt;
@@ -352,7 +341,7 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
         if (IS_QLA2100(ha) || IS_QLA2200(ha))
                 return qla2x00_sns_gpn_id(vha, list);
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GPN_ID */
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GPN_ID_REQ_SIZE,
@@ -375,11 +364,9 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
                         /*EMPTY*/
                         ql_dbg(ql_dbg_disc, vha, 0x2056,
                             "GPN_ID issue IOCB failed (%d).\n", rval);
-                        break;
                 } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                     "GPN_ID") != QLA_SUCCESS) {
                         rval = QLA_FUNCTION_FAILED;
-                        break;
                 } else {
                         /* Save portname */
                         memcpy(list[i].port_name,
@@ -404,7 +391,7 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
 int
 qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         uint16_t        i;
         struct qla_hw_data *ha = vha->hw;
         ms_iocb_entry_t *ms_pkt;
@@ -414,7 +401,7 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
         if (IS_QLA2100(ha) || IS_QLA2200(ha))
                 return qla2x00_sns_gnn_id(vha, list);
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GNN_ID */
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GNN_ID_REQ_SIZE,
@@ -437,11 +424,9 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
                         /*EMPTY*/
                         ql_dbg(ql_dbg_disc, vha, 0x2057,
                             "GNN_ID issue IOCB failed (%d).\n", rval);
-                        break;
                 } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                     "GNN_ID") != QLA_SUCCESS) {
                         rval = QLA_FUNCTION_FAILED;
-                        break;
                 } else {
                         /* Save nodename */
                         memcpy(list[i].node_name,
@@ -560,8 +545,7 @@ qla2x00_rff_id(scsi_qla_host_t *vha)
         ct_req->req.rff_id.port_id[1] = vha->d_id.b.area;
         ct_req->req.rff_id.port_id[2] = vha->d_id.b.al_pa;
 
-        qlt_rff_id(vha, ct_req);
-
+        ct_req->req.rff_id.fc4_feature = BIT_1;
         ct_req->req.rff_id.fc4_type = 0x08;             /* SCSI - FCP */
 
         /* Execute MS IOCB */
@@ -751,7 +735,7 @@ qla2x00_prep_sns_cmd(scsi_qla_host_t *vha, uint16_t cmd, uint16_t scmd_len,
 static int
 qla2x00_sns_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         struct qla_hw_data *ha = vha->hw;
         struct sns_cmd_pkt      *sns_cmd;
 
@@ -774,7 +758,7 @@ qla2x00_sns_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)
                     "GA_NXT Send SNS failed (%d).\n", rval);
         } else if (sns_cmd->p.gan_data[8] != 0x80 ||
             sns_cmd->p.gan_data[9] != 0x02) {
-                ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x2084,
+                ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x207d,
                     "GA_NXT failed, rejected request ga_nxt_rsp:\n");
                 ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2074,
                     sns_cmd->p.gan_data, 16);
@@ -830,14 +814,11 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
         uint16_t        i;
         uint8_t         *entry;
         struct sns_cmd_pkt      *sns_cmd;
-        uint16_t gid_pt_sns_data_size;
-
-        gid_pt_sns_data_size = qla2x00_gid_pt_rsp_size(vha);
 
         /* Issue GID_PT. */
         /* Prepare SNS command request. */
         sns_cmd = qla2x00_prep_sns_cmd(vha, GID_PT_CMD, GID_PT_SNS_SCMD_LEN,
-            gid_pt_sns_data_size);
+            GID_PT_SNS_DATA_SIZE);
 
         /* Prepare SNS command arguments -- port_type. */
         sns_cmd->p.cmd.param[0] = NS_NX_PORT_TYPE;
@@ -858,7 +839,7 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 /* Set port IDs in switch info list. */
-                for (i = 0; i < ha->max_fibre_devices; i++) {
+                for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                         entry = &sns_cmd->p.gid_data[(i * 4) + 16];
                         list[i].d_id.b.domain = entry[1];
                         list[i].d_id.b.area = entry[2];
@@ -877,7 +858,7 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
                  * single call.  Return a failed status, and let GA_NXT handle
                  * the overload.
                  */
-                if (i == ha->max_fibre_devices)
+                if (i == MAX_FIBRE_DEVICES)
                         rval = QLA_FUNCTION_FAILED;
         }
 
@@ -896,12 +877,12 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list)
 static int
 qla2x00_sns_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         struct qla_hw_data *ha = vha->hw;
         uint16_t        i;
         struct sns_cmd_pkt      *sns_cmd;
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GPN_ID */
                 /* Prepare SNS command request. */
                 sns_cmd = qla2x00_prep_sns_cmd(vha, GPN_ID_CMD,
@@ -952,12 +933,12 @@ qla2x00_sns_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
 static int
 qla2x00_sns_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         struct qla_hw_data *ha = vha->hw;
         uint16_t        i;
         struct sns_cmd_pkt      *sns_cmd;
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GNN_ID */
                 /* Prepare SNS command request. */
                 sns_cmd = qla2x00_prep_sns_cmd(vha, GNN_ID_CMD,
@@ -1126,26 +1107,20 @@ qla2x00_sns_rnn_id(scsi_qla_host_t *vha)
 static int
 qla2x00_mgmt_svr_login(scsi_qla_host_t *vha)
 {
-        int ret, rval;
+        int ret;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         struct qla_hw_data *ha = vha->hw;
         ret = QLA_SUCCESS;
         if (vha->flags.management_server_logged_in)
                 return ret;
 
-        rval = ha->isp_ops->fabric_login(vha, vha->mgmt_svr_loop_id, 0xff, 0xff,
-            0xfa, mb, BIT_1);
-        if (rval != QLA_SUCCESS || mb[0] != MBS_COMMAND_COMPLETE) {
-                if (rval == QLA_MEMORY_ALLOC_FAILED)
-                        ql_dbg(ql_dbg_disc, vha, 0x2085,
-                            "Failed management_server login: loopid=%x "
-                            "rval=%d\n", vha->mgmt_svr_loop_id, rval);
-                else
-                        ql_dbg(ql_dbg_disc, vha, 0x2024,
-                            "Failed management_server login: loopid=%x "
-                            "mb[0]=%x mb[1]=%x mb[2]=%x mb[6]=%x mb[7]=%x.\n",
-                            vha->mgmt_svr_loop_id, mb[0], mb[1], mb[2], mb[6],
-                            mb[7]);
+        ha->isp_ops->fabric_login(vha, vha->mgmt_svr_loop_id, 0xff, 0xff, 0xfa,
+            mb, BIT_1|BIT_0);
+        if (mb[0] != MBS_COMMAND_COMPLETE) {
+                ql_dbg(ql_dbg_disc, vha, 0x2024,
+                    "Failed management_server login: loopid=%x mb[0]=%x "
+                    "mb[1]=%x mb[2]=%x mb[6]=%x mb[7]=%x.\n",
+                    vha->mgmt_svr_loop_id, mb[0], mb[1], mb[2], mb[6], mb[7]);
                 ret = QLA_FUNCTION_FAILED;
         } else
                 vha->flags.management_server_logged_in = 1;
@@ -1572,7 +1547,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
         eiter = (struct ct_fdmi_port_attr *) (entries + size);
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
         eiter->len = __constant_cpu_to_be16(4 + 4);
-        if (IS_CNA_CAPABLE(ha))
+        if (IS_QLA8XXX_TYPE(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(
                     FDMI_PORT_SPEED_10GB);
         else if (IS_QLA25XX(ha))
@@ -1619,10 +1594,6 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
                 eiter->a.cur_speed =
                     __constant_cpu_to_be32(FDMI_PORT_SPEED_10GB);
                 break;
-        case PORT_SPEED_16GB:
-                eiter->a.cur_speed =
-                    __constant_cpu_to_be32(FDMI_PORT_SPEED_16GB);
-                break;
         default:
                 eiter->a.cur_speed =
                     __constant_cpu_to_be32(FDMI_PORT_SPEED_UNKNOWN);
@@ -1753,7 +1724,7 @@ qla2x00_fdmi_register(scsi_qla_host_t *vha)
 int
 qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list)
 {
-        int             rval = QLA_SUCCESS;
+        int             rval;
         uint16_t        i;
         struct qla_hw_data *ha = vha->hw;
         ms_iocb_entry_t *ms_pkt;
@@ -1763,7 +1734,7 @@ qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list)
         if (!IS_IIDMA_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GFPN_ID_REQ_SIZE,
@@ -1786,11 +1757,9 @@ qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list)
                         /*EMPTY*/
                         ql_dbg(ql_dbg_disc, vha, 0x2023,
                             "GFPN_ID issue IOCB failed (%d).\n", rval);
-                        break;
                 } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                     "GFPN_ID") != QLA_SUCCESS) {
                         rval = QLA_FUNCTION_FAILED;
-                        break;
                 } else {
                         /* Save fabric portname */
                         memcpy(list[i].fabric_port_name,
@@ -1877,7 +1846,7 @@ qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list)
         if (rval)
                 return rval;
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
                 /* Prepare common MS IOCB */
                 ms_pkt = qla24xx_prep_ms_fm_iocb(vha, GPSC_REQ_SIZE,
@@ -1933,9 +1902,6 @@ qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list)
                         case BIT_11:
                                 list[i].fp_speed = PORT_SPEED_8GB;
                                 break;
-                        case BIT_10:
-                                list[i].fp_speed = PORT_SPEED_16GB;
-                                break;
                         }
 
                         ql_dbg(ql_dbg_disc, vha, 0x205b,
@@ -1981,7 +1947,7 @@ qla2x00_gff_id(scsi_qla_host_t *vha, sw_info_t *list)
         struct qla_hw_data *ha = vha->hw;
         uint8_t fcp_scsi_features = 0;
 
-        for (i = 0; i < ha->max_fibre_devices; i++) {
+        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Set default FC4 Type as UNKNOWN so the default is to
                  * Process this port */
                 list[i].fc4_type = FC4_TYPE_UNKNOWN;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 563eee3fa92..37da04d3db2 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -17,9 +17,6 @@
 #include <asm/prom.h>
 #endif
 
-#include <target/target_core_base.h>
-#include "qla_target.h"
-
 /*
 *  QLogic ISP2x00 Hardware Support Function Prototypes.
 */
@@ -32,6 +29,7 @@ static int qla2x00_configure_loop(scsi_qla_host_t *);
 static int qla2x00_configure_local_loop(scsi_qla_host_t *);
 static int qla2x00_configure_fabric(scsi_qla_host_t *);
 static int qla2x00_find_all_fabric_devs(scsi_qla_host_t *, struct list_head *);
+static int qla2x00_device_resync(scsi_qla_host_t *);
 static int qla2x00_fabric_dev_login(scsi_qla_host_t *, fc_port_t *,
     uint16_t *);
 
@@ -43,10 +41,11 @@ static int qla25xx_init_queues(struct qla_hw_data *);
 
 /* SRB Extensions ---------------------------------------------------------- */
 
-void
-qla2x00_sp_timeout(unsigned long __data)
+static void
+qla2x00_ctx_sp_timeout(unsigned long __data)
 {
         srb_t *sp = (srb_t *)__data;
+        struct srb_ctx *ctx;
         struct srb_iocb *iocb;
         fc_port_t *fcport = sp->fcport;
         struct qla_hw_data *ha = fcport->vha->hw;
@@ -56,28 +55,81 @@ qla2x00_sp_timeout(unsigned long __data)
         spin_lock_irqsave(&ha->hardware_lock, flags);
         req = ha->req_q_map[0];
         req->outstanding_cmds[sp->handle] = NULL;
-        iocb = &sp->u.iocb_cmd;
+        ctx = sp->ctx;
+        iocb = ctx->u.iocb_cmd;
         iocb->timeout(sp);
-        sp->free(fcport->vha, sp);
+        iocb->free(sp);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
-void
-qla2x00_sp_free(void *data, void *ptr)
+static void
+qla2x00_ctx_sp_free(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct srb_iocb *iocb = &sp->u.iocb_cmd;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *iocb = ctx->u.iocb_cmd;
+        struct scsi_qla_host *vha = sp->fcport->vha;
 
         del_timer(&iocb->timer);
-        mempool_free(sp, vha->hw->srb_mempool);
+        kfree(iocb);
+        kfree(ctx);
+        mempool_free(sp, sp->fcport->vha->hw->srb_mempool);
 
         QLA_VHA_MARK_NOT_BUSY(vha);
 }
 
+inline srb_t *
+qla2x00_get_ctx_sp(scsi_qla_host_t *vha, fc_port_t *fcport, size_t size,
+    unsigned long tmo)
+{
+        srb_t *sp = NULL;
+        struct qla_hw_data *ha = vha->hw;
+        struct srb_ctx *ctx;
+        struct srb_iocb *iocb;
+        uint8_t bail;
+
+        QLA_VHA_MARK_BUSY(vha, bail);
+        if (bail)
+                return NULL;
+
+        sp = mempool_alloc(ha->srb_mempool, GFP_KERNEL);
+        if (!sp)
+                goto done;
+        ctx = kzalloc(size, GFP_KERNEL);
+        if (!ctx) {
+                mempool_free(sp, ha->srb_mempool);
+                sp = NULL;
+                goto done;
+        }
+        iocb = kzalloc(sizeof(struct srb_iocb), GFP_KERNEL);
+        if (!iocb) {
+                mempool_free(sp, ha->srb_mempool);
+                sp = NULL;
+                kfree(ctx);
+                goto done;
+        }
+
+        memset(sp, 0, sizeof(*sp));
+        sp->fcport = fcport;
+        sp->ctx = ctx;
+        ctx->u.iocb_cmd = iocb;
+        iocb->free = qla2x00_ctx_sp_free;
+
+        init_timer(&iocb->timer);
+        if (!tmo)
+                goto done;
+        iocb->timer.expires = jiffies + tmo * HZ;
+        iocb->timer.data = (unsigned long)sp;
+        iocb->timer.function = qla2x00_ctx_sp_timeout;
+        add_timer(&iocb->timer);
+done:
+        if (!sp)
+                QLA_VHA_MARK_NOT_BUSY(vha);
+        return sp;
+}
+
 /* Asynchronous Login/Logout Routines -------------------------------------- */
 
-unsigned long
+static inline unsigned long
 qla2x00_get_async_timeout(struct scsi_qla_host *vha)
 {
         unsigned long tmo;
@@ -96,19 +148,19 @@ qla2x00_get_async_timeout(struct scsi_qla_host *vha)
 }
 
 static void
-qla2x00_async_iocb_timeout(void *data)
+qla2x00_async_iocb_timeout(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)data;
         fc_port_t *fcport = sp->fcport;
+        struct srb_ctx *ctx = sp->ctx;
 
         ql_dbg(ql_dbg_disc, fcport->vha, 0x2071,
-            "Async-%s timeout - hdl=%x portid=%02x%02x%02x.\n",
-            sp->name, sp->handle, fcport->d_id.b.domain, fcport->d_id.b.area,
+            "Async-%s timeout - portid=%02x%02x%02x.\n",
+            ctx->name, fcport->d_id.b.domain, fcport->d_id.b.area,
             fcport->d_id.b.al_pa);
 
         fcport->flags &= ~FCF_ASYNC_SENT;
-        if (sp->type == SRB_LOGIN_CMD) {
-                struct srb_iocb *lio = &sp->u.iocb_cmd;
+        if (ctx->type == SRB_LOGIN_CMD) {
+                struct srb_iocb *lio = ctx->u.iocb_cmd;
                 qla2x00_post_async_logout_work(fcport->vha, fcport, NULL);
                 /* Retry as needed. */
                 lio->u.logio.data[0] = MBS_COMMAND_ERROR;
@@ -120,16 +172,14 @@ qla2x00_async_iocb_timeout(void *data)
 }
 
 static void
-qla2x00_async_login_sp_done(void *data, void *ptr, int res)
+qla2x00_async_login_ctx_done(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct srb_iocb *lio = &sp->u.iocb_cmd;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-
-        if (!test_bit(UNLOADING, &vha->dpc_flags))
-                qla2x00_post_async_login_done_work(sp->fcport->vha, sp->fcport,
-                    lio->u.logio.data);
-        sp->free(sp->fcport->vha, sp);
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *lio = ctx->u.iocb_cmd;
+
+        qla2x00_post_async_login_done_work(sp->fcport->vha, sp->fcport,
+                lio->u.logio.data);
+        lio->free(sp);
 }
 
 int
@@ -137,21 +187,22 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,
     uint16_t *data)
 {
         srb_t *sp;
+        struct srb_ctx *ctx;
         struct srb_iocb *lio;
         int rval;
 
         rval = QLA_FUNCTION_FAILED;
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_sp(vha, fcport, sizeof(struct srb_ctx),
+            qla2x00_get_async_timeout(vha) + 2);
         if (!sp)
                 goto done;
 
-        sp->type = SRB_LOGIN_CMD;
-        sp->name = "login";
-        qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);
-
-        lio = &sp->u.iocb_cmd;
+        ctx = sp->ctx;
+        ctx->type = SRB_LOGIN_CMD;
+        ctx->name = "login";
+        lio = ctx->u.iocb_cmd;
         lio->timeout = qla2x00_async_iocb_timeout;
-        sp->done = qla2x00_async_login_sp_done;
+        lio->done = qla2x00_async_login_ctx_done;
         lio->u.logio.flags |= SRB_LOGIN_COND_PLOGI;
         if (data[1] & QLA_LOGIO_LOGIN_RETRIED)
                 lio->u.logio.flags |= SRB_LOGIN_RETRIED;
@@ -160,77 +211,73 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,
                 goto done_free_sp;
 
         ql_dbg(ql_dbg_disc, vha, 0x2072,
-            "Async-login - hdl=%x, loopid=%x portid=%02x%02x%02x "
-            "retries=%d.\n", sp->handle, fcport->loop_id,
-            fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa,
-            fcport->login_retry);
+            "Async-login - loopid=%x portid=%02x%02x%02x retries=%d.\n",
+            fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+            fcport->d_id.b.al_pa, fcport->login_retry);
         return rval;
 
 done_free_sp:
-        sp->free(fcport->vha, sp);
+        lio->free(sp);
 done:
         return rval;
 }
 
 static void
-qla2x00_async_logout_sp_done(void *data, void *ptr, int res)
+qla2x00_async_logout_ctx_done(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct srb_iocb *lio = &sp->u.iocb_cmd;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-
-        if (!test_bit(UNLOADING, &vha->dpc_flags))
-                qla2x00_post_async_logout_done_work(sp->fcport->vha, sp->fcport,
-                    lio->u.logio.data);
-        sp->free(sp->fcport->vha, sp);
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *lio = ctx->u.iocb_cmd;
+
+        qla2x00_post_async_logout_done_work(sp->fcport->vha, sp->fcport,
+            lio->u.logio.data);
+        lio->free(sp);
 }
 
 int
 qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport)
 {
         srb_t *sp;
+        struct srb_ctx *ctx;
         struct srb_iocb *lio;
         int rval;
 
         rval = QLA_FUNCTION_FAILED;
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_sp(vha, fcport, sizeof(struct srb_ctx),
+            qla2x00_get_async_timeout(vha) + 2);
         if (!sp)
                 goto done;
 
-        sp->type = SRB_LOGOUT_CMD;
-        sp->name = "logout";
-        qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);
-
-        lio = &sp->u.iocb_cmd;
+        ctx = sp->ctx;
+        ctx->type = SRB_LOGOUT_CMD;
+        ctx->name = "logout";
+        lio = ctx->u.iocb_cmd;
         lio->timeout = qla2x00_async_iocb_timeout;
-        sp->done = qla2x00_async_logout_sp_done;
+        lio->done = qla2x00_async_logout_ctx_done;
         rval = qla2x00_start_sp(sp);
         if (rval != QLA_SUCCESS)
                 goto done_free_sp;
 
         ql_dbg(ql_dbg_disc, vha, 0x2070,
-            "Async-logout - hdl=%x loop-id=%x portid=%02x%02x%02x.\n",
-            sp->handle, fcport->loop_id, fcport->d_id.b.domain,
-            fcport->d_id.b.area, fcport->d_id.b.al_pa);
+            "Async-logout - loop-id=%x portid=%02x%02x%02x.\n",
+            fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+            fcport->d_id.b.al_pa);
         return rval;
 
 done_free_sp:
-        sp->free(fcport->vha, sp);
+        lio->free(sp);
 done:
         return rval;
 }
 
 static void
-qla2x00_async_adisc_sp_done(void *data, void *ptr, int res)
+qla2x00_async_adisc_ctx_done(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct srb_iocb *lio = &sp->u.iocb_cmd;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-
-        if (!test_bit(UNLOADING, &vha->dpc_flags))
-                qla2x00_post_async_adisc_done_work(sp->fcport->vha, sp->fcport,
-                    lio->u.logio.data);
-        sp->free(sp->fcport->vha, sp);
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *lio = ctx->u.iocb_cmd;
+
+        qla2x00_post_async_adisc_done_work(sp->fcport->vha, sp->fcport,
+            lio->u.logio.data);
+        lio->free(sp);
 }
 
 int
@@ -238,21 +285,22 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport,
     uint16_t *data)
 {
         srb_t *sp;
+        struct srb_ctx *ctx;
         struct srb_iocb *lio;
         int rval;
 
         rval = QLA_FUNCTION_FAILED;
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_sp(vha, fcport, sizeof(struct srb_ctx),
+            qla2x00_get_async_timeout(vha) + 2);
         if (!sp)
                 goto done;
 
-        sp->type = SRB_ADISC_CMD;
-        sp->name = "adisc";
-        qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);
-
-        lio = &sp->u.iocb_cmd;
+        ctx = sp->ctx;
+        ctx->type = SRB_ADISC_CMD;
+        ctx->name = "adisc";
+        lio = ctx->u.iocb_cmd;
         lio->timeout = qla2x00_async_iocb_timeout;
-        sp->done = qla2x00_async_adisc_sp_done;
+        lio->done = qla2x00_async_adisc_ctx_done;
         if (data[1] & QLA_LOGIO_LOGIN_RETRIED)
                 lio->u.logio.flags |= SRB_LOGIN_RETRIED;
         rval = qla2x00_start_sp(sp);
@@ -260,81 +308,65 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport,
                 goto done_free_sp;
 
         ql_dbg(ql_dbg_disc, vha, 0x206f,
-            "Async-adisc - hdl=%x loopid=%x portid=%02x%02x%02x.\n",
-            sp->handle, fcport->loop_id, fcport->d_id.b.domain,
-            fcport->d_id.b.area, fcport->d_id.b.al_pa);
+            "Async-adisc - loopid=%x portid=%02x%02x%02x.\n",
+            fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+            fcport->d_id.b.al_pa);
         return rval;
 
 done_free_sp:
-        sp->free(fcport->vha, sp);
+        lio->free(sp);
 done:
         return rval;
 }
 
 static void
-qla2x00_async_tm_cmd_done(void *data, void *ptr, int res)
+qla2x00_async_tm_cmd_ctx_done(srb_t *sp)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct srb_iocb *iocb = &sp->u.iocb_cmd;
-        struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
-        uint32_t flags;
-        uint16_t lun;
-        int rval;
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *iocb = (struct srb_iocb *)ctx->u.iocb_cmd;
 
-        if (!test_bit(UNLOADING, &vha->dpc_flags)) {
-                flags = iocb->u.tmf.flags;
-                lun = (uint16_t)iocb->u.tmf.lun;
-
-                /* Issue Marker IOCB */
-                rval = qla2x00_marker(vha, vha->hw->req_q_map[0],
-                        vha->hw->rsp_q_map[0], sp->fcport->loop_id, lun,
-                        flags == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);
-
-                if ((rval != QLA_SUCCESS) || iocb->u.tmf.data) {
-                        ql_dbg(ql_dbg_taskm, vha, 0x8030,
-                            "TM IOCB failed (%x).\n", rval);
-                }
-        }
-        sp->free(sp->fcport->vha, sp);
+        qla2x00_async_tm_cmd_done(sp->fcport->vha, sp->fcport, iocb);
+        iocb->free(sp);
 }
 
 int
-qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t tm_flags, uint32_t lun,
+qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,
         uint32_t tag)
 {
         struct scsi_qla_host *vha = fcport->vha;
         srb_t *sp;
+        struct srb_ctx *ctx;
         struct srb_iocb *tcf;
         int rval;
 
         rval = QLA_FUNCTION_FAILED;
-        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
+        sp = qla2x00_get_ctx_sp(vha, fcport, sizeof(struct srb_ctx),
+            qla2x00_get_async_timeout(vha) + 2);
         if (!sp)
                 goto done;
 
-        sp->type = SRB_TM_CMD;
-        sp->name = "tmf";
-        qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);
-
-        tcf = &sp->u.iocb_cmd;
-        tcf->u.tmf.flags = tm_flags;
+        ctx = sp->ctx;
+        ctx->type = SRB_TM_CMD;
+        ctx->name = "tmf";
+        tcf = ctx->u.iocb_cmd;
+        tcf->u.tmf.flags = flags;
         tcf->u.tmf.lun = lun;
         tcf->u.tmf.data = tag;
         tcf->timeout = qla2x00_async_iocb_timeout;
-        sp->done = qla2x00_async_tm_cmd_done;
+        tcf->done = qla2x00_async_tm_cmd_ctx_done;
 
         rval = qla2x00_start_sp(sp);
         if (rval != QLA_SUCCESS)
                 goto done_free_sp;
 
         ql_dbg(ql_dbg_taskm, vha, 0x802f,
-            "Async-tmf hdl=%x loop-id=%x portid=%02x%02x%02x.\n",
-            sp->handle, fcport->loop_id, fcport->d_id.b.domain,
-            fcport->d_id.b.area, fcport->d_id.b.al_pa);
+            "Async-tmf loop-id=%x portid=%02x%02x%02x.\n",
+            fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+            fcport->d_id.b.al_pa);
         return rval;
 
 done_free_sp:
-        sp->free(fcport->vha, sp);
+        tcf->free(sp);
 done:
         return rval;
 }
@@ -353,13 +385,6 @@ qla2x00_async_login_done(struct scsi_qla_host *vha, fc_port_t *fcport,
                  * requests.
                  */
                 rval = qla2x00_get_port_database(vha, fcport, 0);
-                if (rval == QLA_NOT_LOGGED_IN) {
-                        fcport->flags &= ~FCF_ASYNC_SENT;
-                        fcport->flags |= FCF_LOGIN_NEEDED;
-                        set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
-                        break;
-                }
-
                 if (rval != QLA_SUCCESS) {
                         qla2x00_post_async_logout_work(vha, fcport, NULL);
                         qla2x00_post_async_login_work(vha, fcport, NULL);
@@ -425,83 +450,34 @@ qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport,
         return;
 }
 
-/****************************************************************************/
-/*                QLogic ISP2x00 Hardware Support Functions.                */
-/****************************************************************************/
-
-static int
-qla83xx_nic_core_fw_load(scsi_qla_host_t *vha)
+void
+qla2x00_async_tm_cmd_done(struct scsi_qla_host *vha, fc_port_t *fcport,
+    struct srb_iocb *iocb)
 {
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t idc_major_ver, idc_minor_ver;
-        uint16_t config[4];
-
-        qla83xx_idc_lock(vha, 0);
-
-        /* SV: TODO: Assign initialization timeout from
-         * flash-info / other param
-         */
-        ha->fcoe_dev_init_timeout = QLA83XX_IDC_INITIALIZATION_TIMEOUT;
-        ha->fcoe_reset_timeout = QLA83XX_IDC_RESET_ACK_TIMEOUT;
-
-        /* Set our fcoe function presence */
-        if (__qla83xx_set_drv_presence(vha) != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_p3p, vha, 0xb077,
-                    "Error while setting DRV-Presence.\n");
-                rval = QLA_FUNCTION_FAILED;
-                goto exit;
-        }
+        int rval;
+        uint32_t flags;
+        uint16_t lun;
 
-        /* Decide the reset ownership */
-        qla83xx_reset_ownership(vha);
+        flags = iocb->u.tmf.flags;
+        lun = (uint16_t)iocb->u.tmf.lun;
 
-        /*
-         * On first protocol driver load:
-         * Init-Owner: Set IDC-Major-Version and Clear IDC-Lock-Recovery
-         * register.
-         * Others: Check compatibility with current IDC Major version.
-         */
-        qla83xx_rd_reg(vha, QLA83XX_IDC_MAJOR_VERSION, &idc_major_ver);
-        if (ha->flags.nic_core_reset_owner) {
-                /* Set IDC Major version */
-                idc_major_ver = QLA83XX_SUPP_IDC_MAJOR_VERSION;
-                qla83xx_wr_reg(vha, QLA83XX_IDC_MAJOR_VERSION, idc_major_ver);
-
-                /* Clearing IDC-Lock-Recovery register */
-                qla83xx_wr_reg(vha, QLA83XX_IDC_LOCK_RECOVERY, 0);
-        } else if (idc_major_ver != QLA83XX_SUPP_IDC_MAJOR_VERSION) {
-                /*
-                 * Clear further IDC participation if we are not compatible with
-                 * the current IDC Major Version.
-                 */
-                ql_log(ql_log_warn, vha, 0xb07d,
-                    "Failing load, idc_major_ver=%d, expected_major_ver=%d.\n",
-                    idc_major_ver, QLA83XX_SUPP_IDC_MAJOR_VERSION);
-                __qla83xx_clear_drv_presence(vha);
-                rval = QLA_FUNCTION_FAILED;
-                goto exit;
-        }
-        /* Each function sets its supported Minor version. */
-        qla83xx_rd_reg(vha, QLA83XX_IDC_MINOR_VERSION, &idc_minor_ver);
-        idc_minor_ver |= (QLA83XX_SUPP_IDC_MINOR_VERSION << (ha->portnum * 2));
-        qla83xx_wr_reg(vha, QLA83XX_IDC_MINOR_VERSION, idc_minor_ver);
+        /* Issue Marker IOCB */
+        rval = qla2x00_marker(vha, vha->hw->req_q_map[0],
+                vha->hw->rsp_q_map[0], fcport->loop_id, lun,
+                flags == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);
 
-        if (ha->flags.nic_core_reset_owner) {
-                memset(config, 0, sizeof(config));
-                if (!qla81xx_get_port_config(vha, config))
-                        qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE,
-                            QLA8XXX_DEV_READY);
+        if ((rval != QLA_SUCCESS) || iocb->u.tmf.data) {
+                ql_dbg(ql_dbg_taskm, vha, 0x8030,
+                    "TM IOCB failed (%x).\n", rval);
         }
 
-        rval = qla83xx_idc_state_handler(vha);
-
-exit:
-        qla83xx_idc_unlock(vha, 0);
-
-        return rval;
+        return;
 }
 
+/****************************************************************************/
+/*                QLogic ISP2x00 Hardware Support Functions.                */
+/****************************************************************************/
+
 /*
 * qla2x00_initialize_adapter
 *      Initialize board.
@@ -538,7 +514,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
         set_bit(0, ha->req_qid_map);
         set_bit(0, ha->rsp_qid_map);
 
-        ql_dbg(ql_dbg_init, vha, 0x0040,
+        ql_log(ql_log_info, vha, 0x0040,
             "Configuring PCI space...\n");
         rval = ha->isp_ops->pci_config(vha);
         if (rval) {
@@ -557,7 +533,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
         }
 
         ha->isp_ops->get_flash_version(vha, req->ring);
-        ql_dbg(ql_dbg_init, vha, 0x0061,
+        ql_log(ql_log_info, vha, 0x0061,
             "Configure NVRAM parameters...\n");
 
         ha->isp_ops->nvram_config(vha);
@@ -574,7 +550,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
                 return QLA_FUNCTION_FAILED;
         }
 
-        ql_dbg(ql_dbg_init, vha, 0x0078,
+        ql_log(ql_log_info, vha, 0x0078,
             "Verifying loaded RISC code...\n");
 
         if (qla2x00_isp_firmware(vha) != QLA_SUCCESS) {
@@ -594,10 +570,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
                         return QLA_FUNCTION_FAILED;
                 }
         }
-
-        if (qla_ini_mode_enabled(vha))
-                rval = qla2x00_init_rings(vha);
-
+        rval = qla2x00_init_rings(vha);
         ha->flags.chip_reset_done = 1;
 
         if (rval == QLA_SUCCESS && IS_QLA84XX(ha)) {
@@ -610,14 +583,6 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
                 }
         }
 
-        /* Load the NIC Core f/w if we are the first protocol driver. */
-        if (IS_QLA8031(ha)) {
-                rval = qla83xx_nic_core_fw_load(vha);
-                if (rval)
-                        ql_log(ql_log_warn, vha, 0x0124,
-                            "Error in initializing NIC Core f/w.\n");
-        }
-
         if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))
                 qla24xx_read_fcp_prio_cfg(vha);
 
@@ -766,8 +731,8 @@ qla24xx_pci_config(scsi_qla_host_t *vha)
                 pcix_set_mmrbc(ha->pdev, 2048);
 
         /* PCIe -- adjust Maximum Read Request Size (2048). */
-        if (pci_is_pcie(ha->pdev))
-                pcie_set_readrq(ha->pdev, 4096);
+        if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
+                pcie_set_readrq(ha->pdev, 2048);
 
         pci_disable_rom(ha->pdev);
 
@@ -802,8 +767,8 @@ qla25xx_pci_config(scsi_qla_host_t *vha)
         pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
         /* PCIe -- adjust Maximum Read Request Size (2048). */
-        if (pci_is_pcie(ha->pdev))
-                pcie_set_readrq(ha->pdev, 4096);
+        if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
+                pcie_set_readrq(ha->pdev, 2048);
 
         pci_disable_rom(ha->pdev);
 
@@ -997,14 +962,11 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)
  *
  * Returns 0 on success.
  */
-static int
+int
 qla81xx_reset_mpi(scsi_qla_host_t *vha)
 {
         uint16_t mb[4] = {0x1010, 0, 1, 0};
 
-        if (!IS_QLA81XX(vha->hw))
-                return QLA_SUCCESS;
-
         return qla81xx_write_mpi_register(vha, mb);
 }
 
@@ -1095,83 +1057,6 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
                 ha->isp_ops->enable_intrs(ha);
 }
 
-static void
-qla25xx_read_risc_sema_reg(scsi_qla_host_t *vha, uint32_t *data)
-{
-        struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;
-
-        WRT_REG_DWORD(&reg->iobase_addr, RISC_REGISTER_BASE_OFFSET);
-        *data = RD_REG_DWORD(&reg->iobase_window + RISC_REGISTER_WINDOW_OFFET);
-
-}
-
-static void
-qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)
-{
-        struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;
-
-        WRT_REG_DWORD(&reg->iobase_addr, RISC_REGISTER_BASE_OFFSET);
-        WRT_REG_DWORD(&reg->iobase_window + RISC_REGISTER_WINDOW_OFFET, data);
-}
-
-static void
-qla25xx_manipulate_risc_semaphore(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t wd32 = 0;
-        uint delta_msec = 100;
-        uint elapsed_msec = 0;
-        uint timeout_msec;
-        ulong n;
-
-        if (!IS_QLA25XX(ha) && !IS_QLA2031(ha))
-                return;
-
-attempt:
-        timeout_msec = TIMEOUT_SEMAPHORE;
-        n = timeout_msec / delta_msec;
-        while (n--) {
-                qla25xx_write_risc_sema_reg(vha, RISC_SEMAPHORE_SET);
-                qla25xx_read_risc_sema_reg(vha, &wd32);
-                if (wd32 & RISC_SEMAPHORE)
-                        break;
-                msleep(delta_msec);
-                elapsed_msec += delta_msec;
-                if (elapsed_msec > TIMEOUT_TOTAL_ELAPSED)
-                        goto force;
-        }
-
-        if (!(wd32 & RISC_SEMAPHORE))
-                goto force;
-
-        if (!(wd32 & RISC_SEMAPHORE_FORCE))
-                goto acquired;
-
-        qla25xx_write_risc_sema_reg(vha, RISC_SEMAPHORE_CLR);
-        timeout_msec = TIMEOUT_SEMAPHORE_FORCE;
-        n = timeout_msec / delta_msec;
-        while (n--) {
-                qla25xx_read_risc_sema_reg(vha, &wd32);
-                if (!(wd32 & RISC_SEMAPHORE_FORCE))
-                        break;
-                msleep(delta_msec);
-                elapsed_msec += delta_msec;
-                if (elapsed_msec > TIMEOUT_TOTAL_ELAPSED)
-                        goto force;
-        }
-
-        if (wd32 & RISC_SEMAPHORE_FORCE)
-                qla25xx_write_risc_sema_reg(vha, RISC_SEMAPHORE_FORCE_CLR);
-
-        goto attempt;
-
-force:
-        qla25xx_write_risc_sema_reg(vha, RISC_SEMAPHORE_FORCE_SET);
-
-acquired:
-        return;
-}
-
 /**
  * qla24xx_reset_chip() - Reset ISP24xx chip.
  * @ha: HA context
@@ -1190,8 +1075,6 @@ qla24xx_reset_chip(scsi_qla_host_t *vha)
 
         ha->isp_ops->disable_intrs(ha);
 
-        qla25xx_manipulate_risc_semaphore(vha);
-
         /* Perform RISC reset. */
         qla24xx_reset_risc(vha);
 }
@@ -1377,9 +1260,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                 mem_size = (ha->fw_memory_size - 0x11000 + 1) *
                     sizeof(uint16_t);
         } else if (IS_FWI2_CAPABLE(ha)) {
-                if (IS_QLA83XX(ha))
-                        fixed_size = offsetof(struct qla83xx_fw_dump, ext_mem);
-                else if (IS_QLA81XX(ha))
+                if (IS_QLA81XX(ha))
                         fixed_size = offsetof(struct qla81xx_fw_dump, ext_mem);
                 else if (IS_QLA25XX(ha))
                         fixed_size = offsetof(struct qla25xx_fw_dump, ext_mem);
@@ -1387,22 +1268,10 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                         fixed_size = offsetof(struct qla24xx_fw_dump, ext_mem);
                 mem_size = (ha->fw_memory_size - 0x100000 + 1) *
                     sizeof(uint32_t);
-                if (ha->mqenable) {
-                        if (!IS_QLA83XX(ha))
-                                mq_size = sizeof(struct qla2xxx_mq_chain);
-                        /*
-                         * Allocate maximum buffer size for all queues.
-                         * Resizing must be done at end-of-dump processing.
-                         */
-                        mq_size += ha->max_req_queues *
-                            (req->length * sizeof(request_t));
-                        mq_size += ha->max_rsp_queues *
-                            (rsp->length * sizeof(response_t));
-                }
-                if (ha->tgt.atio_q_length)
-                        mq_size += ha->tgt.atio_q_length * sizeof(request_t);
+                if (ha->mqenable)
+                        mq_size = sizeof(struct qla2xxx_mq_chain);
                 /* Allocate memory for Fibre Channel Event Buffer. */
-                if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+                if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))
                         goto try_eft;
 
                 tc = dma_alloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
@@ -1425,7 +1294,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                         ha->flags.fce_enabled = 0;
                         goto try_eft;
                 }
-                ql_dbg(ql_dbg_init, vha, 0x00c0,
+                ql_log(ql_log_info, vha, 0x00c0,
                     "Allocate (%d KB) for FCE...\n", FCE_SIZE / 1024);
 
                 fce_size = sizeof(struct qla2xxx_fce_chain) + FCE_SIZE;
@@ -1452,7 +1321,7 @@ try_eft:
                             tc_dma);
                         goto cont_alloc;
                 }
-                ql_dbg(ql_dbg_init, vha, 0x00c3,
+                ql_log(ql_log_info, vha, 0x00c3,
                     "Allocated (%d KB) EFT ...\n", EFT_SIZE / 1024);
 
                 eft_size = EFT_SIZE;
@@ -1489,7 +1358,7 @@ cont_alloc:
                 }
                 return;
         }
-        ql_dbg(ql_dbg_init, vha, 0x00c5,
+        ql_log(ql_log_info, vha, 0x00c5,
             "Allocated (%d KB) for firmware dump.\n", dump_size / 1024);
 
         ha->fw_dump_len = dump_size;
@@ -1611,10 +1480,13 @@ qla2x00_setup_chip(scsi_qla_host_t *vha)
                         if (rval == QLA_SUCCESS) {
 enable_82xx_npiv:
                                 fw_major_version = ha->fw_major_version;
-                                if (IS_QLA82XX(ha))
-                                        qla82xx_check_md_needed(vha);
-                                else
-                                        rval = qla2x00_get_fw_version(vha);
+                                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);
                                 if (rval != QLA_SUCCESS)
                                         goto failed;
                                 ha->flags.npiv_supported = 0;
@@ -1631,17 +1503,17 @@ enable_82xx_npiv:
                                     &ha->fw_xcb_count, NULL, NULL,
                                     &ha->max_npiv_vports, NULL);
 
-                                if (!fw_major_version && ql2xallocfwdump
-                                    && !IS_QLA82XX(ha))
-                                        qla2x00_alloc_fw_dump(vha);
+                                if (!fw_major_version && ql2xallocfwdump) {
+                                        if (!IS_QLA82XX(ha))
+                                                qla2x00_alloc_fw_dump(vha);
+                                }
                         }
                 } else {
                         ql_log(ql_log_fatal, vha, 0x00cd,
                             "ISP Firmware failed checksum.\n");
                         goto failed;
                 }
-        } else
-                goto failed;
+        }
 
         if (!IS_FWI2_CAPABLE(ha) && !IS_QLA2100(ha) && !IS_QLA2200(ha)) {
                 /* Enable proper parity. */
@@ -1656,9 +1528,6 @@ enable_82xx_npiv:
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
         }
 
-        if (IS_QLA83XX(ha))
-                goto skip_fac_check;
-
         if (rval == QLA_SUCCESS && IS_FAC_REQUIRED(ha)) {
                 uint32_t size;
 
@@ -1671,11 +1540,6 @@ enable_82xx_npiv:
                             "Unsupported FAC firmware (%d.%02d.%02d).\n",
                             ha->fw_major_version, ha->fw_minor_version,
                             ha->fw_subminor_version);
-skip_fac_check:
-                        if (IS_QLA83XX(ha)) {
-                                ha->flags.fac_supported = 0;
-                                rval = QLA_SUCCESS;
-                        }
                 }
         }
 failed:
@@ -1854,7 +1718,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
         struct req_que *req = ha->req_q_map[0];
         struct rsp_que *rsp = ha->rsp_q_map[0];
 
-        /* Setup ring parameters in initialization control block. */
+/* Setup ring parameters in initialization control block. */
         icb = (struct init_cb_24xx *)ha->init_cb;
         icb->request_q_outpointer = __constant_cpu_to_le16(0);
         icb->response_q_inpointer = __constant_cpu_to_le16(0);
@@ -1865,13 +1729,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
         icb->response_q_address[0] = cpu_to_le32(LSD(rsp->dma));
         icb->response_q_address[1] = cpu_to_le32(MSD(rsp->dma));
 
-        /* Setup ATIO queue dma pointers for target mode */
-        icb->atio_q_inpointer = __constant_cpu_to_le16(0);
-        icb->atio_q_length = cpu_to_le16(ha->tgt.atio_q_length);
-        icb->atio_q_address[0] = cpu_to_le32(LSD(ha->tgt.atio_dma));
-        icb->atio_q_address[1] = cpu_to_le32(MSD(ha->tgt.atio_dma));
-
-        if (ha->mqenable || IS_QLA83XX(ha)) {
+        if (ha->mqenable) {
                 icb->qos = __constant_cpu_to_le16(QLA_DEFAULT_QUE_QOS);
                 icb->rid = __constant_cpu_to_le16(rid);
                 if (ha->flags.msix_enabled) {
@@ -1891,8 +1749,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
                                 __constant_cpu_to_le32(BIT_18);
 
                 /* Use Disable MSIX Handshake mode for capable adapters */
-                if ((ha->fw_attributes & BIT_6) && (IS_MSIX_NACK_CAPABLE(ha)) &&
-                    (ha->flags.msix_enabled)) {
+                if (IS_MSIX_NACK_CAPABLE(ha)) {
                         icb->firmware_options_2 &=
                                 __constant_cpu_to_le32(~BIT_22);
                         ha->flags.disable_msix_handshake = 1;
@@ -1914,8 +1771,6 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
                 WRT_REG_DWORD(&reg->isp24.rsp_q_in, 0);
                 WRT_REG_DWORD(&reg->isp24.rsp_q_out, 0);
         }
-        qlt_24xx_config_rings(vha, reg);
-
         /* PCI posting */
         RD_REG_DWORD(&ioreg->hccr);
 }
@@ -1938,6 +1793,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req;
         struct rsp_que *rsp;
+        struct scsi_qla_host *vp;
         struct mid_init_cb_24xx *mid_init_cb =
             (struct mid_init_cb_24xx *) ha->init_cb;
 
@@ -1967,10 +1823,14 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
                 qla2x00_init_response_q_entries(rsp);
         }
 
-        ha->tgt.atio_ring_ptr = ha->tgt.atio_ring;
-        ha->tgt.atio_ring_index = 0;
-        /* Initialize ATIO queue entries */
-        qlt_init_atio_q_entries(vha);
+        spin_lock(&ha->vport_slock);
+        /* Clear RSCN queue. */
+        list_for_each_entry(vp, &ha->vp_list, list) {
+                vp->rscn_in_ptr = 0;
+                vp->rscn_out_ptr = 0;
+        }
+
+        spin_unlock(&ha->vport_slock);
 
         ha->isp_ops->config_rings(vha);
 
@@ -1982,7 +1842,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
         ql_dbg(ql_dbg_init, vha, 0x00d1, "Issue init firmware.\n");
 
         if (ha->flags.npiv_supported) {
-                if (ha->operating_mode == LOOP && !IS_CNA_CAPABLE(ha))
+                if (ha->operating_mode == LOOP)
                         ha->max_npiv_vports = MIN_MULTI_ID_FABRIC - 1;
                 mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
         }
@@ -2046,7 +1906,6 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
                     "Waiting for LIP to complete.\n");
 
         do {
-                memset(state, -1, sizeof(state));
                 rval = qla2x00_get_firmware_state(vha, state);
                 if (rval == QLA_SUCCESS) {
                         if (state[0] < FSTATE_LOSS_OF_SYNC) {
@@ -2065,7 +1924,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
                                         rval = qla84xx_init_chip(vha);
                                         if (rval != QLA_SUCCESS) {
                                                 ql_log(ql_log_warn,
-                                                    vha, 0x8007,
+                                                    vha, 0x8043,
                                                     "Init chip failed.\n");
                                                 break;
                                         }
@@ -2074,7 +1933,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
                                         cs84xx_time = jiffies - cs84xx_time;
                                         wtime += cs84xx_time;
                                         mtime += cs84xx_time;
-                                        ql_dbg(ql_dbg_taskm, vha, 0x8008,
+                                        ql_dbg(ql_dbg_taskm, vha, 0x8042,
                                             "Increasing wait time by %ld. "
                                             "New time %ld.\n", cs84xx_time,
                                             wtime);
@@ -2117,13 +1976,16 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
 
                 /* Delay for a while */
                 msleep(500);
+
+                ql_dbg(ql_dbg_taskm, vha, 0x8039,
+                    "fw_state=%x curr time=%lx.\n", state[0], jiffies);
         } while (1);
 
         ql_dbg(ql_dbg_taskm, vha, 0x803a,
             "fw_state=%x (%x, %x, %x, %x) " "curr time=%lx.\n", state[0],
             state[1], state[2], state[3], state[4], jiffies);
 
-        if (rval && !(vha->device_flags & DFLG_NO_CABLE)) {
+        if (rval) {
                 ql_log(ql_log_warn, vha, 0x803b,
                     "Firmware ready **** FAILED ****.\n");
         }
@@ -2156,14 +2018,13 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
         uint8_t       domain;
         char            connect_type[22];
         struct qla_hw_data *ha = vha->hw;
-        unsigned long flags;
 
         /* Get host addresses. */
         rval = qla2x00_get_adapter_id(vha,
             &loop_id, &al_pa, &area, &domain, &topo, &sw_cap);
         if (rval != QLA_SUCCESS) {
                 if (LOOP_TRANSITION(vha) || atomic_read(&ha->loop_down_timer) ||
-                    IS_CNA_CAPABLE(ha) ||
+                    IS_QLA8XXX_TYPE(ha) ||
                     (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {
                         ql_dbg(ql_dbg_disc, vha, 0x2008,
                             "Loop is in a transition state.\n");
@@ -2231,10 +2092,6 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
         vha->d_id.b.area = area;
         vha->d_id.b.al_pa = al_pa;
 
-        spin_lock_irqsave(&ha->vport_slock, flags);
-        qlt_update_vp_map(vha, SET_AL_PA);
-        spin_unlock_irqrestore(&ha->vport_slock, flags);
-
         if (!vha->flags.init_done)
                 ql_log(ql_log_info, vha, 0x2010,
                     "Topology - %s, Host Loop address 0x%x.\n",
@@ -2259,7 +2116,7 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len,
         uint16_t index;
         struct qla_hw_data *ha = vha->hw;
         int use_tbl = !IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) &&
-            !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha);
+            !IS_QLA8XXX_TYPE(ha);
 
         if (memcmp(model, BINZERO, len) != 0) {
                 strncpy(ha->model_number, model, len);
@@ -2369,7 +2226,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
             nv->id[2] != 'P' || nv->id[3] != ' ' || nv->nvram_version < 1) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_warn, vha, 0x0064,
-                    "Inconsistent NVRAM "
+                    "Inconisistent NVRAM "
                     "detected: checksum=0x%x id=%c version=0x%x.\n",
                     chksum, nv->id[0], nv->nvram_version);
                 ql_log(ql_log_warn, vha, 0x0065,
@@ -2454,7 +2311,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
         if (IS_QLA23XX(ha)) {
                 nv->firmware_options[0] |= BIT_2;
                 nv->firmware_options[0] &= ~BIT_3;
-                nv->special_options[0] &= ~BIT_6;
+                nv->firmware_options[0] &= ~BIT_6;
                 nv->add_firmware_options[1] |= BIT_5 | BIT_4;
 
                 if (IS_QLA2300(ha)) {
@@ -2524,7 +2381,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
          * internal driver logging.
          */
         if (nv->host_p[0] & BIT_7)
-                ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK;
+                ql2xextended_error_logging = 0x7fffffff;
         ha->flags.disable_risc_code_load = ((nv->host_p[0] & BIT_4) ? 1 : 0);
         /* Always load RISC code on non ISP2[12]00 chips. */
         if (!IS_QLA2100(ha) && !IS_QLA2200(ha))
@@ -2651,21 +2508,14 @@ qla2x00_rport_del(void *data)
 {
         fc_port_t *fcport = data;
         struct fc_rport *rport;
-        scsi_qla_host_t *vha = fcport->vha;
         unsigned long flags;
 
         spin_lock_irqsave(fcport->vha->host->host_lock, flags);
         rport = fcport->drport ? fcport->drport: fcport->rport;
         fcport->drport = NULL;
         spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
-        if (rport) {
+        if (rport)
                 fc_remote_port_delete(rport);
-                /*
-                 * Release the target mode FC NEXUS in qla_target.c code
-                 * if target mod is enabled.
-                 */
-                qlt_fc_port_deleted(vha, fcport);
-        }
 }
 
 /**
@@ -2686,11 +2536,11 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags)
 
         /* Setup fcport template structure. */
         fcport->vha = vha;
+        fcport->vp_idx = vha->vp_idx;
         fcport->port_type = FCT_UNKNOWN;
         fcport->loop_id = FC_NO_LOOP_ID;
         qla2x00_set_fcport_state(fcport, FCS_UNCONFIGURED);
         fcport->supported_classes = FC_COS_UNSPECIFIED;
-        fcport->scan_state = QLA_FCPORT_SCAN_NONE;
 
         return fcport;
 }
@@ -2742,11 +2592,13 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
         if (ha->current_topology == ISP_CFG_FL &&
             (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
 
+                vha->flags.rscn_queue_overflow = 1;
                 set_bit(RSCN_UPDATE, &flags);
 
         } else if (ha->current_topology == ISP_CFG_F &&
             (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
 
+                vha->flags.rscn_queue_overflow = 1;
                 set_bit(RSCN_UPDATE, &flags);
                 clear_bit(LOCAL_LOOP_UPDATE, &flags);
 
@@ -2756,6 +2608,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
         } else if (!vha->flags.online ||
             (test_bit(ABORT_ISP_ACTIVE, &flags))) {
 
+                vha->flags.rscn_queue_overflow = 1;
                 set_bit(RSCN_UPDATE, &flags);
                 set_bit(LOCAL_LOOP_UPDATE, &flags);
         }
@@ -2765,7 +2618,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
                         ql_dbg(ql_dbg_disc, vha, 0x2015,
                             "Loop resync needed, failing.\n");
                         rval = QLA_FUNCTION_FAILED;
-                } else
+                }
+                else
                         rval = qla2x00_configure_local_loop(vha);
         }
 
@@ -2804,6 +2658,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
                         set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
                 if (test_bit(RSCN_UPDATE, &save_flags)) {
                         set_bit(RSCN_UPDATE, &vha->dpc_flags);
+                        if (!IS_ALOGIO_CAPABLE(ha))
+                                vha->flags.rscn_queue_overflow = 1;
                 }
         }
 
@@ -2839,10 +2695,15 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 
         found_devs = 0;
         new_fcport = NULL;
-        entries = MAX_FIBRE_DEVICES_LOOP;
+        entries = MAX_FIBRE_DEVICES;
+
+        ql_dbg(ql_dbg_disc, vha, 0x2016,
+            "Getting FCAL position map.\n");
+        if (ql2xextended_error_logging & ql_dbg_disc)
+                qla2x00_get_fcal_position_map(vha, NULL);
 
         /* Get list of logged in devices. */
-        memset(ha->gid_list, 0, qla2x00_gid_list_size(ha));
+        memset(ha->gid_list, 0, GID_LIST_SIZE);
         rval = qla2x00_get_id_list(vha, ha->gid_list, ha->gid_list_dma,
             &entries);
         if (rval != QLA_SUCCESS)
@@ -2907,13 +2768,12 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                 if (loop_id > LAST_LOCAL_LOOP_ID)
                         continue;
 
-                memset(new_fcport, 0, sizeof(fc_port_t));
-
                 /* Fill in member data. */
                 new_fcport->d_id.b.domain = domain;
                 new_fcport->d_id.b.area = area;
                 new_fcport->d_id.b.al_pa = al_pa;
                 new_fcport->loop_id = loop_id;
+                new_fcport->vp_idx = vha->vp_idx;
                 rval2 = qla2x00_get_port_database(vha, new_fcport, 0);
                 if (rval2 != QLA_SUCCESS) {
                         ql_dbg(ql_dbg_disc, vha, 0x201a,
@@ -2947,6 +2807,10 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 
                 if (!found) {
                         /* New device, add to fcports list. */
+                        if (vha->vp_idx) {
+                                new_fcport->vha = vha;
+                                new_fcport->vp_idx = vha->vp_idx;
+                        }
                         list_add_tail(&new_fcport->list, &vha->vp_fcports);
 
                         /* Allocate a new replacement fcport. */
@@ -2983,6 +2847,9 @@ cleanup_allocation:
 static void
 qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
 {
+#define LS_UNKNOWN      2
+        static char *link_speeds[] = { "1", "2", "?", "4", "8", "10" };
+        char *link_speed;
         int rval;
         uint16_t mb[4];
         struct qla_hw_data *ha = vha->hw;
@@ -3009,10 +2876,14 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
                     fcport->port_name[6], fcport->port_name[7], rval,
                     fcport->fp_speed, mb[0], mb[1]);
         } else {
+                link_speed = link_speeds[LS_UNKNOWN];
+                if (fcport->fp_speed < 5)
+                        link_speed = link_speeds[fcport->fp_speed];
+                else if (fcport->fp_speed == 0x13)
+                        link_speed = link_speeds[5];
                 ql_dbg(ql_dbg_disc, vha, 0x2005,
                     "iIDMA adjusted to %s GB/s "
-                    "on %02x%02x%02x%02x%02x%02x%02x%02x.\n",
-                    qla2x00_get_link_speed_str(ha, fcport->fp_speed),
+                    "on %02x%02x%02x%02x%02x%02x%02x%02x.\n", link_speed,
                     fcport->port_name[0], fcport->port_name[1],
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
@@ -3040,12 +2911,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
                     "Unable to allocate fc remote port.\n");
                 return;
         }
-        /*
-         * Create target mode FC NEXUS in qla_target.c if target mode is
-         * enabled..
-         */
-        qlt_fc_port_added(vha, fcport);
-
         spin_lock_irqsave(fcport->vha->host->host_lock, flags);
         *((fc_port_t **)rport->dd_data) = fcport;
         spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
@@ -3082,10 +2947,10 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
         fcport->login_retry = 0;
         fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);
 
-        qla2x00_set_fcport_state(fcport, FCS_ONLINE);
         qla2x00_iidma_fcport(vha, fcport);
         qla24xx_update_fcport_fcp_prio(vha, fcport);
         qla2x00_reg_remote_port(vha, fcport);
+        qla2x00_set_fcport_state(fcport, FCS_ONLINE);
 }
 
 /*
@@ -3102,8 +2967,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
 static int
 qla2x00_configure_fabric(scsi_qla_host_t *vha)
 {
-        int     rval;
-        fc_port_t       *fcport;
+        int     rval, rval2;
+        fc_port_t       *fcport, *fcptemp;
         uint16_t        next_loopid;
         uint16_t        mb[MAILBOX_REGISTER_COUNT];
         uint16_t        loop_id;
@@ -3126,6 +2991,12 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
         }
         vha->device_flags |= SWITCH_FOUND;
 
+        /* Mark devices that need re-synchronization. */
+        rval2 = qla2x00_device_resync(vha);
+        if (rval2 == QLA_RSCNS_HANDLED) {
+                /* No point doing the scan, just continue. */
+                return (QLA_SUCCESS);
+        }
         do {
                 /* FDMI support. */
                 if (ql2xfdmienable &&
@@ -3137,12 +3008,8 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                         loop_id = NPH_SNS;
                 else
                         loop_id = SIMPLE_NAME_SERVER;
-                rval = ha->isp_ops->fabric_login(vha, loop_id, 0xff, 0xff,
-                    0xfc, mb, BIT_1|BIT_0);
-                if (rval != QLA_SUCCESS) {
-                        set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
-                        break;
-                }
+                ha->isp_ops->fabric_login(vha, loop_id, 0xff, 0xff,
+                    0xfc, mb, BIT_1 | BIT_0);
                 if (mb[0] != MBS_COMMAND_COMPLETE) {
                         ql_dbg(ql_dbg_disc, vha, 0x2042,
                             "Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x mb[2]=%x "
@@ -3177,12 +3044,10 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                 if (rval != QLA_SUCCESS)
                         break;
 
-                /* Add new ports to existing port list */
-                list_splice_tail_init(&new_fcports, &vha->vp_fcports);
-
-                /* Starting free loop ID. */
-                next_loopid = ha->min_external_loopid;
-
+                /*
+                 * Logout all previous fabric devices marked lost, except
+                 * FCP2 devices.
+                 */
                 list_for_each_entry(fcport, &vha->vp_fcports, list) {
                         if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
                                 break;
@@ -3190,9 +3055,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                         if ((fcport->flags & FCF_FABRIC_DEVICE) == 0)
                                 continue;
 
-                        /* Logout lost/gone fabric devices (non-FCP2) */
-                        if (fcport->scan_state != QLA_FCPORT_SCAN_FOUND &&
-                            atomic_read(&fcport->state) == FCS_ONLINE) {
+                        if (atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
                                 qla2x00_mark_device_lost(vha, fcport,
                                     ql2xplogiabsentdevice, 0);
                                 if (fcport->loop_id != FC_NO_LOOP_ID &&
@@ -3204,30 +3067,78 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                                             fcport->d_id.b.domain,
                                             fcport->d_id.b.area,
                                             fcport->d_id.b.al_pa);
+                                        fcport->loop_id = FC_NO_LOOP_ID;
                                 }
-                                continue;
                         }
-                        fcport->scan_state = QLA_FCPORT_SCAN_NONE;
-
-                        /* Login fabric devices that need a login */
-                        if ((fcport->flags & FCF_LOGIN_NEEDED) != 0 &&
-                            atomic_read(&vha->loop_down_timer) == 0) {
-                                if (fcport->loop_id == FC_NO_LOOP_ID) {
-                                        fcport->loop_id = next_loopid;
-                                        rval = qla2x00_find_new_loop_id(
-                                            base_vha, fcport);
-                                        if (rval != QLA_SUCCESS) {
-                                                /* Ran out of IDs to use */
-                                                continue;
-                                        }
+                }
+
+                /* Starting free loop ID. */
+                next_loopid = ha->min_external_loopid;
+
+                /*
+                 * Scan through our port list and login entries that need to be
+                 * logged in.
+                 */
+                list_for_each_entry(fcport, &vha->vp_fcports, list) {
+                        if (atomic_read(&vha->loop_down_timer) ||
+                            test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
+                                break;
+
+                        if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 ||
+                            (fcport->flags & FCF_LOGIN_NEEDED) == 0)
+                                continue;
+
+                        if (fcport->loop_id == FC_NO_LOOP_ID) {
+                                fcport->loop_id = next_loopid;
+                                rval = qla2x00_find_new_loop_id(
+                                    base_vha, fcport);
+                                if (rval != QLA_SUCCESS) {
+                                        /* Ran out of IDs to use */
+                                        break;
                                 }
                         }
+                        /* Login and update database */
+                        qla2x00_fabric_dev_login(vha, fcport, &next_loopid);
+                }
+
+                /* Exit if out of loop IDs. */
+                if (rval != QLA_SUCCESS) {
+                        break;
+                }
+
+                /*
+                 * Login and add the new devices to our port list.
+                 */
+                list_for_each_entry_safe(fcport, fcptemp, &new_fcports, list) {
+                        if (atomic_read(&vha->loop_down_timer) ||
+                            test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
+                                break;
+
+                        /* Find a new loop ID to use. */
+                        fcport->loop_id = next_loopid;
+                        rval = qla2x00_find_new_loop_id(base_vha, fcport);
+                        if (rval != QLA_SUCCESS) {
+                                /* Ran out of IDs to use */
+                                break;
+                        }
 
                         /* Login and update database */
                         qla2x00_fabric_dev_login(vha, fcport, &next_loopid);
+
+                        if (vha->vp_idx) {
+                                fcport->vha = vha;
+                                fcport->vp_idx = vha->vp_idx;
+                        }
+                        list_move_tail(&fcport->list, &vha->vp_fcports);
                 }
         } while (0);
 
+        /* Free all new device structures not processed. */
+        list_for_each_entry_safe(fcport, fcptemp, &new_fcports, list) {
+                list_del(&fcport->list);
+                kfree(fcport);
+        }
+
         if (rval) {
                 ql_dbg(ql_dbg_disc, vha, 0x2068,
                     "Configure fabric error exit rval=%d.\n", rval);
@@ -3269,21 +3180,20 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
         rval = QLA_SUCCESS;
 
         /* Try GID_PT to get device list, else GAN. */
-        if (!ha->swl)
-                ha->swl = kcalloc(ha->max_fibre_devices, sizeof(sw_info_t),
-                    GFP_KERNEL);
-        swl = ha->swl;
+        swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_KERNEL);
         if (!swl) {
                 /*EMPTY*/
                 ql_dbg(ql_dbg_disc, vha, 0x2054,
                     "GID_PT allocations failed, fallback on GA_NXT.\n");
         } else {
-                memset(swl, 0, ha->max_fibre_devices * sizeof(sw_info_t));
                 if (qla2x00_gid_pt(vha, swl) != QLA_SUCCESS) {
+                        kfree(swl);
                         swl = NULL;
                 } else if (qla2x00_gpn_id(vha, swl) != QLA_SUCCESS) {
+                        kfree(swl);
                         swl = NULL;
                 } else if (qla2x00_gnn_id(vha, swl) != QLA_SUCCESS) {
+                        kfree(swl);
                         swl = NULL;
                 } else if (ql2xiidmaenable &&
                     qla2x00_gfpn_id(vha, swl) == QLA_SUCCESS) {
@@ -3301,6 +3211,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
         if (new_fcport == NULL) {
                 ql_log(ql_log_warn, vha, 0x205e,
                     "Failed to allocate memory for fcport.\n");
+                kfree(swl);
                 return (QLA_MEMORY_ALLOC_FAILED);
         }
         new_fcport->flags |= (FCF_FABRIC_DEVICE | FCF_LOGIN_NEEDED);
@@ -3417,8 +3328,6 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                             WWN_SIZE))
                                 continue;
 
-                        fcport->scan_state = QLA_FCPORT_SCAN_FOUND;
-
                         found++;
 
                         /* Update port state. */
@@ -3440,7 +3349,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                          */
                         if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) {
                                 fcport->d_id.b24 = new_fcport->d_id.b24;
-                                qla2x00_clear_loop_id(fcport);
+                                fcport->loop_id = FC_NO_LOOP_ID;
                                 fcport->flags |= (FCF_FABRIC_DEVICE |
                                     FCF_LOGIN_NEEDED);
                                 break;
@@ -3455,13 +3364,12 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                         fcport->flags |= FCF_LOGIN_NEEDED;
                         if (fcport->loop_id != FC_NO_LOOP_ID &&
                             (fcport->flags & FCF_FCP2_DEVICE) == 0 &&
-                            (fcport->flags & FCF_ASYNC_SENT) == 0 &&
                             fcport->port_type != FCT_INITIATOR &&
                             fcport->port_type != FCT_BROADCAST) {
                                 ha->isp_ops->fabric_logout(vha, fcport->loop_id,
                                     fcport->d_id.b.domain, fcport->d_id.b.area,
                                     fcport->d_id.b.al_pa);
-                                qla2x00_clear_loop_id(fcport);
+                                fcport->loop_id = FC_NO_LOOP_ID;
                         }
 
                         break;
@@ -3478,12 +3386,14 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                 if (new_fcport == NULL) {
                         ql_log(ql_log_warn, vha, 0x2066,
                             "Memory allocation failed for fcport.\n");
+                        kfree(swl);
                         return (QLA_MEMORY_ALLOC_FAILED);
                 }
                 new_fcport->flags |= (FCF_FABRIC_DEVICE | FCF_LOGIN_NEEDED);
                 new_fcport->d_id.b24 = nxt_d_id.b24;
         }
 
+        kfree(swl);
         kfree(new_fcport);
 
         return (rval);
@@ -3507,33 +3417,173 @@ int
 qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev)
 {
         int     rval;
+        int     found;
+        fc_port_t *fcport;
+        uint16_t first_loop_id;
         struct qla_hw_data *ha = vha->hw;
+        struct scsi_qla_host *vp;
+        struct scsi_qla_host *tvp;
         unsigned long flags = 0;
 
         rval = QLA_SUCCESS;
 
-        spin_lock_irqsave(&ha->vport_slock, flags);
+        /* Save starting loop ID. */
+        first_loop_id = dev->loop_id;
 
-        dev->loop_id = find_first_zero_bit(ha->loop_id_map,
-            LOOPID_MAP_SIZE);
-        if (dev->loop_id >= LOOPID_MAP_SIZE ||
-            qla2x00_is_reserved_id(vha, dev->loop_id)) {
-                dev->loop_id = FC_NO_LOOP_ID;
-                rval = QLA_FUNCTION_FAILED;
-        } else
-                set_bit(dev->loop_id, ha->loop_id_map);
+        for (;;) {
+                /* Skip loop ID if already used by adapter. */
+                if (dev->loop_id == vha->loop_id)
+                        dev->loop_id++;
+
+                /* Skip reserved loop IDs. */
+                while (qla2x00_is_reserved_id(vha, dev->loop_id))
+                        dev->loop_id++;
+
+                /* Reset loop ID if passed the end. */
+                if (dev->loop_id > ha->max_loop_id) {
+                        /* first loop ID. */
+                        dev->loop_id = ha->min_external_loopid;
+                }
 
-        spin_unlock_irqrestore(&ha->vport_slock, flags);
+                /* Check for loop ID being already in use. */
+                found = 0;
+                fcport = NULL;
 
-        if (rval == QLA_SUCCESS)
-                ql_dbg(ql_dbg_disc, dev->vha, 0x2086,
-                    "Assigning new loopid=%x, portid=%x.\n",
-                    dev->loop_id, dev->d_id.b24);
-        else
-                ql_log(ql_log_warn, dev->vha, 0x2087,
-                    "No loop_id's available, portid=%x.\n",
-                    dev->d_id.b24);
+                spin_lock_irqsave(&ha->vport_slock, flags);
+                list_for_each_entry_safe(vp, tvp, &ha->vp_list, list) {
+                        list_for_each_entry(fcport, &vp->vp_fcports, list) {
+                                if (fcport->loop_id == dev->loop_id &&
+                                                                fcport != dev) {
+                                        /* ID possibly in use */
+                                        found++;
+                                        break;
+                                }
+                        }
+                        if (found)
+                                break;
+                }
+                spin_unlock_irqrestore(&ha->vport_slock, flags);
+
+                /* If not in use then it is free to use. */
+                if (!found) {
+                        break;
+                }
+
+                /* ID in use. Try next value. */
+                dev->loop_id++;
+
+                /* If wrap around. No free ID to use. */
+                if (dev->loop_id == first_loop_id) {
+                        dev->loop_id = FC_NO_LOOP_ID;
+                        rval = QLA_FUNCTION_FAILED;
+                        break;
+                }
+        }
+
+        return (rval);
+}
+
+/*
+ * qla2x00_device_resync
+ *      Marks devices in the database that needs resynchronization.
+ *
+ * Input:
+ *      ha = adapter block pointer.
+ *
+ * Context:
+ *      Kernel context.
+ */
+static int
+qla2x00_device_resync(scsi_qla_host_t *vha)
+{
+        int     rval;
+        uint32_t mask;
+        fc_port_t *fcport;
+        uint32_t rscn_entry;
+        uint8_t rscn_out_iter;
+        uint8_t format;
+        port_id_t d_id = {};
+
+        rval = QLA_RSCNS_HANDLED;
+
+        while (vha->rscn_out_ptr != vha->rscn_in_ptr ||
+            vha->flags.rscn_queue_overflow) {
+
+                rscn_entry = vha->rscn_queue[vha->rscn_out_ptr];
+                format = MSB(MSW(rscn_entry));
+                d_id.b.domain = LSB(MSW(rscn_entry));
+                d_id.b.area = MSB(LSW(rscn_entry));
+                d_id.b.al_pa = LSB(LSW(rscn_entry));
+
+                ql_dbg(ql_dbg_disc, vha, 0x2020,
+                    "RSCN queue entry[%d] = [%02x/%02x%02x%02x].\n",
+                    vha->rscn_out_ptr, format, d_id.b.domain, d_id.b.area,
+                    d_id.b.al_pa);
+
+                vha->rscn_out_ptr++;
+                if (vha->rscn_out_ptr == MAX_RSCN_COUNT)
+                        vha->rscn_out_ptr = 0;
+
+                /* Skip duplicate entries. */
+                for (rscn_out_iter = vha->rscn_out_ptr;
+                    !vha->flags.rscn_queue_overflow &&
+                    rscn_out_iter != vha->rscn_in_ptr;
+                    rscn_out_iter = (rscn_out_iter ==
+                        (MAX_RSCN_COUNT - 1)) ? 0: rscn_out_iter + 1) {
+
+                        if (rscn_entry != vha->rscn_queue[rscn_out_iter])
+                                break;
+
+                        ql_dbg(ql_dbg_disc, vha, 0x2021,
+                            "Skipping duplicate RSCN queue entry found at "
+                            "[%d].\n", rscn_out_iter);
+
+                        vha->rscn_out_ptr = rscn_out_iter;
+                }
+
+                /* Queue overflow, set switch default case. */
+                if (vha->flags.rscn_queue_overflow) {
+                        ql_dbg(ql_dbg_disc, vha, 0x2022,
+                            "device_resync: rscn overflow.\n");
+
+                        format = 3;
+                        vha->flags.rscn_queue_overflow = 0;
+                }
+
+                switch (format) {
+                case 0:
+                        mask = 0xffffff;
+                        break;
+                case 1:
+                        mask = 0xffff00;
+                        break;
+                case 2:
+                        mask = 0xff0000;
+                        break;
+                default:
+                        mask = 0x0;
+                        d_id.b24 = 0;
+                        vha->rscn_out_ptr = vha->rscn_in_ptr;
+                        break;
+                }
 
+                rval = QLA_SUCCESS;
+
+                list_for_each_entry(fcport, &vha->vp_fcports, list) {
+                        if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 ||
+                            (fcport->d_id.b24 & mask) != d_id.b24 ||
+                            fcport->port_type == FCT_BROADCAST)
+                                continue;
+
+                        if (atomic_read(&fcport->state) == FCS_ONLINE) {
+                                if (format != 3 ||
+                                    fcport->port_type != FCT_INITIATOR) {
+                                        qla2x00_mark_device_lost(vha, fcport,
+                                            0, 0);
+                                }
+                        }
+                }
+        }
         return (rval);
 }
 
@@ -3590,9 +3640,6 @@ qla2x00_fabric_dev_login(scsi_qla_host_t *vha, fc_port_t *fcport,
                 } else {
                         qla2x00_update_fcport(vha, fcport);
                 }
-        } else {
-                /* Retry Login. */
-                qla2x00_mark_device_lost(vha, fcport, 1, 0);
         }
 
         return (rval);
@@ -3633,12 +3680,9 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport,
                     fcport->d_id.b.area, fcport->d_id.b.al_pa);
 
                 /* Login fcport on switch. */
-                rval = ha->isp_ops->fabric_login(vha, fcport->loop_id,
+                ha->isp_ops->fabric_login(vha, fcport->loop_id,
                     fcport->d_id.b.domain, fcport->d_id.b.area,
                     fcport->d_id.b.al_pa, mb, BIT_0);
-                if (rval != QLA_SUCCESS) {
-                        return rval;
-                }
                 if (mb[0] == MBS_PORT_ID_USED) {
                         /*
                          * Device has another loop ID.  The firmware team
@@ -3686,12 +3730,6 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport,
                         if (mb[10] & BIT_1)
                                 fcport->supported_classes |= FC_COS_CLASS3;
 
-                        if (IS_FWI2_CAPABLE(ha)) {
-                                if (mb[10] & BIT_7)
-                                        fcport->flags |=
-                                            FCF_CONF_COMP_SUPPORTED;
-                        }
-
                         rval = QLA_SUCCESS;
                         break;
                 } else if (mb[0] == MBS_LOOP_ID_USED) {
@@ -3732,7 +3770,7 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport,
                         ha->isp_ops->fabric_logout(vha, fcport->loop_id,
                             fcport->d_id.b.domain, fcport->d_id.b.area,
                             fcport->d_id.b.al_pa);
-                        qla2x00_clear_loop_id(fcport);
+                        fcport->loop_id = FC_NO_LOOP_ID;
                         fcport->login_retry = 0;
 
                         rval = 3;
@@ -3891,315 +3929,8 @@ qla2x00_update_fcports(scsi_qla_host_t *base_vha)
         spin_unlock_irqrestore(&ha->vport_slock, flags);
 }
 
-/* Assumes idc_lock always held on entry */
-void
-qla83xx_reset_ownership(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_presence, drv_presence_mask;
-        uint32_t dev_part_info1, dev_part_info2, class_type;
-        uint32_t class_type_mask = 0x3;
-        uint16_t fcoe_other_function = 0xffff, i;
-
-        qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
-
-        qla83xx_rd_reg(vha, QLA83XX_DEV_PARTINFO1, &dev_part_info1);
-        qla83xx_rd_reg(vha, QLA83XX_DEV_PARTINFO2, &dev_part_info2);
-        for (i = 0; i < 8; i++) {
-                class_type = ((dev_part_info1 >> (i * 4)) & class_type_mask);
-                if ((class_type == QLA83XX_CLASS_TYPE_FCOE) &&
-                    (i != ha->portnum)) {
-                        fcoe_other_function = i;
-                        break;
-                }
-        }
-        if (fcoe_other_function == 0xffff) {
-                for (i = 0; i < 8; i++) {
-                        class_type = ((dev_part_info2 >> (i * 4)) &
-                            class_type_mask);
-                        if ((class_type == QLA83XX_CLASS_TYPE_FCOE) &&
-                            ((i + 8) != ha->portnum)) {
-                                fcoe_other_function = i + 8;
-                                break;
-                        }
-                }
-        }
-        /*
-         * Prepare drv-presence mask based on fcoe functions present.
-         * However consider only valid physical fcoe function numbers (0-15).
-         */
-        drv_presence_mask = ~((1 << (ha->portnum)) |
-                        ((fcoe_other_function == 0xffff) ?
-                         0 : (1 << (fcoe_other_function))));
-
-        /* We are the reset owner iff:
-         *    - No other protocol drivers present.
-         *    - This is the lowest among fcoe functions. */
-        if (!(drv_presence & drv_presence_mask) &&
-                        (ha->portnum < fcoe_other_function)) {
-                ql_dbg(ql_dbg_p3p, vha, 0xb07f,
-                    "This host is Reset owner.\n");
-                ha->flags.nic_core_reset_owner = 1;
-        }
-}
-
-static int
-__qla83xx_set_drv_ack(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_ack;
-
-        rval = qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack);
-        if (rval == QLA_SUCCESS) {
-                drv_ack |= (1 << ha->portnum);
-                rval = qla83xx_wr_reg(vha, QLA83XX_IDC_DRIVER_ACK, drv_ack);
-        }
-
-        return rval;
-}
-
-static int
-__qla83xx_clear_drv_ack(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_ack;
-
-        rval = qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack);
-        if (rval == QLA_SUCCESS) {
-                drv_ack &= ~(1 << ha->portnum);
-                rval = qla83xx_wr_reg(vha, QLA83XX_IDC_DRIVER_ACK, drv_ack);
-        }
-
-        return rval;
-}
-
-static const char *
-qla83xx_dev_state_to_string(uint32_t dev_state)
-{
-        switch (dev_state) {
-        case QLA8XXX_DEV_COLD:
-                return "COLD/RE-INIT";
-        case QLA8XXX_DEV_INITIALIZING:
-                return "INITIALIZING";
-        case QLA8XXX_DEV_READY:
-                return "READY";
-        case QLA8XXX_DEV_NEED_RESET:
-                return "NEED RESET";
-        case QLA8XXX_DEV_NEED_QUIESCENT:
-                return "NEED QUIESCENT";
-        case QLA8XXX_DEV_FAILED:
-                return "FAILED";
-        case QLA8XXX_DEV_QUIESCENT:
-                return "QUIESCENT";
-        default:
-                return "Unknown";
-        }
-}
-
-/* Assumes idc-lock always held on entry */
-void
-qla83xx_idc_audit(scsi_qla_host_t *vha, int audit_type)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t idc_audit_reg = 0, duration_secs = 0;
-
-        switch (audit_type) {
-        case IDC_AUDIT_TIMESTAMP:
-                ha->idc_audit_ts = (jiffies_to_msecs(jiffies) / 1000);
-                idc_audit_reg = (ha->portnum) |
-                    (IDC_AUDIT_TIMESTAMP << 7) | (ha->idc_audit_ts << 8);
-                qla83xx_wr_reg(vha, QLA83XX_IDC_AUDIT, idc_audit_reg);
-                break;
-
-        case IDC_AUDIT_COMPLETION:
-                duration_secs = ((jiffies_to_msecs(jiffies) -
-                    jiffies_to_msecs(ha->idc_audit_ts)) / 1000);
-                idc_audit_reg = (ha->portnum) |
-                    (IDC_AUDIT_COMPLETION << 7) | (duration_secs << 8);
-                qla83xx_wr_reg(vha, QLA83XX_IDC_AUDIT, idc_audit_reg);
-                break;
-
-        default:
-                ql_log(ql_log_warn, vha, 0xb078,
-                    "Invalid audit type specified.\n");
-                break;
-        }
-}
-
-/* Assumes idc_lock always held on entry */
-static int
-qla83xx_initiating_reset(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t  idc_control, dev_state;
-
-        __qla83xx_get_idc_control(vha, &idc_control);
-        if ((idc_control & QLA83XX_IDC_RESET_DISABLED)) {
-                ql_log(ql_log_info, vha, 0xb080,
-                    "NIC Core reset has been disabled. idc-control=0x%x\n",
-                    idc_control);
-                return QLA_FUNCTION_FAILED;
-        }
-
-        /* Set NEED-RESET iff in READY state and we are the reset-owner */
-        qla83xx_rd_reg(vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-        if (ha->flags.nic_core_reset_owner && dev_state == QLA8XXX_DEV_READY) {
-                qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE,
-                    QLA8XXX_DEV_NEED_RESET);
-                ql_log(ql_log_info, vha, 0xb056, "HW State: NEED RESET.\n");
-                qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);
-        } else {
-                const char *state = qla83xx_dev_state_to_string(dev_state);
-                ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state);
-
-                /* SV: XXX: Is timeout required here? */
-                /* Wait for IDC state change READY -> NEED_RESET */
-                while (dev_state == QLA8XXX_DEV_READY) {
-                        qla83xx_idc_unlock(vha, 0);
-                        msleep(200);
-                        qla83xx_idc_lock(vha, 0);
-                        qla83xx_rd_reg(vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-                }
-        }
-
-        /* Send IDC ack by writing to drv-ack register */
-        __qla83xx_set_drv_ack(vha);
-
-        return QLA_SUCCESS;
-}
-
-int
-__qla83xx_set_idc_control(scsi_qla_host_t *vha, uint32_t idc_control)
-{
-        return qla83xx_wr_reg(vha, QLA83XX_IDC_CONTROL, idc_control);
-}
-
-int
-__qla83xx_get_idc_control(scsi_qla_host_t *vha, uint32_t *idc_control)
-{
-        return qla83xx_rd_reg(vha, QLA83XX_IDC_CONTROL, idc_control);
-}
-
-static int
-qla83xx_check_driver_presence(scsi_qla_host_t *vha)
-{
-        uint32_t drv_presence = 0;
-        struct qla_hw_data *ha = vha->hw;
-
-        qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
-        if (drv_presence & (1 << ha->portnum))
-                return QLA_SUCCESS;
-        else
-                return QLA_TEST_FAILED;
-}
-
-int
-qla83xx_nic_core_reset(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-
-        ql_dbg(ql_dbg_p3p, vha, 0xb058,
-            "Entered  %s().\n", __func__);
-
-        if (vha->device_flags & DFLG_DEV_FAILED) {
-                ql_log(ql_log_warn, vha, 0xb059,
-                    "Device in unrecoverable FAILED state.\n");
-                return QLA_FUNCTION_FAILED;
-        }
-
-        qla83xx_idc_lock(vha, 0);
-
-        if (qla83xx_check_driver_presence(vha) != QLA_SUCCESS) {
-                ql_log(ql_log_warn, vha, 0xb05a,
-                    "Function=0x%x has been removed from IDC participation.\n",
-                    ha->portnum);
-                rval = QLA_FUNCTION_FAILED;
-                goto exit;
-        }
-
-        qla83xx_reset_ownership(vha);
-
-        rval = qla83xx_initiating_reset(vha);
-
-        /*
-         * Perform reset if we are the reset-owner,
-         * else wait till IDC state changes to READY/FAILED.
-         */
-        if (rval == QLA_SUCCESS) {
-                rval = qla83xx_idc_state_handler(vha);
-
-                if (rval == QLA_SUCCESS)
-                        ha->flags.nic_core_hung = 0;
-                __qla83xx_clear_drv_ack(vha);
-        }
-
-exit:
-        qla83xx_idc_unlock(vha, 0);
-
-        ql_dbg(ql_dbg_p3p, vha, 0xb05b, "Exiting %s.\n", __func__);
-
-        return rval;
-}
-
-int
-qla2xxx_mctp_dump(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        int rval = QLA_FUNCTION_FAILED;
-
-        if (!IS_MCTP_CAPABLE(ha)) {
-                /* This message can be removed from the final version */
-                ql_log(ql_log_info, vha, 0x506d,
-                    "This board is not MCTP capable\n");
-                return rval;
-        }
-
-        if (!ha->mctp_dump) {
-                ha->mctp_dump = dma_alloc_coherent(&ha->pdev->dev,
-                    MCTP_DUMP_SIZE, &ha->mctp_dump_dma, GFP_KERNEL);
-
-                if (!ha->mctp_dump) {
-                        ql_log(ql_log_warn, vha, 0x506e,
-                            "Failed to allocate memory for mctp dump\n");
-                        return rval;
-                }
-        }
-
-#define MCTP_DUMP_STR_ADDR      0x00000000
-        rval = qla2x00_dump_mctp_data(vha, ha->mctp_dump_dma,
-            MCTP_DUMP_STR_ADDR, MCTP_DUMP_SIZE/4);
-        if (rval != QLA_SUCCESS) {
-                ql_log(ql_log_warn, vha, 0x506f,
-                    "Failed to capture mctp dump\n");
-        } else {
-                ql_log(ql_log_info, vha, 0x5070,
-                    "Mctp dump capture for host (%ld/%p).\n",
-                    vha->host_no, ha->mctp_dump);
-                ha->mctp_dumped = 1;
-        }
-
-        if (!ha->flags.nic_core_reset_hdlr_active && !ha->portnum) {
-                ha->flags.nic_core_reset_hdlr_active = 1;
-                rval = qla83xx_restart_nic_firmware(vha);
-                if (rval)
-                        /* NIC Core reset failed. */
-                        ql_log(ql_log_warn, vha, 0x5071,
-                            "Failed to restart nic firmware\n");
-                else
-                        ql_dbg(ql_dbg_p3p, vha, 0xb084,
-                            "Restarted NIC firmware successfully.\n");
-                ha->flags.nic_core_reset_hdlr_active = 0;
-        }
-
-        return rval;
-
-}
-
 /*
-* qla2x00_quiesce_io
+* qla82xx_quiescent_state_cleanup
 * Description: This function will block the new I/Os
 *              Its not aborting any I/Os as context
 *              is not destroyed during quiescence
@@ -4207,20 +3938,20 @@ qla2xxx_mctp_dump(scsi_qla_host_t *vha)
 * return   : void
 */
 void
-qla2x00_quiesce_io(scsi_qla_host_t *vha)
+qla82xx_quiescent_state_cleanup(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *vp;
 
-        ql_dbg(ql_dbg_dpc, vha, 0x401d,
-            "Quiescing I/O - ha=%p.\n", ha);
+        ql_dbg(ql_dbg_p3p, vha, 0xb002,
+            "Performing ISP error recovery - ha=%p.\n", ha);
 
         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
         if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
                 atomic_set(&vha->loop_state, LOOP_DOWN);
                 qla2x00_mark_all_devices_lost(vha, 0);
                 list_for_each_entry(vp, &ha->vp_list, list)
-                        qla2x00_mark_all_devices_lost(vp, 0);
+                        qla2x00_mark_all_devices_lost(vha, 0);
         } else {
                 if (!atomic_read(&vha->loop_down_timer))
                         atomic_set(&vha->loop_down_timer,
@@ -4245,7 +3976,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
                 vha->flags.online = 0;
         ha->flags.chip_reset_done = 0;
         clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        vha->qla_stats.total_isp_aborts++;
+        ha->qla_stats.total_isp_aborts++;
 
         ql_log(ql_log_info, vha, 0x00af,
             "Performing ISP error recovery - ha=%p.\n", ha);
@@ -4336,14 +4067,6 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
         if (vha->flags.online) {
                 qla2x00_abort_isp_cleanup(vha);
 
-                if (IS_QLA8031(ha)) {
-                        ql_dbg(ql_dbg_p3p, vha, 0xb05c,
-                            "Clearing fcoe driver presence.\n");
-                        if (qla83xx_clear_drv_presence(vha) != QLA_SUCCESS)
-                                ql_dbg(ql_dbg_p3p, vha, 0xb073,
-                                    "Error while clearing DRV-Presence.\n");
-                }
-
                 if (unlikely(pci_channel_offline(ha->pdev) &&
                     ha->flags.pci_channel_io_perm_failure)) {
                         clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
@@ -4373,8 +4096,15 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
                         ha->isp_abort_cnt = 0;
                         clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
 
-                        if (IS_QLA81XX(ha) || IS_QLA8031(ha))
-                                qla2x00_get_fw_version(vha);
+                        if (IS_QLA81XX(ha))
+                                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);
+
                         if (ha->fce) {
                                 ha->flags.fce_enabled = 1;
                                 memset(ha->fce, 0,
@@ -4452,16 +4182,8 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
                 }
                 spin_unlock_irqrestore(&ha->vport_slock, flags);
 
-                if (IS_QLA8031(ha)) {
-                        ql_dbg(ql_dbg_p3p, vha, 0xb05d,
-                            "Setting back fcoe driver presence.\n");
-                        if (qla83xx_set_drv_presence(vha) != QLA_SUCCESS)
-                                ql_dbg(ql_dbg_p3p, vha, 0xb074,
-                                    "Error while setting DRV-Presence.\n");
-                }
         } else {
-                ql_log(ql_log_warn, vha, 0x8023, "%s **** FAILED ****.\n",
-                       __func__);
+                ql_log(ql_log_warn, vha, 0x8023, "%s **** FAILED ****.\n");
         }
 
         return(status);
@@ -4485,7 +4207,6 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = ha->req_q_map[0];
         struct rsp_que *rsp = ha->rsp_q_map[0];
-        unsigned long flags;
 
         /* If firmware needs to be loaded */
         if (qla2x00_isp_firmware(vha)) {
@@ -4510,16 +4231,6 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
                         qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);
 
                         vha->flags.online = 1;
-
-                        /*
-                         * Process any ATIO queue entries that came in
-                         * while we weren't online.
-                         */
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        if (qla_tgt_mode_enabled(vha))
-                                qlt_24xx_process_atio_queue(vha);
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
                         /* Wait at most MAX_TARGET RSCNs for a stable link. */
                         wait_time = 256;
                         do {
@@ -4709,7 +4420,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
             nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_warn, vha, 0x006b,
-                    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
+                    "Inconisistent NVRAM detected: checksum=0x%x id=%c "
                     "version=0x%x.\n", chksum, nv->id[0], nv->nvram_version);
                 ql_log(ql_log_warn, vha, 0x006c,
                     "Falling back to functioning (yet invalid -- WWPN) "
@@ -4760,15 +4471,6 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
                 rval = 1;
         }
 
-        if (!qla_ini_mode_enabled(vha)) {
-                /* Don't enable full login after initial LIP */
-                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
-                /* Don't enable LIP full login for initiator */
-                nv->host_p &= __constant_cpu_to_le32(~BIT_10);
-        }
-
-        qlt_24xx_config_nvram_stage1(vha, nv);
-
         /* Reset Initialization control block */
         memset(icb, 0, ha->init_cb_size);
 
@@ -4796,10 +4498,8 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
         qla2x00_set_model_info(vha, nv->model_name, sizeof(nv->model_name),
             "QLA2462");
 
-        qlt_24xx_config_nvram_stage2(vha, icb);
-
+        /* Use alternate WWN? */
         if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {
-                /* Use alternate WWN? */
                 memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
                 memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
         }
@@ -4933,7 +4633,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,
         struct req_que *req = ha->req_q_map[0];
 
         ql_dbg(ql_dbg_init, vha, 0x008b,
-            "FW: Loading firmware from flash (%x).\n", faddr);
+            "Loading firmware from flash (%x).\n", faddr);
 
         rval = QLA_SUCCESS;
 
@@ -5131,8 +4831,8 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
                 return QLA_FUNCTION_FAILED;
         }
 
-        ql_dbg(ql_dbg_init, vha, 0x0092,
-            "FW: Loading via request-firmware.\n");
+        ql_log(ql_log_info, vha, 0x0092,
+            "Loading via request-firmware.\n");
 
         rval = QLA_SUCCESS;
 
@@ -5269,6 +4969,7 @@ try_blob_fw:
 
         ql_log(ql_log_info, vha, 0x009a, "Update operational firmware.\n");
         ha->flags.running_gold_fw = 1;
+
         return rval;
 }
 
@@ -5303,7 +5004,6 @@ int
 qla24xx_configure_vhba(scsi_qla_host_t *vha)
 {
         int rval = QLA_SUCCESS;
-        int rval2;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
@@ -5328,18 +5028,12 @@ qla24xx_configure_vhba(scsi_qla_host_t *vha)
         vha->flags.management_server_logged_in = 0;
 
         /* Login to SNS first */
-        rval2 = ha->isp_ops->fabric_login(vha, NPH_SNS, 0xff, 0xff, 0xfc, mb,
-            BIT_1);
-        if (rval2 != QLA_SUCCESS || mb[0] != MBS_COMMAND_COMPLETE) {
-                if (rval2 == QLA_MEMORY_ALLOC_FAILED)
-                        ql_dbg(ql_dbg_init, vha, 0x0120,
-                            "Failed SNS login: loop_id=%x, rval2=%d\n",
-                            NPH_SNS, rval2);
-                else
-                        ql_dbg(ql_dbg_init, vha, 0x0103,
-                            "Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x "
-                            "mb[2]=%x mb[6]=%x mb[7]=%x.\n",
-                            NPH_SNS, mb[0], mb[1], mb[2], mb[6], mb[7]);
+        ha->isp_ops->fabric_login(vha, NPH_SNS, 0xff, 0xff, 0xfc, mb, BIT_1);
+        if (mb[0] != MBS_COMMAND_COMPLETE) {
+                ql_dbg(ql_dbg_init, vha, 0x0103,
+                    "Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x mb[2]=%x "
+                    "mb[6]=%x mb[7]=%x.\n",
+                    NPH_SNS, mb[0], mb[1], mb[2], mb[6], mb[7]);
                 return (QLA_FUNCTION_FAILED);
         }
 
@@ -5470,7 +5164,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
             nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_info, vha, 0x0073,
-                    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
+                    "Inconisistent NVRAM detected: checksum=0x%x id=%c "
                     "version=0x%x.\n", chksum, nv->id[0],
                     le16_to_cpu(nv->nvram_version));
                 ql_log(ql_log_info, vha, 0x0074,
@@ -5515,10 +5209,10 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
                 nv->reset_delay = 5;
                 nv->max_luns_per_target = __constant_cpu_to_le16(128);
                 nv->port_down_retry_count = __constant_cpu_to_le16(30);
-                nv->link_down_timeout = __constant_cpu_to_le16(180);
+                nv->link_down_timeout = __constant_cpu_to_le16(30);
                 nv->enode_mac[0] = 0x00;
-                nv->enode_mac[1] = 0xC0;
-                nv->enode_mac[2] = 0xDD;
+                nv->enode_mac[1] = 0x02;
+                nv->enode_mac[2] = 0x03;
                 nv->enode_mac[3] = 0x04;
                 nv->enode_mac[4] = 0x05;
                 nv->enode_mac[5] = 0x06 + ha->port_no;
@@ -5526,9 +5220,6 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
                 rval = 1;
         }
 
-        if (IS_T10_PI_CAPABLE(ha))
-                nv->frame_payload_size &= ~7;
-
         /* Reset Initialization control block */
         memset(icb, 0, ha->init_cb_size);
 
@@ -5552,9 +5243,9 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
         memcpy(icb->enode_mac, nv->enode_mac, sizeof(icb->enode_mac));
         /* Some boards (with valid NVRAMs) still have NULL enode_mac!! */
         if (!memcmp(icb->enode_mac, "\0\0\0\0\0\0", sizeof(icb->enode_mac))) {
-                icb->enode_mac[0] = 0x00;
-                icb->enode_mac[1] = 0xC0;
-                icb->enode_mac[2] = 0xDD;
+                icb->enode_mac[0] = 0x01;
+                icb->enode_mac[1] = 0x02;
+                icb->enode_mac[2] = 0x03;
                 icb->enode_mac[3] = 0x04;
                 icb->enode_mac[4] = 0x05;
                 icb->enode_mac[5] = 0x06 + ha->port_no;
@@ -5657,10 +5348,6 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
         if (ql2xloginretrycount)
                 ha->login_retry_count = ql2xloginretrycount;
 
-        /* if not running MSI-X we need handshaking on interrupts */
-        if (!vha->hw->flags.msix_enabled && IS_QLA83XX(ha))
-                icb->firmware_options_2 |= __constant_cpu_to_le32(BIT_22);
-
         /* Enable ZIO. */
         if (!vha->flags.init_done) {
                 ha->zio_mode = le32_to_cpu(icb->firmware_options_2) &
@@ -5733,7 +5420,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                 if ((vha->device_flags & DFLG_NO_CABLE))
                         status = 0;
 
-                ql_log(ql_log_info, vha, 0x8000,
+                ql_log(ql_log_info, vha, 0x803d,
                     "Configure loop done, status = 0x%x.\n", status);
         }
 
@@ -5756,7 +5443,11 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                 clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
 
                 /* Update the firmware version */
-                status = qla82xx_check_md_needed(vha);
+                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);
 
                 if (ha->fce) {
                         ha->flags.fce_enabled = 1;
@@ -5766,7 +5457,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                             ha->fce_dma, ha->fce_bufs, ha->fce_mb,
                             &ha->fce_bufs);
                         if (rval) {
-                                ql_log(ql_log_warn, vha, 0x8001,
+                                ql_log(ql_log_warn, vha, 0x803e,
                                     "Unable to reinitialize FCE (%d).\n",
                                     rval);
                                 ha->flags.fce_enabled = 0;
@@ -5778,7 +5469,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                         rval = qla2x00_enable_eft_trace(vha,
                             ha->eft_dma, EFT_NUM_BUFFERS);
                         if (rval) {
-                                ql_log(ql_log_warn, vha, 0x8010,
+                                ql_log(ql_log_warn, vha, 0x803f,
                                     "Unable to reinitialize EFT (%d).\n",
                                     rval);
                         }
@@ -5786,7 +5477,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
         }
 
         if (!status) {
-                ql_dbg(ql_dbg_taskm, vha, 0x8011,
+                ql_dbg(ql_dbg_taskm, vha, 0x8040,
                     "qla82xx_restart_isp succeeded.\n");
 
                 spin_lock_irqsave(&ha->vport_slock, flags);
@@ -5804,7 +5495,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                 spin_unlock_irqrestore(&ha->vport_slock, flags);
 
         } else {
-                ql_log(ql_log_warn, vha, 0x8016,
+                ql_log(ql_log_warn, vha, 0x8041,
                     "qla82xx_restart_isp **** FAILED ****.\n");
         }
 
@@ -5951,26 +5642,13 @@ qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport)
         if (priority < 0)
                 return QLA_FUNCTION_FAILED;
 
-        if (IS_QLA82XX(vha->hw)) {
-                fcport->fcp_prio = priority & 0xf;
-                return QLA_SUCCESS;
-        }
-
         ret = qla24xx_set_fcp_prio(vha, fcport->loop_id, priority, mb);
-        if (ret == QLA_SUCCESS) {
-                if (fcport->fcp_prio != priority)
-                        ql_dbg(ql_dbg_user, vha, 0x709e,
-                            "Updated FCP_CMND priority - value=%d loop_id=%d "
-                            "port_id=%02x%02x%02x.\n", priority,
-                            fcport->loop_id, fcport->d_id.b.domain,
-                            fcport->d_id.b.area, fcport->d_id.b.al_pa);
-                fcport->fcp_prio = priority & 0xf;
-        } else
+        if (ret == QLA_SUCCESS)
+                fcport->fcp_prio = priority;
+        else
                 ql_dbg(ql_dbg_user, vha, 0x704f,
-                    "Unable to update FCP_CMND priority - ret=0x%x for "
-                    "loop_id=%d port_id=%02x%02x%02x.\n", ret, fcport->loop_id,
-                    fcport->d_id.b.domain, fcport->d_id.b.area,
-                    fcport->d_id.b.al_pa);
+                    "Unable to activate fcp priority, ret=0x%x.\n", ret);
+
         return  ret;
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index c0462c04c88..9902834e0b7 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -57,20 +57,6 @@ host_to_fcp_swap(uint8_t *fcp, uint32_t bsize)
        return fcp;
 }
 
-static inline void
-qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha)
-{
-        int i;
-
-        if (IS_FWI2_CAPABLE(ha))
-                return;
-
-        for (i = 0; i < SNS_FIRST_LOOP_ID; i++)
-                set_bit(i, ha->loop_id_map);
-        set_bit(MANAGEMENT_SERVER, ha->loop_id_map);
-        set_bit(BROADCAST, ha->loop_id_map);
-}
-
 static inline int
 qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)
 {
@@ -83,34 +69,19 @@ qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)
 }
 
 static inline void
-qla2x00_clear_loop_id(fc_port_t *fcport) {
-        struct qla_hw_data *ha = fcport->vha->hw;
-
-        if (fcport->loop_id == FC_NO_LOOP_ID ||
-            qla2x00_is_reserved_id(fcport->vha, fcport->loop_id))
-                return;
-
-        clear_bit(fcport->loop_id, ha->loop_id_map);
-        fcport->loop_id = FC_NO_LOOP_ID;
-}
-
-static inline void
 qla2x00_clean_dsd_pool(struct qla_hw_data *ha, srb_t *sp)
 {
         struct dsd_dma *dsd_ptr, *tdsd_ptr;
-        struct crc_context *ctx;
-
-        ctx = (struct crc_context *)GET_CMD_CTX_SP(sp);
 
         /* clean up allocated prev pool */
         list_for_each_entry_safe(dsd_ptr, tdsd_ptr,
-            &ctx->dsd_list, list) {
+            &((struct crc_context *)sp->ctx)->dsd_list, list) {
                 dma_pool_free(ha->dl_dma_pool, dsd_ptr->dsd_addr,
                     dsd_ptr->dsd_list_dma);
                 list_del(&dsd_ptr->list);
                 kfree(dsd_ptr);
         }
-        INIT_LIST_HEAD(&ctx->dsd_list);
+        INIT_LIST_HEAD(&((struct crc_context *)sp->ctx)->dsd_list);
 }
 
 static inline void
@@ -142,7 +113,8 @@ qla2x00_hba_err_chk_enabled(srb_t *sp)
                 return 0;
          *
          */
-        switch (scsi_get_prot_op(GET_CMD_SP(sp))) {
+
+        switch (scsi_get_prot_op(sp->cmd)) {
         case SCSI_PROT_READ_STRIP:
         case SCSI_PROT_WRITE_INSERT:
                 if (ql2xenablehba_err_chk >= 1)
@@ -159,57 +131,3 @@ qla2x00_hba_err_chk_enabled(srb_t *sp)
         }
         return 0;
 }
-
-static inline int
-qla2x00_reset_active(scsi_qla_host_t *vha)
-{
-        scsi_qla_host_t *base_vha = pci_get_drvdata(vha->hw->pdev);
-
-        /* Test appropriate base-vha and vha flags. */
-        return test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) ||
-            test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) ||
-            test_bit(ISP_ABORT_RETRY, &base_vha->dpc_flags) ||
-            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
-}
-
-static inline srb_t *
-qla2x00_get_sp(scsi_qla_host_t *vha, fc_port_t *fcport, gfp_t flag)
-{
-        srb_t *sp = NULL;
-        struct qla_hw_data *ha = vha->hw;
-        uint8_t bail;
-
-        QLA_VHA_MARK_BUSY(vha, bail);
-        if (unlikely(bail))
-                return NULL;
-
-        sp = mempool_alloc(ha->srb_mempool, flag);
-        if (!sp)
-                goto done;
-
-        memset(sp, 0, sizeof(*sp));
-        sp->fcport = fcport;
-        sp->iocbs = 1;
-done:
-        if (!sp)
-                QLA_VHA_MARK_NOT_BUSY(vha);
-        return sp;
-}
-
-static inline void
-qla2x00_init_timer(srb_t *sp, unsigned long tmo)
-{
-        init_timer(&sp->u.iocb_cmd.timer);
-        sp->u.iocb_cmd.timer.expires = jiffies + tmo * HZ;
-        sp->u.iocb_cmd.timer.data = (unsigned long)sp;
-        sp->u.iocb_cmd.timer.function = qla2x00_sp_timeout;
-        add_timer(&sp->u.iocb_cmd.timer);
-        sp->free = qla2x00_sp_free;
-}
-
-static inline int
-qla2x00_gid_list_size(struct qla_hw_data *ha)
-{
-        return sizeof(struct gid_list_info) * ha->max_fibre_devices;
-}
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index a481684479c..dbec89622a0 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1,17 +1,18 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
-#include "qla_target.h"
 
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 
 #include <scsi/scsi_tcq.h>
 
+static void qla2x00_isp_cmd(struct scsi_qla_host *, struct req_que *);
+
 static void qla25xx_set_que(srb_t *, struct rsp_que **);
 /**
  * qla2x00_get_cmd_direction() - Determine control_flag data direction.
@@ -23,18 +24,18 @@ static inline uint16_t
 qla2x00_get_cmd_direction(srb_t *sp)
 {
         uint16_t cflags;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
-        struct scsi_qla_host *vha = sp->fcport->vha;
 
         cflags = 0;
 
         /* Set transfer direction */
-        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
+        if (sp->cmd->sc_data_direction == DMA_TO_DEVICE) {
                 cflags = CF_WRITE;
-                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
-        } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
+                sp->fcport->vha->hw->qla_stats.output_bytes +=
+                    scsi_bufflen(sp->cmd);
+        } else if (sp->cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 cflags = CF_READ;
-                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
+                sp->fcport->vha->hw->qla_stats.input_bytes +=
+                    scsi_bufflen(sp->cmd);
         }
         return (cflags);
 }
@@ -119,10 +120,11 @@ qla2x00_prep_cont_type0_iocb(struct scsi_qla_host *vha)
  * Returns a pointer to the continuation type 1 IOCB packet.
  */
 static inline cont_a64_entry_t *
-qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha, struct req_que *req)
+qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha)
 {
         cont_a64_entry_t *cont_pkt;
 
+        struct req_que *req = vha->req;
         /* Adjust ring index. */
         req->ring_index++;
         if (req->ring_index == req->length) {
@@ -144,14 +146,20 @@ qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha, struct req_que *req)
 static inline int
 qla24xx_configure_prot_mode(srb_t *sp, uint16_t *fw_prot_opts)
 {
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
-        uint8_t guard = scsi_host_get_guard(cmd->device->host);
+        uint8_t guard = scsi_host_get_guard(sp->cmd->device->host);
+
+        /* We only support T10 DIF right now */
+        if (guard != SHOST_DIX_GUARD_CRC) {
+                ql_dbg(ql_dbg_io, sp->fcport->vha, 0x3007,
+                    "Unsupported guard: %d for cmd=%p.\n", guard, sp->cmd);
+                return 0;
+        }
 
         /* We always use DIFF Bundling for best performance */
         *fw_prot_opts = 0;
 
         /* Translate SCSI opcode to a protection opcode */
-        switch (scsi_get_prot_op(cmd)) {
+        switch (scsi_get_prot_op(sp->cmd)) {
         case SCSI_PROT_READ_STRIP:
                 *fw_prot_opts |= PO_MODE_DIF_REMOVE;
                 break;
@@ -165,18 +173,17 @@ qla24xx_configure_prot_mode(srb_t *sp, uint16_t *fw_prot_opts)
                 *fw_prot_opts |= PO_MODE_DIF_REMOVE;
                 break;
         case SCSI_PROT_READ_PASS:
+                *fw_prot_opts |= PO_MODE_DIF_PASS;
+                break;
         case SCSI_PROT_WRITE_PASS:
-                if (guard & SHOST_DIX_GUARD_IP)
-                        *fw_prot_opts |= PO_MODE_DIF_TCP_CKSUM;
-                else
-                        *fw_prot_opts |= PO_MODE_DIF_PASS;
+                *fw_prot_opts |= PO_MODE_DIF_PASS;
                 break;
         default:        /* Normal Request */
                 *fw_prot_opts |= PO_MODE_DIF_PASS;
                 break;
         }
 
-        return scsi_prot_sg_count(cmd);
+        return scsi_prot_sg_count(sp->cmd);
 }
 
 /*
@@ -197,7 +204,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,
         struct scatterlist *sg;
         int i;
 
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
 
         /* Update entry type to indicate Command Type 2 IOCB */
         *((uint32_t *)(&cmd_pkt->entry_type)) =
@@ -255,7 +262,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
         struct scatterlist *sg;
         int i;
 
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
 
         /* Update entry type to indicate Command Type 3 IOCB */
         *((uint32_t *)(&cmd_pkt->entry_type)) =
@@ -285,7 +292,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
                          * Five DSDs are available in the Continuation
                          * Type 1 IOCB.
                          */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
+                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha);
                         cur_dsd = (uint32_t *)cont_pkt->dseg_0_address;
                         avail_dsds = 5;
                 }
@@ -329,7 +336,7 @@ qla2x00_start_scsi(srb_t *sp)
         vha = sp->fcport->vha;
         ha = vha->hw;
         reg = &ha->iobase->isp;
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
         req = ha->req_q_map[0];
         rsp = ha->rsp_q_map[0];
         /* So we know we haven't pci_map'ed anything yet */
@@ -379,16 +386,15 @@ qla2x00_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                             (req->ring_index - cnt);
-                /* If still no head room then bail out */
-                if (req->cnt < (req_cnt + 2))
-                        goto queuing_error;
         }
+        if (req->cnt < (req_cnt + 2))
+                goto queuing_error;
 
         /* Build command packet */
         req->current_outstanding_cmd = handle;
         req->outstanding_cmds[handle] = sp;
         sp->handle = handle;
-        cmd->host_scribble = (unsigned char *)(unsigned long)handle;
+        sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
         req->cnt -= req_cnt;
 
         cmd_pkt = (cmd_entry_t *)req->ring_ptr;
@@ -400,7 +406,7 @@ qla2x00_start_scsi(srb_t *sp)
 
         /* Set target ID and LUN number*/
         SET_TARGET_ID(ha, cmd_pkt->target, sp->fcport->loop_id);
-        cmd_pkt->lun = cpu_to_le16(cmd->device->lun);
+        cmd_pkt->lun = cpu_to_le16(sp->cmd->device->lun);
 
         /* Update tagged queuing modifier */
         if (scsi_populate_tag_msg(cmd, tag)) {
@@ -463,41 +469,6 @@ queuing_error:
 }
 
 /**
- * qla2x00_start_iocbs() - Execute the IOCB command
- */
-void
-qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)
-{
-        struct qla_hw_data *ha = vha->hw;
-        device_reg_t __iomem *reg = ISP_QUE_REG(ha, req->id);
-
-        if (IS_QLA82XX(ha)) {
-                qla82xx_start_iocbs(vha);
-        } else {
-                /* Adjust ring index. */
-                req->ring_index++;
-                if (req->ring_index == req->length) {
-                        req->ring_index = 0;
-                        req->ring_ptr = req->ring;
-                } else
-                        req->ring_ptr++;
-
-                /* Set chip new ring index. */
-                if (ha->mqenable || IS_QLA83XX(ha)) {
-                        WRT_REG_DWORD(req->req_q_in, req->ring_index);
-                        RD_REG_DWORD_RELAXED(&ha->iobase->isp24.hccr);
-                } else if (IS_FWI2_CAPABLE(ha)) {
-                        WRT_REG_DWORD(&reg->isp24.req_q_in, req->ring_index);
-                        RD_REG_DWORD_RELAXED(&reg->isp24.req_q_in);
-                } else {
-                        WRT_REG_WORD(ISP_REQ_Q_IN(ha, &reg->isp),
-                                req->ring_index);
-                        RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &reg->isp));
-                }
-        }
-}
-
-/**
  * qla2x00_marker() - Send a marker IOCB to the firmware.
  * @ha: HA context
  * @loop_id: loop ID
@@ -519,8 +490,7 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
         scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
         mrk24 = NULL;
-        req = ha->req_q_map[0];
-        mrk = (mrk_entry_t *)qla2x00_alloc_iocbs(vha, NULL);
+        mrk = (mrk_entry_t *)qla2x00_alloc_iocbs(vha, 0);
         if (mrk == NULL) {
                 ql_log(ql_log_warn, base_vha, 0x3026,
                     "Failed to allocate Marker IOCB.\n");
@@ -546,7 +516,7 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
         }
         wmb();
 
-        qla2x00_start_iocbs(vha, req);
+        qla2x00_isp_cmd(vha, req);
 
         return (QLA_SUCCESS);
 }
@@ -566,27 +536,66 @@ qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
         return (ret);
 }
 
-/*
- * qla2x00_issue_marker
+/**
+ * qla2x00_isp_cmd() - Modify the request ring pointer.
+ * @ha: HA context
  *
- * Issue marker
- * Caller CAN have hardware lock held as specified by ha_locked parameter.
- * Might release it, then reaquire.
+ * Note: The caller must hold the hardware lock before calling this routine.
  */
-int qla2x00_issue_marker(scsi_qla_host_t *vha, int ha_locked)
+static void
+qla2x00_isp_cmd(struct scsi_qla_host *vha, struct req_que *req)
 {
-        if (ha_locked) {
-                if (__qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,
-                                        MK_SYNC_ALL) != QLA_SUCCESS)
-                        return QLA_FUNCTION_FAILED;
+        struct qla_hw_data *ha = vha->hw;
+        device_reg_t __iomem *reg = ISP_QUE_REG(ha, req->id);
+        struct device_reg_2xxx __iomem *ioreg = &ha->iobase->isp;
+
+        ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x302d,
+            "IOCB data:\n");
+        ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302e,
+            (uint8_t *)req->ring_ptr, REQUEST_ENTRY_SIZE);
+
+        /* Adjust ring index. */
+        req->ring_index++;
+        if (req->ring_index == req->length) {
+                req->ring_index = 0;
+                req->ring_ptr = req->ring;
+        } else
+                req->ring_ptr++;
+
+        /* Set chip new ring index. */
+        if (IS_QLA82XX(ha)) {
+                uint32_t dbval = 0x04 | (ha->portnum << 5);
+
+                /* write, read and verify logic */
+                dbval = dbval | (req->id << 8) | (req->ring_index << 16);
+                if (ql2xdbwr)
+                        qla82xx_wr_32(ha, ha->nxdb_wr_ptr, dbval);
+                else {
+                        WRT_REG_DWORD(
+                                (unsigned long __iomem *)ha->nxdb_wr_ptr,
+                                dbval);
+                        wmb();
+                        while (RD_REG_DWORD(ha->nxdb_rd_ptr) != dbval) {
+                                WRT_REG_DWORD((unsigned long __iomem *)
+                                        ha->nxdb_wr_ptr, dbval);
+                                wmb();
+                        }
+                }
+        } else if (ha->mqenable) {
+                /* Set chip new ring index. */
+                WRT_REG_DWORD(&reg->isp25mq.req_q_in, req->ring_index);
+                RD_REG_DWORD(&ioreg->hccr);
         } else {
-                if (qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,
-                                        MK_SYNC_ALL) != QLA_SUCCESS)
-                        return QLA_FUNCTION_FAILED;
+                if (IS_FWI2_CAPABLE(ha)) {
+                        WRT_REG_DWORD(&reg->isp24.req_q_in, req->ring_index);
+                        RD_REG_DWORD_RELAXED(&reg->isp24.req_q_in);
+                } else {
+                        WRT_REG_WORD(ISP_REQ_Q_IN(ha, &reg->isp),
+                                req->ring_index);
+                        RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &reg->isp));
+                }
         }
-        vha->marker_needed = 0;
 
-        return QLA_SUCCESS;
 }
 
 /**
@@ -611,119 +620,6 @@ qla24xx_calc_iocbs(scsi_qla_host_t *vha, uint16_t dsds)
         return iocbs;
 }
 
-static inline int
-qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,
-        uint16_t tot_dsds)
-{
-        uint32_t *cur_dsd = NULL;
-        scsi_qla_host_t *vha;
-        struct qla_hw_data *ha;
-        struct scsi_cmnd *cmd;
-        struct  scatterlist *cur_seg;
-        uint32_t *dsd_seg;
-        void *next_dsd;
-        uint8_t avail_dsds;
-        uint8_t first_iocb = 1;
-        uint32_t dsd_list_len;
-        struct dsd_dma *dsd_ptr;
-        struct ct6_dsd *ctx;
-
-        cmd = GET_CMD_SP(sp);
-
-        /* Update entry type to indicate Command Type 3 IOCB */
-        *((uint32_t *)(&cmd_pkt->entry_type)) =
-                __constant_cpu_to_le32(COMMAND_TYPE_6);
-
-        /* No data transfer */
-        if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {
-                cmd_pkt->byte_count = __constant_cpu_to_le32(0);
-                return 0;
-        }
-
-        vha = sp->fcport->vha;
-        ha = vha->hw;
-
-        /* Set transfer direction */
-        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
-                cmd_pkt->control_flags =
-                    __constant_cpu_to_le16(CF_WRITE_DATA);
-                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
-        } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
-                cmd_pkt->control_flags =
-                    __constant_cpu_to_le16(CF_READ_DATA);
-                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
-        }
-
-        cur_seg = scsi_sglist(cmd);
-        ctx = GET_CMD_CTX_SP(sp);
-
-        while (tot_dsds) {
-                avail_dsds = (tot_dsds > QLA_DSDS_PER_IOCB) ?
-                    QLA_DSDS_PER_IOCB : tot_dsds;
-                tot_dsds -= avail_dsds;
-                dsd_list_len = (avail_dsds + 1) * QLA_DSD_SIZE;
-
-                dsd_ptr = list_first_entry(&ha->gbl_dsd_list,
-                    struct dsd_dma, list);
-                next_dsd = dsd_ptr->dsd_addr;
-                list_del(&dsd_ptr->list);
-                ha->gbl_dsd_avail--;
-                list_add_tail(&dsd_ptr->list, &ctx->dsd_list);
-                ctx->dsd_use_cnt++;
-                ha->gbl_dsd_inuse++;
-
-                if (first_iocb) {
-                        first_iocb = 0;
-                        dsd_seg = (uint32_t *)&cmd_pkt->fcp_data_dseg_address;
-                        *dsd_seg++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));
-                        *dsd_seg++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));
-                        cmd_pkt->fcp_data_dseg_len = cpu_to_le32(dsd_list_len);
-                } else {
-                        *cur_dsd++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));
-                        *cur_dsd++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));
-                        *cur_dsd++ = cpu_to_le32(dsd_list_len);
-                }
-                cur_dsd = (uint32_t *)next_dsd;
-                while (avail_dsds) {
-                        dma_addr_t      sle_dma;
-
-                        sle_dma = sg_dma_address(cur_seg);
-                        *cur_dsd++ = cpu_to_le32(LSD(sle_dma));
-                        *cur_dsd++ = cpu_to_le32(MSD(sle_dma));
-                        *cur_dsd++ = cpu_to_le32(sg_dma_len(cur_seg));
-                        cur_seg = sg_next(cur_seg);
-                        avail_dsds--;
-                }
-        }
-
-        /* Null termination */
-        *cur_dsd++ =  0;
-        *cur_dsd++ = 0;
-        *cur_dsd++ = 0;
-        cmd_pkt->control_flags |= CF_DATA_SEG_DESCR_ENABLE;
-        return 0;
-}
-
-/*
- * qla24xx_calc_dsd_lists() - Determine number of DSD list required
- * for Command Type 6.
- *
- * @dsds: number of data segment decriptors needed
- *
- * Returns the number of dsd list needed to store @dsds.
- */
-inline uint16_t
-qla24xx_calc_dsd_lists(uint16_t dsds)
-{
-        uint16_t dsd_lists = 0;
-
-        dsd_lists = (dsds/QLA_DSDS_PER_IOCB);
-        if (dsds % QLA_DSDS_PER_IOCB)
-                dsd_lists++;
-        return dsd_lists;
-}
-
-
 /**
  * qla24xx_build_scsi_iocbs() - Build IOCB command utilizing Command Type 7
  * IOCB types.
@@ -744,7 +640,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
         int i;
         struct req_que *req;
 
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
 
         /* Update entry type to indicate Command Type 3 IOCB */
         *((uint32_t *)(&cmd_pkt->entry_type)) =
@@ -763,11 +659,13 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                 cmd_pkt->task_mgmt_flags =
                     __constant_cpu_to_le16(TMF_WRITE_DATA);
-                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
+                sp->fcport->vha->hw->qla_stats.output_bytes +=
+                    scsi_bufflen(sp->cmd);
         } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 cmd_pkt->task_mgmt_flags =
                     __constant_cpu_to_le16(TMF_READ_DATA);
-                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
+                sp->fcport->vha->hw->qla_stats.input_bytes +=
+                    scsi_bufflen(sp->cmd);
         }
 
         /* One DSD is available in the Command Type 3 IOCB */
@@ -786,7 +684,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
                          * Five DSDs are available in the Continuation
                          * Type 1 IOCB.
                          */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
+                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha);
                         cur_dsd = (uint32_t *)cont_pkt->dseg_0_address;
                         avail_dsds = 5;
                 }
@@ -814,7 +712,8 @@ static inline void
 qla24xx_set_t10dif_tags(srb_t *sp, struct fw_dif_context *pkt,
     unsigned int protcnt)
 {
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd *cmd = sp->cmd;
+        scsi_qla_host_t *vha = shost_priv(cmd->device->host);
 
         switch (scsi_get_prot_type(cmd)) {
         case SCSI_PROT_DIF_TYPE0:
@@ -884,6 +783,12 @@ qla24xx_set_t10dif_tags(srb_t *sp, struct fw_dif_context *pkt,
                 pkt->ref_tag_mask[3] = 0xff;
                 break;
         }
+
+        ql_dbg(ql_dbg_io, vha, 0x3009,
+            "Setting protection Tags: (BIG) ref tag = 0x%x, app tag = 0x%x, "
+            "prot SG count %d, cmd lba 0x%x, prot_type=%u cmd=%p.\n",
+            pkt->ref_tag, pkt->app_tag, protcnt, (int)scsi_get_lba(cmd),
+            scsi_get_prot_type(cmd), cmd);
 }
 
 struct qla2_sgx {
@@ -962,16 +867,16 @@ qla24xx_walk_and_build_sglist_no_difb(struct qla_hw_data *ha, srb_t *sp,
         struct qla2_sgx sgx;
         dma_addr_t      sle_dma;
         uint32_t        sle_dma_len, tot_prot_dma_len = 0;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd *cmd = sp->cmd;
 
         prot_int = cmd->device->sector_size;
 
         memset(&sgx, 0, sizeof(struct qla2_sgx));
-        sgx.tot_bytes = scsi_bufflen(cmd);
-        sgx.cur_sg = scsi_sglist(cmd);
+        sgx.tot_bytes = scsi_bufflen(sp->cmd);
+        sgx.cur_sg = scsi_sglist(sp->cmd);
         sgx.sp = sp;
 
-        sg_prot = scsi_prot_sglist(cmd);
+        sg_prot = scsi_prot_sglist(sp->cmd);
 
         while (qla24xx_get_one_block_sg(prot_int, &sgx, &partial)) {
 
@@ -1005,7 +910,7 @@ alloc_and_fill:
                         }
 
                         list_add_tail(&dsd_ptr->list,
-                            &((struct crc_context *)sp->u.scmd.ctx)->dsd_list);
+                            &((struct crc_context *)sp->ctx)->dsd_list);
 
                         sp->flags |= SRB_CRC_CTX_DSD_VALID;
 
@@ -1041,7 +946,6 @@ alloc_and_fill:
         *cur_dsd++ = 0;
         return 0;
 }
-
 static int
 qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,
         uint16_t tot_dsds)
@@ -1054,9 +958,11 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,
         uint32_t *cur_dsd = dsd;
         int     i;
         uint16_t        used_dsds = tot_dsds;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        scsi_qla_host_t *vha = shost_priv(sp->cmd->device->host);
 
-        scsi_for_each_sg(cmd, sg, tot_dsds, i) {
+        uint8_t         *cp;
+
+        scsi_for_each_sg(sp->cmd, sg, tot_dsds, i) {
                 dma_addr_t      sle_dma;
 
                 /* Allocate additional continuation packets? */
@@ -1086,7 +992,7 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,
                         }
 
                         list_add_tail(&dsd_ptr->list,
-                            &((struct crc_context *)sp->u.scmd.ctx)->dsd_list);
+                            &((struct crc_context *)sp->ctx)->dsd_list);
 
                         sp->flags |= SRB_CRC_CTX_DSD_VALID;
 
@@ -1097,12 +1003,20 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,
                         cur_dsd = (uint32_t *)next_dsd;
                 }
                 sle_dma = sg_dma_address(sg);
-
+                ql_dbg(ql_dbg_io, vha, 0x300a,
+                    "sg entry %d - addr=0x%x 0x%x, " "len=%d for cmd=%p.\n",
+                    cur_dsd, i, LSD(sle_dma), MSD(sle_dma), sg_dma_len(sg),
+                    sp->cmd);
                 *cur_dsd++ = cpu_to_le32(LSD(sle_dma));
                 *cur_dsd++ = cpu_to_le32(MSD(sle_dma));
                 *cur_dsd++ = cpu_to_le32(sg_dma_len(sg));
                 avail_dsds--;
 
+                if (scsi_get_prot_op(sp->cmd) == SCSI_PROT_WRITE_PASS) {
+                        cp = page_address(sg_page(sg)) + sg->offset;
+                        ql_dbg(ql_dbg_io, vha, 0x300b,
+                            "User data buffer=%p for cmd=%p.\n", cp, sp->cmd);
+                }
         }
         /* Null termination */
         *cur_dsd++ = 0;
@@ -1125,8 +1039,11 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
         struct scsi_cmnd *cmd;
         uint32_t *cur_dsd = dsd;
         uint16_t        used_dsds = tot_dsds;
+        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
+        uint8_t         *cp;
+
 
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
         scsi_for_each_prot_sg(cmd, sg, tot_dsds, i) {
                 dma_addr_t      sle_dma;
 
@@ -1157,7 +1074,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
                         }
 
                         list_add_tail(&dsd_ptr->list,
-                            &((struct crc_context *)sp->u.scmd.ctx)->dsd_list);
+                            &((struct crc_context *)sp->ctx)->dsd_list);
 
                         sp->flags |= SRB_CRC_CTX_DSD_VALID;
 
@@ -1168,11 +1085,23 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
                         cur_dsd = (uint32_t *)next_dsd;
                 }
                 sle_dma = sg_dma_address(sg);
-
+                if (scsi_get_prot_op(sp->cmd) == SCSI_PROT_WRITE_PASS) {
+                        ql_dbg(ql_dbg_io, vha, 0x3027,
+                            "%s(): %p, sg_entry %d - "
+                            "addr=0x%x0x%x, len=%d.\n",
+                            __func__, cur_dsd, i,
+                            LSD(sle_dma), MSD(sle_dma), sg_dma_len(sg));
+                }
                 *cur_dsd++ = cpu_to_le32(LSD(sle_dma));
                 *cur_dsd++ = cpu_to_le32(MSD(sle_dma));
                 *cur_dsd++ = cpu_to_le32(sg_dma_len(sg));
 
+                if (scsi_get_prot_op(sp->cmd) == SCSI_PROT_WRITE_PASS) {
+                        cp = page_address(sg_page(sg)) + sg->offset;
+                        ql_dbg(ql_dbg_io, vha, 0x3028,
+                            "%s(): Protection Data buffer = %p.\n", __func__,
+                            cp);
+                }
                 avail_dsds--;
         }
         /* Null termination */
@@ -1213,7 +1142,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
         dma_addr_t              crc_ctx_dma;
         char                    tag[2];
 
-        cmd = GET_CMD_SP(sp);
+        cmd = sp->cmd;
 
         sgc = 0;
         /* Update entry type to indicate Command Type CRC_2 IOCB */
@@ -1230,7 +1159,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
                 return QLA_SUCCESS;
         }
 
-        cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
+        cmd_pkt->vp_index = sp->fcport->vp_idx;
 
         /* Set transfer direction */
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
@@ -1241,15 +1170,15 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
                     __constant_cpu_to_le16(CF_READ_DATA);
         }
 
-        if ((scsi_get_prot_op(cmd) == SCSI_PROT_READ_INSERT) ||
-            (scsi_get_prot_op(cmd) == SCSI_PROT_WRITE_STRIP) ||
-            (scsi_get_prot_op(cmd) == SCSI_PROT_READ_STRIP) ||
-            (scsi_get_prot_op(cmd) == SCSI_PROT_WRITE_INSERT))
+        if ((scsi_get_prot_op(sp->cmd) == SCSI_PROT_READ_INSERT) ||
+            (scsi_get_prot_op(sp->cmd) == SCSI_PROT_WRITE_STRIP) ||
+            (scsi_get_prot_op(sp->cmd) == SCSI_PROT_READ_STRIP) ||
+            (scsi_get_prot_op(sp->cmd) == SCSI_PROT_WRITE_INSERT))
                 bundling = 0;
 
         /* Allocate CRC context from global pool */
-        crc_ctx_pkt = sp->u.scmd.ctx =
-            dma_pool_alloc(ha->dl_dma_pool, GFP_ATOMIC, &crc_ctx_dma);
+        crc_ctx_pkt = sp->ctx = dma_pool_alloc(ha->dl_dma_pool,
+            GFP_ATOMIC, &crc_ctx_dma);
 
         if (!crc_ctx_pkt)
                 goto crc_queuing_error;
@@ -1295,7 +1224,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
         else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
                 fcp_cmnd->additional_cdb_len |= 2;
 
-        int_to_scsilun(cmd->device->lun, &fcp_cmnd->lun);
+        int_to_scsilun(sp->cmd->device->lun, &fcp_cmnd->lun);
         memcpy(fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
         cmd_pkt->fcp_cmnd_dseg_len = cpu_to_le16(fcp_cmnd_len);
         cmd_pkt->fcp_cmnd_dseg_address[0] = cpu_to_le32(
@@ -1330,7 +1259,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
         blk_size = cmd->device->sector_size;
         dif_bytes = (data_bytes / blk_size) * 8;
 
-        switch (scsi_get_prot_op(GET_CMD_SP(sp))) {
+        switch (scsi_get_prot_op(sp->cmd)) {
         case SCSI_PROT_READ_INSERT:
         case SCSI_PROT_WRITE_STRIP:
             total_bytes = data_bytes;
@@ -1349,16 +1278,6 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
 
         if (!qla2x00_hba_err_chk_enabled(sp))
                 fw_prot_opts |= 0x10; /* Disable Guard tag checking */
-        /* HBA error checking enabled */
-        else if (IS_PI_UNINIT_CAPABLE(ha)) {
-                if ((scsi_get_prot_type(GET_CMD_SP(sp)) == SCSI_PROT_DIF_TYPE1)
-                    || (scsi_get_prot_type(GET_CMD_SP(sp)) ==
-                        SCSI_PROT_DIF_TYPE2))
-                        fw_prot_opts |= BIT_10;
-                else if (scsi_get_prot_type(GET_CMD_SP(sp)) ==
-                    SCSI_PROT_DIF_TYPE3)
-                        fw_prot_opts |= BIT_11;
-        }
 
         if (!bundling) {
                 cur_dsd = (uint32_t *) &crc_ctx_pkt->u.nobundling.data_address;
@@ -1440,7 +1359,7 @@ qla24xx_start_scsi(srb_t *sp)
         uint16_t        tot_dsds;
         struct req_que *req = NULL;
         struct rsp_que *rsp = NULL;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd *cmd = sp->cmd;
         struct scsi_qla_host *vha = sp->fcport->vha;
         struct qla_hw_data *ha = vha->hw;
         char            tag[2];
@@ -1497,15 +1416,15 @@ qla24xx_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                                 (req->ring_index - cnt);
-                if (req->cnt < (req_cnt + 2))
-                        goto queuing_error;
         }
+        if (req->cnt < (req_cnt + 2))
+                goto queuing_error;
 
         /* Build command packet. */
         req->current_outstanding_cmd = handle;
         req->outstanding_cmds[handle] = sp;
         sp->handle = handle;
-        cmd->host_scribble = (unsigned char *)(unsigned long)handle;
+        sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
         req->cnt -= req_cnt;
 
         cmd_pkt = (struct cmd_type_7 *)req->ring_ptr;
@@ -1522,9 +1441,9 @@ qla24xx_start_scsi(srb_t *sp)
         cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
         cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
         cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-        cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
+        cmd_pkt->vp_index = sp->fcport->vp_idx;
 
-        int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
+        int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
         host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
 
         /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
@@ -1606,7 +1525,7 @@ qla24xx_dif_start_scsi(srb_t *sp)
         uint16_t                fw_prot_opts = 0;
         struct req_que          *req = NULL;
         struct rsp_que          *rsp = NULL;
-        struct scsi_cmnd        *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd        *cmd = sp->cmd;
         struct scsi_qla_host    *vha = sp->fcport->vha;
         struct qla_hw_data      *ha = vha->hw;
         struct cmd_type_crc_2   *cmd_pkt;
@@ -1712,17 +1631,18 @@ qla24xx_dif_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                                 (req->ring_index - cnt);
-                if (req->cnt < (req_cnt + 2))
-                        goto queuing_error;
         }
 
+        if (req->cnt < (req_cnt + 2))
+                goto queuing_error;
+
         status |= QDSS_GOT_Q_SPACE;
 
         /* Build header part of command packet (excluding the OPCODE). */
         req->current_outstanding_cmd = handle;
         req->outstanding_cmds[handle] = sp;
         sp->handle = handle;
-        cmd->host_scribble = (unsigned char *)(unsigned long)handle;
+        sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
         req->cnt -= req_cnt;
 
         /* Fill-in common area */
@@ -1738,7 +1658,7 @@ qla24xx_dif_start_scsi(srb_t *sp)
         cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
         cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
 
-        int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
+        int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
         host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
 
         /* Total Data and protection segment(s) */
@@ -1791,7 +1711,7 @@ queuing_error:
 
 static void qla25xx_set_que(srb_t *sp, struct rsp_que **rsp)
 {
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd *cmd = sp->cmd;
         struct qla_hw_data *ha = sp->fcport->vha->hw;
         int affinity = cmd->request->cpu;
 
@@ -1831,7 +1751,7 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp)
         }
         if (index == MAX_OUTSTANDING_COMMANDS) {
                 ql_log(ql_log_warn, vha, 0x700b,
-                    "No room on outstanding cmd array.\n");
+                    "No room on oustanding cmd array.\n");
                 goto queuing_error;
         }
 
@@ -1840,14 +1760,10 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp)
         req->outstanding_cmds[handle] = sp;
         sp->handle = handle;
 
-        /* Adjust entry-counts as needed. */
-        if (sp->type != SRB_SCSI_CMD)
-                req_cnt = sp->iocbs;
-
 skip_cmd_array:
         /* Check for room on request queue. */
         if (req->cnt < req_cnt) {
-                if (ha->mqenable || IS_QLA83XX(ha))
+                if (ha->mqenable)
                         cnt = RD_REG_DWORD(&reg->isp25mq.req_q_out);
                 else if (IS_QLA82XX(ha))
                         cnt = RD_REG_DWORD(&reg->isp82.req_q_out);
@@ -1878,9 +1794,46 @@ queuing_error:
 }
 
 static void
+qla2x00_start_iocbs(srb_t *sp)
+{
+        struct qla_hw_data *ha = sp->fcport->vha->hw;
+        struct req_que *req = ha->req_q_map[0];
+        device_reg_t __iomem *reg = ISP_QUE_REG(ha, req->id);
+        struct device_reg_2xxx __iomem *ioreg = &ha->iobase->isp;
+
+        if (IS_QLA82XX(ha)) {
+                qla82xx_start_iocbs(sp);
+        } else {
+                /* Adjust ring index. */
+                req->ring_index++;
+                if (req->ring_index == req->length) {
+                        req->ring_index = 0;
+                        req->ring_ptr = req->ring;
+                } else
+                        req->ring_ptr++;
+
+                /* Set chip new ring index. */
+                if (ha->mqenable) {
+                        WRT_REG_DWORD(&reg->isp25mq.req_q_in, req->ring_index);
+                        RD_REG_DWORD(&ioreg->hccr);
+                } else if (IS_QLA82XX(ha)) {
+                        qla82xx_start_iocbs(sp);
+                } else if (IS_FWI2_CAPABLE(ha)) {
+                        WRT_REG_DWORD(&reg->isp24.req_q_in, req->ring_index);
+                        RD_REG_DWORD_RELAXED(&reg->isp24.req_q_in);
+                } else {
+                        WRT_REG_WORD(ISP_REQ_Q_IN(ha, &reg->isp),
+                                req->ring_index);
+                        RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &reg->isp));
+                }
+        }
+}
+
+static void
 qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)
 {
-        struct srb_iocb *lio = &sp->u.iocb_cmd;
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *lio = ctx->u.iocb_cmd;
 
         logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;
         logio->control_flags = cpu_to_le16(LCF_COMMAND_PLOGI);
@@ -1892,14 +1845,15 @@ qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->port_id[0] = sp->fcport->d_id.b.al_pa;
         logio->port_id[1] = sp->fcport->d_id.b.area;
         logio->port_id[2] = sp->fcport->d_id.b.domain;
-        logio->vp_index = sp->fcport->vha->vp_idx;
+        logio->vp_index = sp->fcport->vp_idx;
 }
 
 static void
 qla2x00_login_iocb(srb_t *sp, struct mbx_entry *mbx)
 {
         struct qla_hw_data *ha = sp->fcport->vha->hw;
-        struct srb_iocb *lio = &sp->u.iocb_cmd;
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *lio = ctx->u.iocb_cmd;
         uint16_t opts;
 
         mbx->entry_type = MBX_IOCB_TYPE;
@@ -1916,7 +1870,7 @@ qla2x00_login_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain);
         mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 |
             sp->fcport->d_id.b.al_pa);
-        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
 }
 
 static void
@@ -1929,7 +1883,7 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->port_id[0] = sp->fcport->d_id.b.al_pa;
         logio->port_id[1] = sp->fcport->d_id.b.area;
         logio->port_id[2] = sp->fcport->d_id.b.domain;
-        logio->vp_index = sp->fcport->vha->vp_idx;
+        logio->vp_index = sp->fcport->vp_idx;
 }
 
 static void
@@ -1946,7 +1900,7 @@ qla2x00_logout_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain);
         mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 |
             sp->fcport->d_id.b.al_pa);
-        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
         /* Implicit: mbx->mbx10 = 0. */
 }
 
@@ -1956,7 +1910,7 @@ qla24xx_adisc_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;
         logio->control_flags = cpu_to_le16(LCF_COMMAND_ADISC);
         logio->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-        logio->vp_index = sp->fcport->vha->vp_idx;
+        logio->vp_index = sp->fcport->vp_idx;
 }
 
 static void
@@ -1977,7 +1931,7 @@ qla2x00_adisc_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb3 = cpu_to_le16(LSW(ha->async_pd_dma));
         mbx->mb6 = cpu_to_le16(MSW(MSD(ha->async_pd_dma)));
         mbx->mb7 = cpu_to_le16(LSW(MSD(ha->async_pd_dma)));
-        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
 }
 
 static void
@@ -1988,7 +1942,8 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)
         struct fc_port *fcport = sp->fcport;
         scsi_qla_host_t *vha = fcport->vha;
         struct qla_hw_data *ha = vha->hw;
-        struct srb_iocb *iocb = &sp->u.iocb_cmd;
+        struct srb_ctx *ctx = sp->ctx;
+        struct srb_iocb *iocb = ctx->u.iocb_cmd;
         struct req_que *req = vha->req;
 
         flags = iocb->u.tmf.flags;
@@ -2003,7 +1958,7 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)
         tsk->port_id[0] = fcport->d_id.b.al_pa;
         tsk->port_id[1] = fcport->d_id.b.area;
         tsk->port_id[2] = fcport->d_id.b.domain;
-        tsk->vp_index = fcport->vha->vp_idx;
+        tsk->vp_index = fcport->vp_idx;
 
         if (flags == TCF_LUN_RESET) {
                 int_to_scsilun(lun, &tsk->lun);
@@ -2015,7 +1970,7 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)
 static void
 qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
 {
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
+        struct fc_bsg_job *bsg_job = ((struct srb_ctx *)sp->ctx)->u.bsg_job;
 
         els_iocb->entry_type = ELS_IOCB_TYPE;
         els_iocb->entry_count = 1;
@@ -2024,12 +1979,12 @@ qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
         els_iocb->handle = sp->handle;
         els_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);
         els_iocb->tx_dsd_count = __constant_cpu_to_le16(bsg_job->request_payload.sg_cnt);
-        els_iocb->vp_index = sp->fcport->vha->vp_idx;
+        els_iocb->vp_index = sp->fcport->vp_idx;
         els_iocb->sof_type = EST_SOFI3;
         els_iocb->rx_dsd_count = __constant_cpu_to_le16(bsg_job->reply_payload.sg_cnt);
 
         els_iocb->opcode =
-            sp->type == SRB_ELS_CMD_RPT ?
+            (((struct srb_ctx *)sp->ctx)->type == SRB_ELS_CMD_RPT) ?
             bsg_job->request->rqst_data.r_els.els_code :
             bsg_job->request->rqst_data.h_els.command_code;
         els_iocb->port_id[0] = sp->fcport->d_id.b.al_pa;
@@ -2066,7 +2021,7 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)
         uint16_t tot_dsds;
         scsi_qla_host_t *vha = sp->fcport->vha;
         struct qla_hw_data *ha = vha->hw;
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
+        struct fc_bsg_job *bsg_job = ((struct srb_ctx *)sp->ctx)->u.bsg_job;
         int loop_iterartion = 0;
         int cont_iocb_prsnt = 0;
         int entry_count = 1;
@@ -2115,8 +2070,7 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)
                         * Five DSDs are available in the Cont.
                         * Type 1 IOCB.
                                */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha,
-                            vha->hw->req_q_map[0]);
+                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha);
                         cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
                         avail_dsds = 5;
                         cont_iocb_prsnt = 1;
@@ -2142,8 +2096,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
         int index;
         uint16_t tot_dsds;
         scsi_qla_host_t *vha = sp->fcport->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
+        struct fc_bsg_job *bsg_job = ((struct srb_ctx *)sp->ctx)->u.bsg_job;
         int loop_iterartion = 0;
         int cont_iocb_prsnt = 0;
         int entry_count = 1;
@@ -2154,7 +2107,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
         ct_iocb->handle = sp->handle;
 
         ct_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-        ct_iocb->vp_index = sp->fcport->vha->vp_idx;
+        ct_iocb->vp_index = sp->fcport->vp_idx;
         ct_iocb->comp_status = __constant_cpu_to_le16(0);
 
         ct_iocb->cmd_dsd_count =
@@ -2188,8 +2141,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
                         * Five DSDs are available in the Cont.
                         * Type 1 IOCB.
                                */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha,
-                            ha->req_q_map[0]);
+                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha);
                         cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
                         avail_dsds = 5;
                         cont_iocb_prsnt = 1;
@@ -2206,388 +2158,13 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
         ct_iocb->entry_count = entry_count;
 }
 
-/*
- * qla82xx_start_scsi() - Send a SCSI command to the ISP
- * @sp: command to send to the ISP
- *
- * Returns non-zero if a failure occurred, else zero.
- */
-int
-qla82xx_start_scsi(srb_t *sp)
-{
-        int             ret, nseg;
-        unsigned long   flags;
-        struct scsi_cmnd *cmd;
-        uint32_t        *clr_ptr;
-        uint32_t        index;
-        uint32_t        handle;
-        uint16_t        cnt;
-        uint16_t        req_cnt;
-        uint16_t        tot_dsds;
-        struct device_reg_82xx __iomem *reg;
-        uint32_t dbval;
-        uint32_t *fcp_dl;
-        uint8_t additional_cdb_len;
-        struct ct6_dsd *ctx;
-        struct scsi_qla_host *vha = sp->fcport->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct req_que *req = NULL;
-        struct rsp_que *rsp = NULL;
-        char tag[2];
-
-        /* Setup device pointers. */
-        ret = 0;
-        reg = &ha->iobase->isp82;
-        cmd = GET_CMD_SP(sp);
-        req = vha->req;
-        rsp = ha->rsp_q_map[0];
-
-        /* So we know we haven't pci_map'ed anything yet */
-        tot_dsds = 0;
-
-        dbval = 0x04 | (ha->portnum << 5);
-
-        /* Send marker if required */
-        if (vha->marker_needed != 0) {
-                if (qla2x00_marker(vha, req,
-                        rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {
-                        ql_log(ql_log_warn, vha, 0x300c,
-                            "qla2x00_marker failed for cmd=%p.\n", cmd);
-                        return QLA_FUNCTION_FAILED;
-                }
-                vha->marker_needed = 0;
-        }
-
-        /* Acquire ring specific lock */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        /* Check for room in outstanding command list. */
-        handle = req->current_outstanding_cmd;
-        for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
-                handle++;
-                if (handle == MAX_OUTSTANDING_COMMANDS)
-                        handle = 1;
-                if (!req->outstanding_cmds[handle])
-                        break;
-        }
-        if (index == MAX_OUTSTANDING_COMMANDS)
-                goto queuing_error;
-
-        /* Map the sg table so we have an accurate count of sg entries needed */
-        if (scsi_sg_count(cmd)) {
-                nseg = dma_map_sg(&ha->pdev->dev, scsi_sglist(cmd),
-                    scsi_sg_count(cmd), cmd->sc_data_direction);
-                if (unlikely(!nseg))
-                        goto queuing_error;
-        } else
-                nseg = 0;
-
-        tot_dsds = nseg;
-
-        if (tot_dsds > ql2xshiftctondsd) {
-                struct cmd_type_6 *cmd_pkt;
-                uint16_t more_dsd_lists = 0;
-                struct dsd_dma *dsd_ptr;
-                uint16_t i;
-
-                more_dsd_lists = qla24xx_calc_dsd_lists(tot_dsds);
-                if ((more_dsd_lists + ha->gbl_dsd_inuse) >= NUM_DSD_CHAIN) {
-                        ql_dbg(ql_dbg_io, vha, 0x300d,
-                            "Num of DSD list %d is than %d for cmd=%p.\n",
-                            more_dsd_lists + ha->gbl_dsd_inuse, NUM_DSD_CHAIN,
-                            cmd);
-                        goto queuing_error;
-                }
-
-                if (more_dsd_lists <= ha->gbl_dsd_avail)
-                        goto sufficient_dsds;
-                else
-                        more_dsd_lists -= ha->gbl_dsd_avail;
-
-                for (i = 0; i < more_dsd_lists; i++) {
-                        dsd_ptr = kzalloc(sizeof(struct dsd_dma), GFP_ATOMIC);
-                        if (!dsd_ptr) {
-                                ql_log(ql_log_fatal, vha, 0x300e,
-                                    "Failed to allocate memory for dsd_dma "
-                                    "for cmd=%p.\n", cmd);
-                                goto queuing_error;
-                        }
-
-                        dsd_ptr->dsd_addr = dma_pool_alloc(ha->dl_dma_pool,
-                                GFP_ATOMIC, &dsd_ptr->dsd_list_dma);
-                        if (!dsd_ptr->dsd_addr) {
-                                kfree(dsd_ptr);
-                                ql_log(ql_log_fatal, vha, 0x300f,
-                                    "Failed to allocate memory for dsd_addr "
-                                    "for cmd=%p.\n", cmd);
-                                goto queuing_error;
-                        }
-                        list_add_tail(&dsd_ptr->list, &ha->gbl_dsd_list);
-                        ha->gbl_dsd_avail++;
-                }
-
-sufficient_dsds:
-                req_cnt = 1;
-
-                if (req->cnt < (req_cnt + 2)) {
-                        cnt = (uint16_t)RD_REG_DWORD_RELAXED(
-                                &reg->req_q_out[0]);
-                        if (req->ring_index < cnt)
-                                req->cnt = cnt - req->ring_index;
-                        else
-                                req->cnt = req->length -
-                                        (req->ring_index - cnt);
-                        if (req->cnt < (req_cnt + 2))
-                                goto queuing_error;
-                }
-
-                ctx = sp->u.scmd.ctx =
-                    mempool_alloc(ha->ctx_mempool, GFP_ATOMIC);
-                if (!ctx) {
-                        ql_log(ql_log_fatal, vha, 0x3010,
-                            "Failed to allocate ctx for cmd=%p.\n", cmd);
-                        goto queuing_error;
-                }
-
-                memset(ctx, 0, sizeof(struct ct6_dsd));
-                ctx->fcp_cmnd = dma_pool_alloc(ha->fcp_cmnd_dma_pool,
-                        GFP_ATOMIC, &ctx->fcp_cmnd_dma);
-                if (!ctx->fcp_cmnd) {
-                        ql_log(ql_log_fatal, vha, 0x3011,
-                            "Failed to allocate fcp_cmnd for cmd=%p.\n", cmd);
-                        goto queuing_error;
-                }
-
-                /* Initialize the DSD list and dma handle */
-                INIT_LIST_HEAD(&ctx->dsd_list);
-                ctx->dsd_use_cnt = 0;
-
-                if (cmd->cmd_len > 16) {
-                        additional_cdb_len = cmd->cmd_len - 16;
-                        if ((cmd->cmd_len % 4) != 0) {
-                                /* SCSI command bigger than 16 bytes must be
-                                 * multiple of 4
-                                 */
-                                ql_log(ql_log_warn, vha, 0x3012,
-                                    "scsi cmd len %d not multiple of 4 "
-                                    "for cmd=%p.\n", cmd->cmd_len, cmd);
-                                goto queuing_error_fcp_cmnd;
-                        }
-                        ctx->fcp_cmnd_len = 12 + cmd->cmd_len + 4;
-                } else {
-                        additional_cdb_len = 0;
-                        ctx->fcp_cmnd_len = 12 + 16 + 4;
-                }
-
-                cmd_pkt = (struct cmd_type_6 *)req->ring_ptr;
-                cmd_pkt->handle = MAKE_HANDLE(req->id, handle);
-
-                /* Zero out remaining portion of packet. */
-                /*    tagged queuing modifier -- default is TSK_SIMPLE (0). */
-                clr_ptr = (uint32_t *)cmd_pkt + 2;
-                memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
-                cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
-
-                /* Set NPORT-ID and LUN number*/
-                cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-                cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
-                cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
-                cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-                cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
-
-                /* Build IOCB segments */
-                if (qla24xx_build_scsi_type_6_iocbs(sp, cmd_pkt, tot_dsds))
-                        goto queuing_error_fcp_cmnd;
-
-                int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
-                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
-
-                /* build FCP_CMND IU */
-                memset(ctx->fcp_cmnd, 0, sizeof(struct fcp_cmnd));
-                int_to_scsilun(cmd->device->lun, &ctx->fcp_cmnd->lun);
-                ctx->fcp_cmnd->additional_cdb_len = additional_cdb_len;
-
-                if (cmd->sc_data_direction == DMA_TO_DEVICE)
-                        ctx->fcp_cmnd->additional_cdb_len |= 1;
-                else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
-                        ctx->fcp_cmnd->additional_cdb_len |= 2;
-
-                /*
-                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
-                 */
-                if (scsi_populate_tag_msg(cmd, tag)) {
-                        switch (tag[0]) {
-                        case HEAD_OF_QUEUE_TAG:
-                                ctx->fcp_cmnd->task_attribute =
-                                    TSK_HEAD_OF_QUEUE;
-                                break;
-                        case ORDERED_QUEUE_TAG:
-                                ctx->fcp_cmnd->task_attribute =
-                                    TSK_ORDERED;
-                                break;
-                        }
-                }
-
-                /* Populate the FCP_PRIO. */
-                if (ha->flags.fcp_prio_enabled)
-                        ctx->fcp_cmnd->task_attribute |=
-                            sp->fcport->fcp_prio << 3;
-
-                memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
-
-                fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +
-                    additional_cdb_len);
-                *fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));
-
-                cmd_pkt->fcp_cmnd_dseg_len = cpu_to_le16(ctx->fcp_cmnd_len);
-                cmd_pkt->fcp_cmnd_dseg_address[0] =
-                    cpu_to_le32(LSD(ctx->fcp_cmnd_dma));
-                cmd_pkt->fcp_cmnd_dseg_address[1] =
-                    cpu_to_le32(MSD(ctx->fcp_cmnd_dma));
-
-                sp->flags |= SRB_FCP_CMND_DMA_VALID;
-                cmd_pkt->byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));
-                /* Set total data segment count. */
-                cmd_pkt->entry_count = (uint8_t)req_cnt;
-                /* Specify response queue number where
-                 * completion should happen
-                 */
-                cmd_pkt->entry_status = (uint8_t) rsp->id;
-        } else {
-                struct cmd_type_7 *cmd_pkt;
-                req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
-                if (req->cnt < (req_cnt + 2)) {
-                        cnt = (uint16_t)RD_REG_DWORD_RELAXED(
-                            &reg->req_q_out[0]);
-                        if (req->ring_index < cnt)
-                                req->cnt = cnt - req->ring_index;
-                        else
-                                req->cnt = req->length -
-                                        (req->ring_index - cnt);
-                }
-                if (req->cnt < (req_cnt + 2))
-                        goto queuing_error;
-
-                cmd_pkt = (struct cmd_type_7 *)req->ring_ptr;
-                cmd_pkt->handle = MAKE_HANDLE(req->id, handle);
-
-                /* Zero out remaining portion of packet. */
-                /* tagged queuing modifier -- default is TSK_SIMPLE (0).*/
-                clr_ptr = (uint32_t *)cmd_pkt + 2;
-                memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
-                cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
-
-                /* Set NPORT-ID and LUN number*/
-                cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-                cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
-                cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
-                cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-                cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
-
-                int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
-                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun,
-                    sizeof(cmd_pkt->lun));
-
-                /*
-                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
-                 */
-                if (scsi_populate_tag_msg(cmd, tag)) {
-                        switch (tag[0]) {
-                        case HEAD_OF_QUEUE_TAG:
-                                cmd_pkt->task = TSK_HEAD_OF_QUEUE;
-                                break;
-                        case ORDERED_QUEUE_TAG:
-                                cmd_pkt->task = TSK_ORDERED;
-                                break;
-                        }
-                }
-
-                /* Populate the FCP_PRIO. */
-                if (ha->flags.fcp_prio_enabled)
-                        cmd_pkt->task |= sp->fcport->fcp_prio << 3;
-
-                /* Load SCSI command packet. */
-                memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
-                host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb));
-
-                cmd_pkt->byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));
-
-                /* Build IOCB segments */
-                qla24xx_build_scsi_iocbs(sp, cmd_pkt, tot_dsds);
-
-                /* Set total data segment count. */
-                cmd_pkt->entry_count = (uint8_t)req_cnt;
-                /* Specify response queue number where
-                 * completion should happen.
-                 */
-                cmd_pkt->entry_status = (uint8_t) rsp->id;
-
-        }
-        /* Build command packet. */
-        req->current_outstanding_cmd = handle;
-        req->outstanding_cmds[handle] = sp;
-        sp->handle = handle;
-        cmd->host_scribble = (unsigned char *)(unsigned long)handle;
-        req->cnt -= req_cnt;
-        wmb();
-
-        /* Adjust ring index. */
-        req->ring_index++;
-        if (req->ring_index == req->length) {
-                req->ring_index = 0;
-                req->ring_ptr = req->ring;
-        } else
-                req->ring_ptr++;
-
-        sp->flags |= SRB_DMA_VALID;
-
-        /* Set chip new ring index. */
-        /* write, read and verify logic */
-        dbval = dbval | (req->id << 8) | (req->ring_index << 16);
-        if (ql2xdbwr)
-                qla82xx_wr_32(ha, ha->nxdb_wr_ptr, dbval);
-        else {
-                WRT_REG_DWORD(
-                        (unsigned long __iomem *)ha->nxdb_wr_ptr,
-                        dbval);
-                wmb();
-                while (RD_REG_DWORD((void __iomem *)ha->nxdb_rd_ptr) != dbval) {
-                        WRT_REG_DWORD(
-                                (unsigned long __iomem *)ha->nxdb_wr_ptr,
-                                dbval);
-                        wmb();
-                }
-        }
-
-        /* Manage unprocessed RIO/ZIO commands in response queue. */
-        if (vha->flags.process_response_queue &&
-            rsp->ring_ptr->signature != RESPONSE_PROCESSED)
-                qla24xx_process_response_queue(vha, rsp);
-
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        return QLA_SUCCESS;
-
-queuing_error_fcp_cmnd:
-        dma_pool_free(ha->fcp_cmnd_dma_pool, ctx->fcp_cmnd, ctx->fcp_cmnd_dma);
-queuing_error:
-        if (tot_dsds)
-                scsi_dma_unmap(cmd);
-
-        if (sp->u.scmd.ctx) {
-                mempool_free(sp->u.scmd.ctx, ha->ctx_mempool);
-                sp->u.scmd.ctx = NULL;
-        }
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return QLA_FUNCTION_FAILED;
-}
-
 int
 qla2x00_start_sp(srb_t *sp)
 {
         int rval;
         struct qla_hw_data *ha = sp->fcport->vha->hw;
         void *pkt;
+        struct srb_ctx *ctx = sp->ctx;
         unsigned long flags;
 
         rval = QLA_FUNCTION_FAILED;
@@ -2600,7 +2177,7 @@ qla2x00_start_sp(srb_t *sp)
         }
 
         rval = QLA_SUCCESS;
-        switch (sp->type) {
+        switch (ctx->type) {
         case SRB_LOGIN_CMD:
                 IS_FWI2_CAPABLE(ha) ?
                     qla24xx_login_iocb(sp, pkt) :
@@ -2617,8 +2194,8 @@ qla2x00_start_sp(srb_t *sp)
                 break;
         case SRB_CT_CMD:
                 IS_FWI2_CAPABLE(ha) ?
-                    qla24xx_ct_iocb(sp, pkt) :
-                    qla2x00_ct_iocb(sp, pkt);
+                qla24xx_ct_iocb(sp, pkt) :
+                qla2x00_ct_iocb(sp, pkt);
                 break;
         case SRB_ADISC_CMD:
                 IS_FWI2_CAPABLE(ha) ?
@@ -2633,197 +2210,8 @@ qla2x00_start_sp(srb_t *sp)
         }
 
         wmb();
-        qla2x00_start_iocbs(sp->fcport->vha, ha->req_q_map[0]);
+        qla2x00_start_iocbs(sp);
 done:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         return rval;
 }
-
-static void
-qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,
-                                struct cmd_bidir *cmd_pkt, uint32_t tot_dsds)
-{
-        uint16_t avail_dsds;
-        uint32_t *cur_dsd;
-        uint32_t req_data_len = 0;
-        uint32_t rsp_data_len = 0;
-        struct scatterlist *sg;
-        int index;
-        int entry_count = 1;
-        struct fc_bsg_job *bsg_job = sp->u.bsg_job;
-
-        /*Update entry type to indicate bidir command */
-        *((uint32_t *)(&cmd_pkt->entry_type)) =
-                __constant_cpu_to_le32(COMMAND_BIDIRECTIONAL);
-
-        /* Set the transfer direction, in this set both flags
-         * Also set the BD_WRAP_BACK flag, firmware will take care
-         * assigning DID=SID for outgoing pkts.
-         */
-        cmd_pkt->wr_dseg_count = cpu_to_le16(bsg_job->request_payload.sg_cnt);
-        cmd_pkt->rd_dseg_count = cpu_to_le16(bsg_job->reply_payload.sg_cnt);
-        cmd_pkt->control_flags =
-                        __constant_cpu_to_le16(BD_WRITE_DATA | BD_READ_DATA |
-                                                        BD_WRAP_BACK);
-
-        req_data_len = rsp_data_len = bsg_job->request_payload.payload_len;
-        cmd_pkt->wr_byte_count = cpu_to_le32(req_data_len);
-        cmd_pkt->rd_byte_count = cpu_to_le32(rsp_data_len);
-        cmd_pkt->timeout = cpu_to_le16(qla2x00_get_async_timeout(vha) + 2);
-
-        vha->bidi_stats.transfer_bytes += req_data_len;
-        vha->bidi_stats.io_count++;
-
-        /* Only one dsd is available for bidirectional IOCB, remaining dsds
-         * are bundled in continuation iocb
-         */
-        avail_dsds = 1;
-        cur_dsd = (uint32_t *)&cmd_pkt->fcp_data_dseg_address;
-
-        index = 0;
-
-        for_each_sg(bsg_job->request_payload.sg_list, sg,
-                                bsg_job->request_payload.sg_cnt, index) {
-                dma_addr_t sle_dma;
-                cont_a64_entry_t *cont_pkt;
-
-                /* Allocate additional continuation packets */
-                if (avail_dsds == 0) {
-                        /* Continuation type 1 IOCB can accomodate
-                         * 5 DSDS
-                         */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
-                        cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
-                        avail_dsds = 5;
-                        entry_count++;
-                }
-                sle_dma = sg_dma_address(sg);
-                *cur_dsd++   = cpu_to_le32(LSD(sle_dma));
-                *cur_dsd++   = cpu_to_le32(MSD(sle_dma));
-                *cur_dsd++   = cpu_to_le32(sg_dma_len(sg));
-                avail_dsds--;
-        }
-        /* For read request DSD will always goes to continuation IOCB
-         * and follow the write DSD. If there is room on the current IOCB
-         * then it is added to that IOCB else new continuation IOCB is
-         * allocated.
-         */
-        for_each_sg(bsg_job->reply_payload.sg_list, sg,
-                                bsg_job->reply_payload.sg_cnt, index) {
-                dma_addr_t sle_dma;
-                cont_a64_entry_t *cont_pkt;
-
-                /* Allocate additional continuation packets */
-                if (avail_dsds == 0) {
-                        /* Continuation type 1 IOCB can accomodate
-                         * 5 DSDS
-                         */
-                        cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
-                        cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
-                        avail_dsds = 5;
-                        entry_count++;
-                }
-                sle_dma = sg_dma_address(sg);
-                *cur_dsd++   = cpu_to_le32(LSD(sle_dma));
-                *cur_dsd++   = cpu_to_le32(MSD(sle_dma));
-                *cur_dsd++   = cpu_to_le32(sg_dma_len(sg));
-                avail_dsds--;
-        }
-        /* This value should be same as number of IOCB required for this cmd */
-        cmd_pkt->entry_count = entry_count;
-}
-
-int
-qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds)
-{
-
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long flags;
-        uint32_t handle;
-        uint32_t index;
-        uint16_t req_cnt;
-        uint16_t cnt;
-        uint32_t *clr_ptr;
-        struct cmd_bidir *cmd_pkt = NULL;
-        struct rsp_que *rsp;
-        struct req_que *req;
-        int rval = EXT_STATUS_OK;
-
-        rval = QLA_SUCCESS;
-
-        rsp = ha->rsp_q_map[0];
-        req = vha->req;
-
-        /* Send marker if required */
-        if (vha->marker_needed != 0) {
-                if (qla2x00_marker(vha, req,
-                        rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS)
-                        return EXT_STATUS_MAILBOX;
-                vha->marker_needed = 0;
-        }
-
-        /* Acquire ring specific lock */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        /* Check for room in outstanding command list. */
-        handle = req->current_outstanding_cmd;
-        for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
-                handle++;
-        if (handle == MAX_OUTSTANDING_COMMANDS)
-                handle = 1;
-        if (!req->outstanding_cmds[handle])
-                break;
-        }
-
-        if (index == MAX_OUTSTANDING_COMMANDS) {
-                rval = EXT_STATUS_BUSY;
-                goto queuing_error;
-        }
-
-        /* Calculate number of IOCB required */
-        req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
-
-        /* Check for room on request queue. */
-        if (req->cnt < req_cnt + 2) {
-                cnt = RD_REG_DWORD_RELAXED(req->req_q_out);
-
-                if  (req->ring_index < cnt)
-                        req->cnt = cnt - req->ring_index;
-                else
-                        req->cnt = req->length -
-                                (req->ring_index - cnt);
-        }
-        if (req->cnt < req_cnt + 2) {
-                rval = EXT_STATUS_BUSY;
-                goto queuing_error;
-        }
-
-        cmd_pkt = (struct cmd_bidir *)req->ring_ptr;
-        cmd_pkt->handle = MAKE_HANDLE(req->id, handle);
-
-        /* Zero out remaining portion of packet. */
-        /* tagged queuing modifier -- default is TSK_SIMPLE (0).*/
-        clr_ptr = (uint32_t *)cmd_pkt + 2;
-        memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
-
-        /* Set NPORT-ID  (of vha)*/
-        cmd_pkt->nport_handle = cpu_to_le16(vha->self_login_loop_id);
-        cmd_pkt->port_id[0] = vha->d_id.b.al_pa;
-        cmd_pkt->port_id[1] = vha->d_id.b.area;
-        cmd_pkt->port_id[2] = vha->d_id.b.domain;
-
-        qla25xx_build_bidir_iocb(sp, vha, cmd_pkt, tot_dsds);
-        cmd_pkt->entry_status = (uint8_t) rsp->id;
-        /* Build command packet. */
-        req->current_outstanding_cmd = handle;
-        req->outstanding_cmds[handle] = sp;
-        sp->handle = handle;
-        req->cnt -= req_cnt;
-
-        /* Send the command to the firmware */
-        wmb();
-        qla2x00_start_iocbs(vha, req);
-queuing_error:
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        return rval;
-}
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 873c82014b1..8a7591f035e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1,11 +1,10 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
-#include "qla_target.h"
 
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -45,8 +44,8 @@ qla2100_intr_handler(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x505d,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                    "%s(): NULL response queue pointer.\n", __func__);
                 return (IRQ_NONE);
         }
 
@@ -142,8 +141,8 @@ qla2300_intr_handler(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x5058,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                    "%s(): NULL response queue pointer.\n", __func__);
                 return (IRQ_NONE);
         }
 
@@ -243,34 +242,32 @@ static void
 qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 {
         uint16_t        cnt;
-        uint32_t        mboxes;
         uint16_t __iomem *wptr;
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
-        /* Read all mbox registers? */
-        mboxes = (1 << ha->mbx_count) - 1;
-        if (!ha->mcp)
-                ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERROR.\n");
-        else
-                mboxes = ha->mcp->in_mb;
-
         /* Load return mailbox registers. */
         ha->flags.mbox_int = 1;
         ha->mailbox_out[0] = mb0;
-        mboxes >>= 1;
         wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1);
 
         for (cnt = 1; cnt < ha->mbx_count; cnt++) {
                 if (IS_QLA2200(ha) && cnt == 8)
                         wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);
-                if ((cnt == 4 || cnt == 5) && (mboxes & BIT_0))
+                if (cnt == 4 || cnt == 5)
                         ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr);
-                else if (mboxes & BIT_0)
+                else
                         ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
 
                 wptr++;
-                mboxes >>= 1;
+        }
+
+        if (ha->mcp) {
+                ql_dbg(ql_dbg_async, vha, 0x5000,
+                    "Got mbx completion. cmd=%x.\n", ha->mcp->mb[0]);
+        } else {
+                ql_dbg(ql_dbg_async, vha, 0x5001,
+                    "MBX pointer ERROR.\n");
         }
 }
 
@@ -290,15 +287,10 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
                 mb[cnt] = RD_REG_WORD(wptr);
 
         ql_dbg(ql_dbg_async, vha, 0x5021,
-            "Inter-Driver Communication %s -- "
+            "Inter-Driver Commucation %s -- "
             "%04x %04x %04x %04x %04x %04x %04x.\n",
             event[aen & 0xff], mb[0], mb[1], mb[2], mb[3],
             mb[4], mb[5], mb[6]);
-        if ((aen == MBA_IDC_COMPLETE && mb[1] >> 15)) {
-                vha->hw->flags.idc_compl_status = 1;
-                if (vha->hw->notify_dcbx_comp)
-                        complete(&vha->hw->dcbx_comp);
-        }
 
         /* Acknowledgement needed? [Notify && non-zero timeout]. */
         timeout = (descr >> 8) & 0xf;
@@ -306,7 +298,7 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
                 return;
 
         ql_dbg(ql_dbg_async, vha, 0x5022,
-            "%lu Inter-Driver Communication %s -- ACK timeout=%d.\n",
+            "Inter-Driver Commucation %s -- ACK timeout=%d.\n",
             vha->host_no, event[aen & 0xff], timeout);
 
         rval = qla2x00_post_idc_ack_work(vha, mb);
@@ -315,184 +307,6 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
                     "IDC failed to post ACK.\n");
 }
 
-#define LS_UNKNOWN      2
-const char *
-qla2x00_get_link_speed_str(struct qla_hw_data *ha, uint16_t speed)
-{
-        static const char * const link_speeds[] = {
-                "1", "2", "?", "4", "8", "16", "10"
-        };
-
-        if (IS_QLA2100(ha) || IS_QLA2200(ha))
-                return link_speeds[0];
-        else if (speed == 0x13)
-                return link_speeds[6];
-        else if (speed < 6)
-                return link_speeds[speed];
-        else
-                return link_speeds[LS_UNKNOWN];
-}
-
-static void
-qla83xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        /*
-         * 8200 AEN Interpretation:
-         * mb[0] = AEN code
-         * mb[1] = AEN Reason code
-         * mb[2] = LSW of Peg-Halt Status-1 Register
-         * mb[6] = MSW of Peg-Halt Status-1 Register
-         * mb[3] = LSW of Peg-Halt Status-2 register
-         * mb[7] = MSW of Peg-Halt Status-2 register
-         * mb[4] = IDC Device-State Register value
-         * mb[5] = IDC Driver-Presence Register value
-         */
-        ql_dbg(ql_dbg_async, vha, 0x506b, "AEN Code: mb[0] = 0x%x AEN reason: "
-            "mb[1] = 0x%x PH-status1: mb[2] = 0x%x PH-status1: mb[6] = 0x%x.\n",
-            mb[0], mb[1], mb[2], mb[6]);
-        ql_dbg(ql_dbg_async, vha, 0x506c, "PH-status2: mb[3] = 0x%x "
-            "PH-status2: mb[7] = 0x%x Device-State: mb[4] = 0x%x "
-            "Drv-Presence: mb[5] = 0x%x.\n", mb[3], mb[7], mb[4], mb[5]);
-
-        if (mb[1] & (IDC_PEG_HALT_STATUS_CHANGE | IDC_NIC_FW_REPORTED_FAILURE |
-                                IDC_HEARTBEAT_FAILURE)) {
-                ha->flags.nic_core_hung = 1;
-                ql_log(ql_log_warn, vha, 0x5060,
-                    "83XX: F/W Error Reported: Check if reset required.\n");
-
-                if (mb[1] & IDC_PEG_HALT_STATUS_CHANGE) {
-                        uint32_t protocol_engine_id, fw_err_code, err_level;
-
-                        /*
-                         * IDC_PEG_HALT_STATUS_CHANGE interpretation:
-                         *  - PEG-Halt Status-1 Register:
-                         *      (LSW = mb[2], MSW = mb[6])
-                         *      Bits 0-7   = protocol-engine ID
-                         *      Bits 8-28  = f/w error code
-                         *      Bits 29-31 = Error-level
-                         *          Error-level 0x1 = Non-Fatal error
-                         *          Error-level 0x2 = Recoverable Fatal error
-                         *          Error-level 0x4 = UnRecoverable Fatal error
-                         *  - PEG-Halt Status-2 Register:
-                         *      (LSW = mb[3], MSW = mb[7])
-                         */
-                        protocol_engine_id = (mb[2] & 0xff);
-                        fw_err_code = (((mb[2] & 0xff00) >> 8) |
-                            ((mb[6] & 0x1fff) << 8));
-                        err_level = ((mb[6] & 0xe000) >> 13);
-                        ql_log(ql_log_warn, vha, 0x5061, "PegHalt Status-1 "
-                            "Register: protocol_engine_id=0x%x "
-                            "fw_err_code=0x%x err_level=0x%x.\n",
-                            protocol_engine_id, fw_err_code, err_level);
-                        ql_log(ql_log_warn, vha, 0x5062, "PegHalt Status-2 "
-                            "Register: 0x%x%x.\n", mb[7], mb[3]);
-                        if (err_level == ERR_LEVEL_NON_FATAL) {
-                                ql_log(ql_log_warn, vha, 0x5063,
-                                    "Not a fatal error, f/w has recovered "
-                                    "iteself.\n");
-                        } else if (err_level == ERR_LEVEL_RECOVERABLE_FATAL) {
-                                ql_log(ql_log_fatal, vha, 0x5064,
-                                    "Recoverable Fatal error: Chip reset "
-                                    "required.\n");
-                                qla83xx_schedule_work(vha,
-                                    QLA83XX_NIC_CORE_RESET);
-                        } else if (err_level == ERR_LEVEL_UNRECOVERABLE_FATAL) {
-                                ql_log(ql_log_fatal, vha, 0x5065,
-                                    "Unrecoverable Fatal error: Set FAILED "
-                                    "state, reboot required.\n");
-                                qla83xx_schedule_work(vha,
-                                    QLA83XX_NIC_CORE_UNRECOVERABLE);
-                        }
-                }
-
-                if (mb[1] & IDC_NIC_FW_REPORTED_FAILURE) {
-                        uint16_t peg_fw_state, nw_interface_link_up;
-                        uint16_t nw_interface_signal_detect, sfp_status;
-                        uint16_t htbt_counter, htbt_monitor_enable;
-                        uint16_t sfp_additonal_info, sfp_multirate;
-                        uint16_t sfp_tx_fault, link_speed, dcbx_status;
-
-                        /*
-                         * IDC_NIC_FW_REPORTED_FAILURE interpretation:
-                         *  - PEG-to-FC Status Register:
-                         *      (LSW = mb[2], MSW = mb[6])
-                         *      Bits 0-7   = Peg-Firmware state
-                         *      Bit 8      = N/W Interface Link-up
-                         *      Bit 9      = N/W Interface signal detected
-                         *      Bits 10-11 = SFP Status
-                         *        SFP Status 0x0 = SFP+ transceiver not expected
-                         *        SFP Status 0x1 = SFP+ transceiver not present
-                         *        SFP Status 0x2 = SFP+ transceiver invalid
-                         *        SFP Status 0x3 = SFP+ transceiver present and
-                         *        valid
-                         *      Bits 12-14 = Heartbeat Counter
-                         *      Bit 15     = Heartbeat Monitor Enable
-                         *      Bits 16-17 = SFP Additional Info
-                         *        SFP info 0x0 = Unregocnized transceiver for
-                         *        Ethernet
-                         *        SFP info 0x1 = SFP+ brand validation failed
-                         *        SFP info 0x2 = SFP+ speed validation failed
-                         *        SFP info 0x3 = SFP+ access error
-                         *      Bit 18     = SFP Multirate
-                         *      Bit 19     = SFP Tx Fault
-                         *      Bits 20-22 = Link Speed
-                         *      Bits 23-27 = Reserved
-                         *      Bits 28-30 = DCBX Status
-                         *        DCBX Status 0x0 = DCBX Disabled
-                         *        DCBX Status 0x1 = DCBX Enabled
-                         *        DCBX Status 0x2 = DCBX Exchange error
-                         *      Bit 31     = Reserved
-                         */
-                        peg_fw_state = (mb[2] & 0x00ff);
-                        nw_interface_link_up = ((mb[2] & 0x0100) >> 8);
-                        nw_interface_signal_detect = ((mb[2] & 0x0200) >> 9);
-                        sfp_status = ((mb[2] & 0x0c00) >> 10);
-                        htbt_counter = ((mb[2] & 0x7000) >> 12);
-                        htbt_monitor_enable = ((mb[2] & 0x8000) >> 15);
-                        sfp_additonal_info = (mb[6] & 0x0003);
-                        sfp_multirate = ((mb[6] & 0x0004) >> 2);
-                        sfp_tx_fault = ((mb[6] & 0x0008) >> 3);
-                        link_speed = ((mb[6] & 0x0070) >> 4);
-                        dcbx_status = ((mb[6] & 0x7000) >> 12);
-
-                        ql_log(ql_log_warn, vha, 0x5066,
-                            "Peg-to-Fc Status Register:\n"
-                            "peg_fw_state=0x%x, nw_interface_link_up=0x%x, "
-                            "nw_interface_signal_detect=0x%x"
-                            "\nsfp_statis=0x%x.\n ", peg_fw_state,
-                            nw_interface_link_up, nw_interface_signal_detect,
-                            sfp_status);
-                        ql_log(ql_log_warn, vha, 0x5067,
-                            "htbt_counter=0x%x, htbt_monitor_enable=0x%x, "
-                            "sfp_additonal_info=0x%x, sfp_multirate=0x%x.\n ",
-                            htbt_counter, htbt_monitor_enable,
-                            sfp_additonal_info, sfp_multirate);
-                        ql_log(ql_log_warn, vha, 0x5068,
-                            "sfp_tx_fault=0x%x, link_state=0x%x, "
-                            "dcbx_status=0x%x.\n", sfp_tx_fault, link_speed,
-                            dcbx_status);
-
-                        qla83xx_schedule_work(vha, QLA83XX_NIC_CORE_RESET);
-                }
-
-                if (mb[1] & IDC_HEARTBEAT_FAILURE) {
-                        ql_log(ql_log_warn, vha, 0x5069,
-                            "Heartbeat Failure encountered, chip reset "
-                            "required.\n");
-
-                        qla83xx_schedule_work(vha, QLA83XX_NIC_CORE_RESET);
-                }
-        }
-
-        if (mb[1] & IDC_DEVICE_STATE_CHANGE) {
-                ql_log(ql_log_info, vha, 0x506a,
-                    "IDC Device-State changed = 0x%x.\n", mb[4]);
-                qla83xx_schedule_work(vha, MBA_IDC_AEN);
-        }
-}
-
 /**
  * qla2x00_async_event() - Process aynchronous events.
  * @ha: SCSI driver HA context
@@ -501,6 +315,9 @@ qla83xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb)
 void
 qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
 {
+#define LS_UNKNOWN      2
+        static char     *link_speeds[] = { "1", "2", "?", "4", "8", "10" };
+        char            *link_speed;
         uint16_t        handle_cnt;
         uint16_t        cnt, mbx;
         uint32_t        handles[5];
@@ -509,11 +326,12 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
         struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
         struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;
         uint32_t        rscn_entry, host_pid;
+        uint8_t         rscn_queue_index;
         unsigned long   flags;
 
         /* Setup to process RIO completion. */
         handle_cnt = 0;
-        if (IS_CNA_CAPABLE(ha))
+        if (IS_QLA8XXX_TYPE(ha))
                 goto skip_rio;
         switch (mb[0]) {
         case MBA_SCSI_COMPLETION:
@@ -585,8 +403,7 @@ skip_rio:
                 break;
 
         case MBA_SYSTEM_ERR:            /* System Error */
-                mbx = (IS_QLA81XX(ha) || IS_QLA83XX(ha)) ?
-                        RD_REG_WORD(&reg24->mailbox7) : 0;
+                mbx = IS_QLA81XX(ha) ? RD_REG_WORD(&reg24->mailbox7) : 0;
                 ql_log(ql_log_warn, vha, 0x5003,
                     "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh "
                     "mbx7=%xh.\n", mb[1], mb[2], mb[3], mbx);
@@ -599,7 +416,6 @@ skip_rio:
                                     "Unrecoverable Hardware Error: adapter "
                                     "marked OFFLINE!\n");
                                 vha->flags.online = 0;
-                                vha->device_flags |= DFLG_DEV_FAILED;
                         } else {
                                 /* Check to see if MPI timeout occurred */
                                 if ((mbx & MBX_3) && (ha->flags.port0))
@@ -613,7 +429,6 @@ skip_rio:
                             "Unrecoverable Hardware Error: adapter marked "
                             "OFFLINE!\n");
                         vha->flags.online = 0;
-                        vha->device_flags |= DFLG_DEV_FAILED;
                 } else
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 break;
@@ -635,10 +450,10 @@ skip_rio:
         case MBA_WAKEUP_THRES:          /* Request Queue Wake-up */
                 ql_dbg(ql_dbg_async, vha, 0x5008,
                     "Asynchronous WAKEUP_THRES.\n");
-
                 break;
+
         case MBA_LIP_OCCURRED:          /* Loop Initialization Procedure */
-                ql_dbg(ql_dbg_async, vha, 0x5009,
+                ql_log(ql_log_info, vha, 0x5009,
                     "LIP occurred (%x).\n", mb[1]);
 
                 if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
@@ -660,24 +475,29 @@ skip_rio:
                 break;
 
         case MBA_LOOP_UP:               /* Loop Up Event */
-                if (IS_QLA2100(ha) || IS_QLA2200(ha))
+                if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
+                        link_speed = link_speeds[0];
                         ha->link_data_rate = PORT_SPEED_1GB;
-                else
+                } else {
+                        link_speed = link_speeds[LS_UNKNOWN];
+                        if (mb[1] < 5)
+                                link_speed = link_speeds[mb[1]];
+                        else if (mb[1] == 0x13)
+                                link_speed = link_speeds[5];
                         ha->link_data_rate = mb[1];
+                }
 
-                ql_dbg(ql_dbg_async, vha, 0x500a,
-                    "LOOP UP detected (%s Gbps).\n",
-                    qla2x00_get_link_speed_str(ha, ha->link_data_rate));
+                ql_log(ql_log_info, vha, 0x500a,
+                    "LOOP UP detected (%s Gbps).\n", link_speed);
 
                 vha->flags.management_server_logged_in = 0;
                 qla2x00_post_aen_work(vha, FCH_EVT_LINKUP, ha->link_data_rate);
                 break;
 
         case MBA_LOOP_DOWN:             /* Loop Down Event */
-                mbx = (IS_QLA81XX(ha) || IS_QLA8031(ha))
-                        ? RD_REG_WORD(&reg24->mailbox4) : 0;
+                mbx = IS_QLA81XX(ha) ? RD_REG_WORD(&reg24->mailbox4) : 0;
                 mbx = IS_QLA82XX(ha) ? RD_REG_WORD(&reg82->mailbox_out[4]) : mbx;
-                ql_dbg(ql_dbg_async, vha, 0x500b,
+                ql_log(ql_log_info, vha, 0x500b,
                     "LOOP DOWN detected (%x %x %x %x).\n",
                     mb[1], mb[2], mb[3], mbx);
 
@@ -699,7 +519,7 @@ skip_rio:
                 break;
 
         case MBA_LIP_RESET:             /* LIP reset occurred */
-                ql_dbg(ql_dbg_async, vha, 0x500c,
+                ql_log(ql_log_info, vha, 0x500c,
                     "LIP reset occurred (%x).\n", mb[1]);
 
                 if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
@@ -725,7 +545,7 @@ skip_rio:
                 if (IS_QLA2100(ha))
                         break;
 
-                if (IS_QLA81XX(ha) || IS_QLA82XX(ha) || IS_QLA8031(ha)) {
+                if (IS_QLA8XXX_TYPE(ha)) {
                         ql_dbg(ql_dbg_async, vha, 0x500d,
                             "DCBX Completed -- %04x %04x %04x.\n",
                             mb[1], mb[2], mb[3]);
@@ -767,7 +587,7 @@ skip_rio:
                 if (IS_QLA2100(ha))
                         break;
 
-                ql_dbg(ql_dbg_async, vha, 0x500f,
+                ql_log(ql_log_info, vha, 0x500f,
                     "Configuration change detected: value=%x.\n", mb[1]);
 
                 if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
@@ -813,8 +633,6 @@ skip_rio:
                         ql_dbg(ql_dbg_async, vha, 0x5010,
                             "Port unavailable %04x %04x %04x.\n",
                             mb[1], mb[2], mb[3]);
-                        ql_log(ql_log_warn, vha, 0x505e,
-                            "Link is offline.\n");
 
                         if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
                                 atomic_set(&vha->loop_state, LOOP_DOWN);
@@ -842,21 +660,17 @@ skip_rio:
                  * it.  Otherwise ignore it and Wait for RSCN to come in.
                  */
                 atomic_set(&vha->loop_down_timer, 0);
-                if (mb[1] != 0xffff || (mb[2] != 0x6 && mb[2] != 0x4)) {
+                if (atomic_read(&vha->loop_state) != LOOP_DOWN &&
+                    atomic_read(&vha->loop_state) != LOOP_DEAD) {
                         ql_dbg(ql_dbg_async, vha, 0x5011,
                             "Asynchronous PORT UPDATE ignored %04x/%04x/%04x.\n",
                             mb[1], mb[2], mb[3]);
-
-                        qlt_async_event(mb[0], vha, mb);
                         break;
                 }
 
                 ql_dbg(ql_dbg_async, vha, 0x5012,
                     "Port database changed %04x %04x %04x.\n",
                     mb[1], mb[2], mb[3]);
-                ql_log(ql_log_warn, vha, 0x505f,
-                    "Link is operational (%s Gbps).\n",
-                    qla2x00_get_link_speed_str(ha, ha->link_data_rate));
 
                 /*
                  * Mark all devices as missing so we will login again.
@@ -865,13 +679,10 @@ skip_rio:
 
                 qla2x00_mark_all_devices_lost(vha, 1);
 
-                if (vha->vp_idx == 0 && !qla_ini_mode_enabled(vha))
-                        set_bit(SCR_PENDING, &vha->dpc_flags);
+                vha->flags.rscn_queue_overflow = 1;
 
                 set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                 set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
-
-                qlt_async_event(mb[0], vha, mb);
                 break;
 
         case MBA_RSCN_UPDATE:           /* State Change Registration */
@@ -898,6 +709,15 @@ skip_rio:
 
                 /* Ignore reserved bits from RSCN-payload. */
                 rscn_entry = ((mb[1] & 0x3ff) << 16) | mb[2];
+                rscn_queue_index = vha->rscn_in_ptr + 1;
+                if (rscn_queue_index == MAX_RSCN_COUNT)
+                        rscn_queue_index = 0;
+                if (rscn_queue_index != vha->rscn_out_ptr) {
+                        vha->rscn_queue[vha->rscn_in_ptr] = rscn_entry;
+                        vha->rscn_in_ptr = rscn_queue_index;
+                } else {
+                        vha->flags.rscn_queue_overflow = 1;
+                }
 
                 atomic_set(&vha->loop_down_timer, 0);
                 vha->flags.management_server_logged_in = 0;
@@ -982,36 +802,13 @@ skip_rio:
                     "FCF Configuration Error -- %04x %04x %04x.\n",
                     mb[1], mb[2], mb[3]);
                 break;
-        case MBA_IDC_NOTIFY:
-                /* See if we need to quiesce any I/O */
-                if (IS_QLA8031(vha->hw))
-                        if ((mb[2] & 0x7fff) == MBC_PORT_RESET ||
-                            (mb[2] & 0x7fff) == MBC_SET_PORT_CONFIG) {
-                                set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags);
-                                qla2xxx_wake_dpc(vha);
-                        }
         case MBA_IDC_COMPLETE:
+        case MBA_IDC_NOTIFY:
         case MBA_IDC_TIME_EXT:
-                if (IS_QLA81XX(vha->hw) || IS_QLA8031(vha->hw))
-                        qla81xx_idc_event(vha, mb[0], mb[1]);
+                qla81xx_idc_event(vha, mb[0], mb[1]);
                 break;
-
-        case MBA_IDC_AEN:
-                mb[4] = RD_REG_WORD(&reg24->mailbox4);
-                mb[5] = RD_REG_WORD(&reg24->mailbox5);
-                mb[6] = RD_REG_WORD(&reg24->mailbox6);
-                mb[7] = RD_REG_WORD(&reg24->mailbox7);
-                qla83xx_handle_8200_aen(vha, mb);
-                break;
-
-        default:
-                ql_dbg(ql_dbg_async, vha, 0x5057,
-                    "Unknown AEN:%04x %04x %04x %04x\n",
-                    mb[0], mb[1], mb[2], mb[3]);
         }
 
-        qlt_async_event(mb[0], vha, mb);
-
         if (!vha->vp_idx && ha->num_vhosts)
                 qla2x00_alert_all_vps(rsp, mb);
 }
@@ -1046,7 +843,8 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
                 req->outstanding_cmds[index] = NULL;
 
                 /* Save ISP completion status */
-                sp->done(ha, sp, DID_OK << 16);
+                sp->cmd->result = DID_OK << 16;
+                qla2x00_sp_compl(ha, sp);
         } else {
                 ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n");
 
@@ -1103,6 +901,7 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
         fc_port_t *fcport;
         srb_t *sp;
         struct srb_iocb *lio;
+        struct srb_ctx *ctx;
         uint16_t *data;
         uint16_t status;
 
@@ -1110,8 +909,9 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
         if (!sp)
                 return;
 
-        lio = &sp->u.iocb_cmd;
-        type = sp->name;
+        ctx = sp->ctx;
+        lio = ctx->u.iocb_cmd;
+        type = ctx->name;
         fcport = sp->fcport;
         data = lio->u.logio.data;
 
@@ -1120,33 +920,32 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
             QLA_LOGIO_LOGIN_RETRIED : 0;
         if (mbx->entry_status) {
                 ql_dbg(ql_dbg_async, vha, 0x5043,
-                    "Async-%s error entry - hdl=%x portid=%02x%02x%02x "
+                    "Async-%s error entry - portid=%02x%02x%02x "
                     "entry-status=%x status=%x state-flag=%x "
-                    "status-flags=%x.\n", type, sp->handle,
-                    fcport->d_id.b.domain, fcport->d_id.b.area,
+                    "status-flags=%x.\n",
+                    type, fcport->d_id.b.domain, fcport->d_id.b.area,
                     fcport->d_id.b.al_pa, mbx->entry_status,
                     le16_to_cpu(mbx->status), le16_to_cpu(mbx->state_flags),
                     le16_to_cpu(mbx->status_flags));
 
-                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5029,
+                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5057,
                     (uint8_t *)mbx, sizeof(*mbx));
 
                 goto logio_done;
         }
 
         status = le16_to_cpu(mbx->status);
-        if (status == 0x30 && sp->type == SRB_LOGIN_CMD &&
+        if (status == 0x30 && ctx->type == SRB_LOGIN_CMD &&
             le16_to_cpu(mbx->mb0) == MBS_COMMAND_COMPLETE)
                 status = 0;
         if (!status && le16_to_cpu(mbx->mb0) == MBS_COMMAND_COMPLETE) {
                 ql_dbg(ql_dbg_async, vha, 0x5045,
-                    "Async-%s complete - hdl=%x portid=%02x%02x%02x mbx1=%x.\n",
-                    type, sp->handle, fcport->d_id.b.domain,
-                    fcport->d_id.b.area, fcport->d_id.b.al_pa,
-                    le16_to_cpu(mbx->mb1));
+                    "Async-%s complete - portid=%02x%02x%02x mbx1=%x.\n",
+                    type, fcport->d_id.b.domain, fcport->d_id.b.area,
+                    fcport->d_id.b.al_pa, le16_to_cpu(mbx->mb1));
 
                 data[0] = MBS_COMMAND_COMPLETE;
-                if (sp->type == SRB_LOGIN_CMD) {
+                if (ctx->type == SRB_LOGIN_CMD) {
                         fcport->port_type = FCT_TARGET;
                         if (le16_to_cpu(mbx->mb1) & BIT_0)
                                 fcport->port_type = FCT_INITIATOR;
@@ -1169,15 +968,16 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
         }
 
         ql_log(ql_log_warn, vha, 0x5046,
-            "Async-%s failed - hdl=%x portid=%02x%02x%02x status=%x "
-            "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n", type, sp->handle,
-            fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa,
-            status, le16_to_cpu(mbx->mb0), le16_to_cpu(mbx->mb1),
+            "Async-%s failed - portid=%02x%02x%02x status=%x "
+            "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n",
+            type, fcport->d_id.b.domain,
+            fcport->d_id.b.area, fcport->d_id.b.al_pa, status,
+            le16_to_cpu(mbx->mb0), le16_to_cpu(mbx->mb1),
             le16_to_cpu(mbx->mb2), le16_to_cpu(mbx->mb6),
             le16_to_cpu(mbx->mb7));
 
 logio_done:
-        sp->done(vha, sp, 0);
+        lio->done(sp);
 }
 
 static void
@@ -1186,18 +986,29 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 {
         const char func[] = "CT_IOCB";
         const char *type;
+        struct qla_hw_data *ha = vha->hw;
         srb_t *sp;
+        struct srb_ctx *sp_bsg;
         struct fc_bsg_job *bsg_job;
         uint16_t comp_status;
-        int res;
 
         sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
         if (!sp)
                 return;
 
-        bsg_job = sp->u.bsg_job;
+        sp_bsg = sp->ctx;
+        bsg_job = sp_bsg->u.bsg_job;
 
-        type = "ct pass-through";
+        type = NULL;
+        switch (sp_bsg->type) {
+        case SRB_CT_CMD:
+                type = "ct pass-through";
+                break;
+        default:
+                ql_log(ql_log_warn, vha, 0x5047,
+                    "Unrecognized SRB: (%p) type=%d.\n", sp, sp_bsg->type);
+                return;
+        }
 
         comp_status = le16_to_cpu(pkt->comp_status);
 
@@ -1209,7 +1020,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 
         if (comp_status != CS_COMPLETE) {
                 if (comp_status == CS_DATA_UNDERRUN) {
-                        res = DID_OK << 16;
+                        bsg_job->reply->result = DID_OK << 16;
                         bsg_job->reply->reply_payload_rcv_len =
                             le16_to_cpu(((sts_entry_t *)pkt)->rsp_info_len);
 
@@ -1222,19 +1033,30 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                         ql_log(ql_log_warn, vha, 0x5049,
                             "CT pass-through-%s error "
                             "comp_status-status=0x%x.\n", type, comp_status);
-                        res = DID_ERROR << 16;
+                        bsg_job->reply->result = DID_ERROR << 16;
                         bsg_job->reply->reply_payload_rcv_len = 0;
                 }
-                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035,
+                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5058,
                     (uint8_t *)pkt, sizeof(*pkt));
         } else {
-                res = DID_OK << 16;
+                bsg_job->reply->result =  DID_OK << 16;
                 bsg_job->reply->reply_payload_rcv_len =
                     bsg_job->reply_payload.payload_len;
                 bsg_job->reply_len = 0;
         }
 
-        sp->done(vha, sp, res);
+        dma_unmap_sg(&ha->pdev->dev, bsg_job->request_payload.sg_list,
+            bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
+
+        dma_unmap_sg(&ha->pdev->dev, bsg_job->reply_payload.sg_list,
+            bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
+
+        if (sp_bsg->type == SRB_ELS_CMD_HST || sp_bsg->type == SRB_CT_CMD)
+                kfree(sp->fcport);
+
+        kfree(sp->ctx);
+        mempool_free(sp, ha->srb_mempool);
+        bsg_job->job_done(bsg_job);
 }
 
 static void
@@ -1243,20 +1065,22 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 {
         const char func[] = "ELS_CT_IOCB";
         const char *type;
+        struct qla_hw_data *ha = vha->hw;
         srb_t *sp;
+        struct srb_ctx *sp_bsg;
         struct fc_bsg_job *bsg_job;
         uint16_t comp_status;
         uint32_t fw_status[3];
         uint8_t* fw_sts_ptr;
-        int res;
 
         sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
         if (!sp)
                 return;
-        bsg_job = sp->u.bsg_job;
+        sp_bsg = sp->ctx;
+        bsg_job = sp_bsg->u.bsg_job;
 
         type = NULL;
-        switch (sp->type) {
+        switch (sp_bsg->type) {
         case SRB_ELS_CMD_RPT:
         case SRB_ELS_CMD_HST:
                 type = "els";
@@ -1265,8 +1089,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                 type = "ct pass-through";
                 break;
         default:
-                ql_dbg(ql_dbg_user, vha, 0x503e,
-                    "Unrecognized SRB: (%p) type=%d.\n", sp, sp->type);
+                ql_log(ql_log_warn, vha, 0x503e,
+                    "Unrecognized SRB: (%p) type=%d.\n", sp, sp_bsg->type);
                 return;
         }
 
@@ -1282,43 +1106,54 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 
         if (comp_status != CS_COMPLETE) {
                 if (comp_status == CS_DATA_UNDERRUN) {
-                        res = DID_OK << 16;
+                        bsg_job->reply->result = DID_OK << 16;
                         bsg_job->reply->reply_payload_rcv_len =
-                            le16_to_cpu(((struct els_sts_entry_24xx *)pkt)->total_byte_count);
+                                le16_to_cpu(((struct els_sts_entry_24xx*)pkt)->total_byte_count);
 
-                        ql_dbg(ql_dbg_user, vha, 0x503f,
-                            "ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "
+                        ql_log(ql_log_info, vha, 0x503f,
+                            "ELS-CT pass-through-%s error comp_status-status=0x%x "
                             "error subcode 1=0x%x error subcode 2=0x%x total_byte = 0x%x.\n",
-                            type, sp->handle, comp_status, fw_status[1], fw_status[2],
+                            type, comp_status, fw_status[1], fw_status[2],
                             le16_to_cpu(((struct els_sts_entry_24xx *)
                                 pkt)->total_byte_count));
                         fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
                         memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
                 }
                 else {
-                        ql_dbg(ql_dbg_user, vha, 0x5040,
-                            "ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "
+                        ql_log(ql_log_info, vha, 0x5040,
+                            "ELS-CT pass-through-%s error comp_status-status=0x%x "
                             "error subcode 1=0x%x error subcode 2=0x%x.\n",
-                            type, sp->handle, comp_status,
+                            type, comp_status,
                             le16_to_cpu(((struct els_sts_entry_24xx *)
                                 pkt)->error_subcode_1),
                             le16_to_cpu(((struct els_sts_entry_24xx *)
                                     pkt)->error_subcode_2));
-                        res = DID_ERROR << 16;
+                        bsg_job->reply->result = DID_ERROR << 16;
                         bsg_job->reply->reply_payload_rcv_len = 0;
                         fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
                         memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
                 }
-                ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
+                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5056,
                                 (uint8_t *)pkt, sizeof(*pkt));
         }
         else {
-                res =  DID_OK << 16;
+                bsg_job->reply->result =  DID_OK << 16;
                 bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
                 bsg_job->reply_len = 0;
         }
 
-        sp->done(vha, sp, res);
+        dma_unmap_sg(&ha->pdev->dev,
+            bsg_job->request_payload.sg_list,
+            bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
+        dma_unmap_sg(&ha->pdev->dev,
+            bsg_job->reply_payload.sg_list,
+            bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
+        if ((sp_bsg->type == SRB_ELS_CMD_HST) ||
+            (sp_bsg->type == SRB_CT_CMD))
+                kfree(sp->fcport);
+        kfree(sp->ctx);
+        mempool_free(sp, ha->srb_mempool);
+        bsg_job->job_done(bsg_job);
 }
 
 static void
@@ -1330,6 +1165,7 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
         fc_port_t *fcport;
         srb_t *sp;
         struct srb_iocb *lio;
+        struct srb_ctx *ctx;
         uint16_t *data;
         uint32_t iop[2];
 
@@ -1337,8 +1173,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
         if (!sp)
                 return;
 
-        lio = &sp->u.iocb_cmd;
-        type = sp->name;
+        ctx = sp->ctx;
+        lio = ctx->u.iocb_cmd;
+        type = ctx->name;
         fcport = sp->fcport;
         data = lio->u.logio.data;
 
@@ -1346,27 +1183,27 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
         data[1] = lio->u.logio.flags & SRB_LOGIN_RETRIED ?
                 QLA_LOGIO_LOGIN_RETRIED : 0;
         if (logio->entry_status) {
-                ql_log(ql_log_warn, fcport->vha, 0x5034,
-                    "Async-%s error entry - hdl=%x"
+                ql_log(ql_log_warn, vha, 0x5034,
+                    "Async-%s error entry - "
                     "portid=%02x%02x%02x entry-status=%x.\n",
-                    type, sp->handle, fcport->d_id.b.domain,
-                    fcport->d_id.b.area, fcport->d_id.b.al_pa,
-                    logio->entry_status);
-                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x504d,
+                    type, fcport->d_id.b.domain, fcport->d_id.b.area,
+                    fcport->d_id.b.al_pa, logio->entry_status);
+                ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5059,
                     (uint8_t *)logio, sizeof(*logio));
 
                 goto logio_done;
         }
 
         if (le16_to_cpu(logio->comp_status) == CS_COMPLETE) {
-                ql_dbg(ql_dbg_async, fcport->vha, 0x5036,
-                    "Async-%s complete - hdl=%x portid=%02x%02x%02x "
-                    "iop0=%x.\n", type, sp->handle, fcport->d_id.b.domain,
-                    fcport->d_id.b.area, fcport->d_id.b.al_pa,
+                ql_dbg(ql_dbg_async, vha, 0x5036,
+                    "Async-%s complete - portid=%02x%02x%02x "
+                    "iop0=%x.\n",
+                    type, fcport->d_id.b.domain, fcport->d_id.b.area,
+                    fcport->d_id.b.al_pa,
                     le32_to_cpu(logio->io_parameter[0]));
 
                 data[0] = MBS_COMMAND_COMPLETE;
-                if (sp->type != SRB_LOGIN_CMD)
+                if (ctx->type != SRB_LOGIN_CMD)
                         goto logio_done;
 
                 iop[0] = le32_to_cpu(logio->io_parameter[0]);
@@ -1377,9 +1214,6 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
                 } else if (iop[0] & BIT_5)
                         fcport->port_type = FCT_INITIATOR;
 
-                if (iop[0] & BIT_7)
-                        fcport->flags |= FCF_CONF_COMP_SUPPORTED;
-
                 if (logio->io_parameter[7] || logio->io_parameter[8])
                         fcport->supported_classes |= FC_COS_CLASS2;
                 if (logio->io_parameter[9] || logio->io_parameter[10])
@@ -1403,16 +1237,17 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
                 break;
         }
 
-        ql_dbg(ql_dbg_async, fcport->vha, 0x5037,
-            "Async-%s failed - hdl=%x portid=%02x%02x%02x comp=%x "
-            "iop0=%x iop1=%x.\n", type, sp->handle, fcport->d_id.b.domain,
+        ql_dbg(ql_dbg_async, vha, 0x5037,
+            "Async-%s failed - portid=%02x%02x%02x comp=%x "
+            "iop0=%x iop1=%x.\n",
+            type, fcport->d_id.b.domain,
             fcport->d_id.b.area, fcport->d_id.b.al_pa,
             le16_to_cpu(logio->comp_status),
             le32_to_cpu(logio->io_parameter[0]),
             le32_to_cpu(logio->io_parameter[1]));
 
 logio_done:
-        sp->done(vha, sp, 0);
+        lio->done(sp);
 }
 
 static void
@@ -1424,6 +1259,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
         fc_port_t *fcport;
         srb_t *sp;
         struct srb_iocb *iocb;
+        struct srb_ctx *ctx;
         struct sts_entry_24xx *sts = (struct sts_entry_24xx *)tsk;
         int error = 1;
 
@@ -1431,31 +1267,32 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
         if (!sp)
                 return;
 
-        iocb = &sp->u.iocb_cmd;
-        type = sp->name;
+        ctx = sp->ctx;
+        iocb = ctx->u.iocb_cmd;
+        type = ctx->name;
         fcport = sp->fcport;
 
         if (sts->entry_status) {
-                ql_log(ql_log_warn, fcport->vha, 0x5038,
-                    "Async-%s error - hdl=%x entry-status(%x).\n",
-                    type, sp->handle, sts->entry_status);
+                ql_log(ql_log_warn, vha, 0x5038,
+                    "Async-%s error - entry-status(%x).\n",
+                    type, sts->entry_status);
         } else if (sts->comp_status != __constant_cpu_to_le16(CS_COMPLETE)) {
-                ql_log(ql_log_warn, fcport->vha, 0x5039,
-                    "Async-%s error - hdl=%x completion status(%x).\n",
-                    type, sp->handle, sts->comp_status);
+                ql_log(ql_log_warn, vha, 0x5039,
+                    "Async-%s error - completion status(%x).\n",
+                    type, sts->comp_status);
         } else if (!(le16_to_cpu(sts->scsi_status) &
             SS_RESPONSE_INFO_LEN_VALID)) {
-                ql_log(ql_log_warn, fcport->vha, 0x503a,
-                    "Async-%s error - hdl=%x no response info(%x).\n",
-                    type, sp->handle, sts->scsi_status);
+                ql_log(ql_log_warn, vha, 0x503a,
+                    "Async-%s error - no response info(%x).\n",
+                    type, sts->scsi_status);
         } else if (le32_to_cpu(sts->rsp_data_len) < 4) {
-                ql_log(ql_log_warn, fcport->vha, 0x503b,
-                    "Async-%s error - hdl=%x not enough response(%d).\n",
-                    type, sp->handle, sts->rsp_data_len);
+                ql_log(ql_log_warn, vha, 0x503b,
+                    "Async-%s error - not enough response(%d).\n",
+                    type, sts->rsp_data_len);
         } else if (sts->data[3]) {
-                ql_log(ql_log_warn, fcport->vha, 0x503c,
-                    "Async-%s error - hdl=%x response(%x).\n",
-                    type, sp->handle, sts->data[3]);
+                ql_log(ql_log_warn, vha, 0x503c,
+                    "Async-%s error - response(%x).\n",
+                    type, sts->data[3]);
         } else {
                 error = 0;
         }
@@ -1466,7 +1303,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
                     (uint8_t *)sts, sizeof(*sts));
         }
 
-        sp->done(vha, sp, 0);
+        iocb->done(sp);
 }
 
 /**
@@ -1500,6 +1337,9 @@ qla2x00_process_response_queue(struct rsp_que *rsp)
                 }
 
                 if (pkt->entry_status != 0) {
+                        ql_log(ql_log_warn, vha, 0x5035,
+                            "Process error entry.\n");
+
                         qla2x00_error_entry(vha, rsp, pkt);
                         ((response_t *)pkt)->signature = RESPONSE_PROCESSED;
                         wmb();
@@ -1551,47 +1391,40 @@ qla2x00_process_response_queue(struct rsp_que *rsp)
 }
 
 static inline void
+
 qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t par_sense_len,
-                     uint32_t sense_len, struct rsp_que *rsp, int res)
+    uint32_t sense_len, struct rsp_que *rsp)
 {
         struct scsi_qla_host *vha = sp->fcport->vha;
-        struct scsi_cmnd *cp = GET_CMD_SP(sp);
-        uint32_t track_sense_len;
+        struct scsi_cmnd *cp = sp->cmd;
 
         if (sense_len >= SCSI_SENSE_BUFFERSIZE)
                 sense_len = SCSI_SENSE_BUFFERSIZE;
 
-        SET_CMD_SENSE_LEN(sp, sense_len);
-        SET_CMD_SENSE_PTR(sp, cp->sense_buffer);
-        track_sense_len = sense_len;
-
-        if (sense_len > par_sense_len)
+        sp->request_sense_length = sense_len;
+        sp->request_sense_ptr = cp->sense_buffer;
+        if (sp->request_sense_length > par_sense_len)
                 sense_len = par_sense_len;
 
         memcpy(cp->sense_buffer, sense_data, sense_len);
 
-        SET_CMD_SENSE_PTR(sp, cp->sense_buffer + sense_len);
-        track_sense_len -= sense_len;
-        SET_CMD_SENSE_LEN(sp, track_sense_len);
-
-        if (track_sense_len != 0) {
+        sp->request_sense_ptr += sense_len;
+        sp->request_sense_length -= sense_len;
+        if (sp->request_sense_length != 0)
                 rsp->status_srb = sp;
-                cp->result = res;
-        }
 
-        if (sense_len) {
-                ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x301c,
-                    "Check condition Sense data, nexus%ld:%d:%d cmd=%p.\n",
-                    sp->fcport->vha->host_no, cp->device->id, cp->device->lun,
-                    cp);
+        ql_dbg(ql_dbg_io, vha, 0x301c,
+            "Check condition Sense data, scsi(%ld:%d:%d:%d) cmd=%p.\n",
+            sp->fcport->vha->host_no, cp->device->channel, cp->device->id,
+            cp->device->lun, cp);
+        if (sense_len)
                 ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302b,
                     cp->sense_buffer, sense_len);
-        }
 }
 
 struct scsi_dif_tuple {
         __be16 guard;       /* Checksum */
-        __be16 app_tag;         /* APPL identifier */
+        __be16 app_tag;         /* APPL identifer */
         __be32 ref_tag;         /* Target LBA or indirect LBA */
 };
 
@@ -1605,7 +1438,7 @@ static inline int
 qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)
 {
         struct scsi_qla_host *vha = sp->fcport->vha;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_cmnd *cmd = sp->cmd;
         uint8_t         *ap = &sts24->data[12];
         uint8_t         *ep = &sts24->data[20];
         uint32_t        e_ref_tag, a_ref_tag;
@@ -1673,7 +1506,7 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)
                         }
 
                         if (k != blocks_done) {
-                                ql_log(ql_log_warn, vha, 0x302f,
+                                qla_printk(KERN_WARNING, sp->fcport->vha->hw,
                                     "unexpected tag values tag:lba=%x:%llx)\n",
                                     e_ref_tag, (unsigned long long)lba_s);
                                 return 1;
@@ -1723,149 +1556,6 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)
         return 1;
 }
 
-static void
-qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
-                                  struct req_que *req, uint32_t index)
-{
-        struct qla_hw_data *ha = vha->hw;
-        srb_t *sp;
-        uint16_t        comp_status;
-        uint16_t        scsi_status;
-        uint16_t thread_id;
-        uint32_t rval = EXT_STATUS_OK;
-        struct fc_bsg_job *bsg_job = NULL;
-        sts_entry_t *sts;
-        struct sts_entry_24xx *sts24;
-        sts = (sts_entry_t *) pkt;
-        sts24 = (struct sts_entry_24xx *) pkt;
-
-        /* Validate handle. */
-        if (index >= MAX_OUTSTANDING_COMMANDS) {
-                ql_log(ql_log_warn, vha, 0x70af,
-                    "Invalid SCSI completion handle 0x%x.\n", index);
-                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                return;
-        }
-
-        sp = req->outstanding_cmds[index];
-        if (sp) {
-                /* Free outstanding command slot. */
-                req->outstanding_cmds[index] = NULL;
-                bsg_job = sp->u.bsg_job;
-        } else {
-                ql_log(ql_log_warn, vha, 0x70b0,
-                    "Req:%d: Invalid ISP SCSI completion handle(0x%x)\n",
-                    req->id, index);
-
-                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                return;
-        }
-
-        if (IS_FWI2_CAPABLE(ha)) {
-                comp_status = le16_to_cpu(sts24->comp_status);
-                scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK;
-        } else {
-                comp_status = le16_to_cpu(sts->comp_status);
-                scsi_status = le16_to_cpu(sts->scsi_status) & SS_MASK;
-        }
-
-        thread_id = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-        switch (comp_status) {
-        case CS_COMPLETE:
-                if (scsi_status == 0) {
-                        bsg_job->reply->reply_payload_rcv_len =
-                                        bsg_job->reply_payload.payload_len;
-                        rval = EXT_STATUS_OK;
-                }
-                goto done;
-
-        case CS_DATA_OVERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b1,
-                    "Command completed with date overrun thread_id=%d\n",
-                    thread_id);
-                rval = EXT_STATUS_DATA_OVERRUN;
-                break;
-
-        case CS_DATA_UNDERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b2,
-                    "Command completed with date underrun thread_id=%d\n",
-                    thread_id);
-                rval = EXT_STATUS_DATA_UNDERRUN;
-                break;
-        case CS_BIDIR_RD_OVERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b3,
-                    "Command completed with read data overrun thread_id=%d\n",
-                    thread_id);
-                rval = EXT_STATUS_DATA_OVERRUN;
-                break;
-
-        case CS_BIDIR_RD_WR_OVERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b4,
-                    "Command completed with read and write data overrun "
-                    "thread_id=%d\n", thread_id);
-                rval = EXT_STATUS_DATA_OVERRUN;
-                break;
-
-        case CS_BIDIR_RD_OVERRUN_WR_UNDERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b5,
-                    "Command completed with read data over and write data "
-                    "underrun thread_id=%d\n", thread_id);
-                rval = EXT_STATUS_DATA_OVERRUN;
-                break;
-
-        case CS_BIDIR_RD_UNDERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b6,
-                    "Command completed with read data data underrun "
-                    "thread_id=%d\n", thread_id);
-                rval = EXT_STATUS_DATA_UNDERRUN;
-                break;
-
-        case CS_BIDIR_RD_UNDERRUN_WR_OVERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b7,
-                    "Command completed with read data under and write data "
-                    "overrun thread_id=%d\n", thread_id);
-                rval = EXT_STATUS_DATA_UNDERRUN;
-                break;
-
-        case CS_BIDIR_RD_WR_UNDERRUN:
-                ql_dbg(ql_dbg_user, vha, 0x70b8,
-                    "Command completed with read and write data underrun "
-                    "thread_id=%d\n", thread_id);
-                rval = EXT_STATUS_DATA_UNDERRUN;
-                break;
-
-        case CS_BIDIR_DMA:
-                ql_dbg(ql_dbg_user, vha, 0x70b9,
-                    "Command completed with data DMA error thread_id=%d\n",
-                    thread_id);
-                rval = EXT_STATUS_DMA_ERR;
-                break;
-
-        case CS_TIMEOUT:
-                ql_dbg(ql_dbg_user, vha, 0x70ba,
-                    "Command completed with timeout thread_id=%d\n",
-                    thread_id);
-                rval = EXT_STATUS_TIMEOUT;
-                break;
-        default:
-                ql_dbg(ql_dbg_user, vha, 0x70bb,
-                    "Command completed with completion status=0x%x "
-                    "thread_id=%d\n", comp_status, thread_id);
-                rval = EXT_STATUS_ERR;
-                break;
-        }
-                bsg_job->reply->reply_payload_rcv_len = 0;
-
-done:
-        /* Return the vendor specific reply to API */
-        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = rval;
-        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-        /* Always return DID_OK, bsg will send the vendor specific response
-         * in this case only */
-        sp->done(vha, sp, (DID_OK << 6));
-
-}
-
 /**
  * qla2x00_status_entry() - Process a Status IOCB entry.
  * @ha: SCSI driver HA context
@@ -1892,15 +1582,12 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
         uint16_t que;
         struct req_que *req;
         int logit = 1;
-        int res = 0;
-        uint16_t state_flags = 0;
 
         sts = (sts_entry_t *) pkt;
         sts24 = (struct sts_entry_24xx *) pkt;
         if (IS_FWI2_CAPABLE(ha)) {
                 comp_status = le16_to_cpu(sts24->comp_status);
                 scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK;
-                state_flags = le16_to_cpu(sts24->state_flags);
         } else {
                 comp_status = le16_to_cpu(sts->comp_status);
                 scsi_status = le16_to_cpu(sts->scsi_status) & SS_MASK;
@@ -1909,14 +1596,22 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
         que = MSW(sts->handle);
         req = ha->req_q_map[que];
 
+        /* Fast path completion. */
+        if (comp_status == CS_COMPLETE && scsi_status == 0) {
+                qla2x00_process_completed_request(vha, req, handle);
+
+                return;
+        }
+
         /* Validate handle. */
         if (handle < MAX_OUTSTANDING_COMMANDS) {
                 sp = req->outstanding_cmds[handle];
+                req->outstanding_cmds[handle] = NULL;
         } else
                 sp = NULL;
 
         if (sp == NULL) {
-                ql_dbg(ql_dbg_io, vha, 0x3017,
+                ql_log(ql_log_warn, vha, 0x3017,
                     "Invalid status handle (0x%x).\n", sts->handle);
 
                 if (IS_QLA82XX(ha))
@@ -1926,23 +1621,9 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                 qla2xxx_wake_dpc(vha);
                 return;
         }
-
-        if (unlikely((state_flags & BIT_1) && (sp->type == SRB_BIDI_CMD))) {
-                qla25xx_process_bidir_status_iocb(vha, pkt, req, handle);
-                return;
-        }
-
-        /* Fast path completion. */
-        if (comp_status == CS_COMPLETE && scsi_status == 0) {
-                qla2x00_process_completed_request(vha, req, handle);
-
-                return;
-        }
-
-        req->outstanding_cmds[handle] = NULL;
-        cp = GET_CMD_SP(sp);
+        cp = sp->cmd;
         if (cp == NULL) {
-                ql_dbg(ql_dbg_io, vha, 0x3018,
+                ql_log(ql_log_warn, vha, 0x3018,
                     "Command already returned (0x%x/%p).\n",
                     sts->handle, sp);
 
@@ -1989,11 +1670,11 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                         par_sense_len -= rsp_info_len;
                 }
                 if (rsp_info_len > 3 && rsp_info[3]) {
-                        ql_dbg(ql_dbg_io, fcport->vha, 0x3019,
+                        ql_log(ql_log_warn, vha, 0x3019,
                             "FCP I/O protocol failure (0x%x/0x%x).\n",
                             rsp_info_len, rsp_info[3]);
 
-                        res = DID_BUS_BUSY << 16;
+                        cp->result = DID_BUS_BUSY << 16;
                         goto out;
                 }
         }
@@ -2010,7 +1691,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
         case CS_COMPLETE:
         case CS_QUEUE_FULL:
                 if (scsi_status == 0) {
-                        res = DID_OK << 16;
+                        cp->result = DID_OK << 16;
                         break;
                 }
                 if (scsi_status & (SS_RESIDUAL_UNDER | SS_RESIDUAL_OVER)) {
@@ -2020,19 +1701,19 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                         if (!lscsi_status &&
                             ((unsigned)(scsi_bufflen(cp) - resid) <
                              cp->underflow)) {
-                                ql_dbg(ql_dbg_io, fcport->vha, 0x301a,
+                                ql_log(ql_log_warn, vha, 0x301a,
                                     "Mid-layer underflow "
                                     "detected (0x%x of 0x%x bytes).\n",
                                     resid, scsi_bufflen(cp));
 
-                                res = DID_ERROR << 16;
+                                cp->result = DID_ERROR << 16;
                                 break;
                         }
                 }
-                res = DID_OK << 16 | lscsi_status;
+                cp->result = DID_OK << 16 | lscsi_status;
 
                 if (lscsi_status == SAM_STAT_TASK_SET_FULL) {
-                        ql_dbg(ql_dbg_io, fcport->vha, 0x301b,
+                        ql_log(ql_log_warn, vha, 0x301b,
                             "QUEUE FULL detected.\n");
                         break;
                 }
@@ -2045,7 +1726,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                         break;
 
                 qla2x00_handle_sense(sp, sense_data, par_sense_len, sense_len,
-                    rsp, res);
+                    rsp);
                 break;
 
         case CS_DATA_UNDERRUN:
@@ -2054,47 +1735,36 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                 scsi_set_resid(cp, resid);
                 if (scsi_status & SS_RESIDUAL_UNDER) {
                         if (IS_FWI2_CAPABLE(ha) && fw_resid_len != resid_len) {
-                                ql_dbg(ql_dbg_io, fcport->vha, 0x301d,
+                                ql_log(ql_log_warn, vha, 0x301d,
                                     "Dropped frame(s) detected "
                                     "(0x%x of 0x%x bytes).\n",
                                     resid, scsi_bufflen(cp));
 
-                                res = DID_ERROR << 16 | lscsi_status;
-                                goto check_scsi_status;
+                                cp->result = DID_ERROR << 16 | lscsi_status;
+                                break;
                         }
 
                         if (!lscsi_status &&
                             ((unsigned)(scsi_bufflen(cp) - resid) <
                             cp->underflow)) {
-                                ql_dbg(ql_dbg_io, fcport->vha, 0x301e,
+                                ql_log(ql_log_warn, vha, 0x301e,
                                     "Mid-layer underflow "
                                     "detected (0x%x of 0x%x bytes).\n",
                                     resid, scsi_bufflen(cp));
 
-                                res = DID_ERROR << 16;
+                                cp->result = DID_ERROR << 16;
                                 break;
                         }
-                } else if (lscsi_status != SAM_STAT_TASK_SET_FULL &&
-                            lscsi_status != SAM_STAT_BUSY) {
-                        /*
-                         * scsi status of task set and busy are considered to be
-                         * task not completed.
-                         */
-
-                        ql_dbg(ql_dbg_io, fcport->vha, 0x301f,
+                } else {
+                        ql_log(ql_log_warn, vha, 0x301f,
                             "Dropped frame(s) detected (0x%x "
-                            "of 0x%x bytes).\n", resid,
-                            scsi_bufflen(cp));
+                            "of 0x%x bytes).\n", resid, scsi_bufflen(cp));
 
-                        res = DID_ERROR << 16 | lscsi_status;
+                        cp->result = DID_ERROR << 16 | lscsi_status;
                         goto check_scsi_status;
-                } else {
-                        ql_dbg(ql_dbg_io, fcport->vha, 0x3030,
-                            "scsi_status: 0x%x, lscsi_status: 0x%x\n",
-                            scsi_status, lscsi_status);
                 }
 
-                res = DID_OK << 16 | lscsi_status;
+                cp->result = DID_OK << 16 | lscsi_status;
                 logit = 0;
 
 check_scsi_status:
@@ -2104,7 +1774,7 @@ check_scsi_status:
                  */
                 if (lscsi_status != 0) {
                         if (lscsi_status == SAM_STAT_TASK_SET_FULL) {
-                                ql_dbg(ql_dbg_io, fcport->vha, 0x3020,
+                                ql_log(ql_log_warn, vha, 0x3020,
                                     "QUEUE FULL detected.\n");
                                 logit = 1;
                                 break;
@@ -2117,7 +1787,7 @@ check_scsi_status:
                                 break;
 
                         qla2x00_handle_sense(sp, sense_data, par_sense_len,
-                            sense_len, rsp, res);
+                            sense_len, rsp);
                 }
                 break;
 
@@ -2134,7 +1804,7 @@ check_scsi_status:
                  * while we try to recover so instruct the mid layer
                  * to requeue until the class decides how to handle this.
                  */
-                res = DID_TRANSPORT_DISRUPTED << 16;
+                cp->result = DID_TRANSPORT_DISRUPTED << 16;
 
                 if (comp_status == CS_TIMEOUT) {
                         if (IS_FWI2_CAPABLE(ha))
@@ -2144,7 +1814,7 @@ check_scsi_status:
                                 break;
                 }
 
-                ql_dbg(ql_dbg_io, fcport->vha, 0x3021,
+                ql_dbg(ql_dbg_io, vha, 0x3021,
                     "Port down status: port-state=0x%x.\n",
                     atomic_read(&fcport->state));
 
@@ -2153,48 +1823,29 @@ check_scsi_status:
                 break;
 
         case CS_ABORTED:
-                res = DID_RESET << 16;
+                cp->result = DID_RESET << 16;
                 break;
 
         case CS_DIF_ERROR:
                 logit = qla2x00_handle_dif_error(sp, sts24);
-                res = cp->result;
-                break;
-
-        case CS_TRANSPORT:
-                res = DID_ERROR << 16;
-
-                if (!IS_PI_SPLIT_DET_CAPABLE(ha))
-                        break;
-
-                if (state_flags & BIT_4)
-                        scmd_printk(KERN_WARNING, cp,
-                            "Unsupported device '%s' found.\n",
-                            cp->device->vendor);
                 break;
-
         default:
-                res = DID_ERROR << 16;
+                cp->result = DID_ERROR << 16;
                 break;
         }
 
 out:
         if (logit)
-                ql_dbg(ql_dbg_io, fcport->vha, 0x3022,
+                ql_dbg(ql_dbg_io, vha, 0x3022,
                     "FCP command status: 0x%x-0x%x (0x%x) "
-                    "nexus=%ld:%d:%d portid=%02x%02x%02x oxid=0x%x "
-                    "cdb=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x len=0x%x "
+                    "oxid=0x%x cdb=%02x%02x%02x len=0x%x "
                     "rsp_info=0x%x resid=0x%x fw_resid=0x%x.\n",
-                    comp_status, scsi_status, res, vha->host_no,
-                    cp->device->id, cp->device->lun, fcport->d_id.b.domain,
-                    fcport->d_id.b.area, fcport->d_id.b.al_pa, ox_id,
-                    cp->cmnd[0], cp->cmnd[1], cp->cmnd[2], cp->cmnd[3],
-                    cp->cmnd[4], cp->cmnd[5], cp->cmnd[6], cp->cmnd[7],
-                    cp->cmnd[8], cp->cmnd[9], scsi_bufflen(cp), rsp_info_len,
+                    comp_status, scsi_status, cp->result, ox_id, cp->cmnd[0],
+                    cp->cmnd[1], cp->cmnd[2], scsi_bufflen(cp), rsp_info_len,
                     resid_len, fw_resid_len);
 
         if (rsp->status_srb == NULL)
-                sp->done(ha, sp, res);
+                qla2x00_sp_compl(ha, sp);
 }
 
 /**
@@ -2207,51 +1858,44 @@ out:
 static void
 qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
 {
-        uint8_t sense_sz = 0;
+        uint8_t         sense_sz = 0;
         struct qla_hw_data *ha = rsp->hw;
         struct scsi_qla_host *vha = pci_get_drvdata(ha->pdev);
-        srb_t *sp = rsp->status_srb;
+        srb_t           *sp = rsp->status_srb;
         struct scsi_cmnd *cp;
-        uint32_t sense_len;
-        uint8_t *sense_ptr;
-
-        if (!sp || !GET_CMD_SENSE_LEN(sp))
-                return;
-
-        sense_len = GET_CMD_SENSE_LEN(sp);
-        sense_ptr = GET_CMD_SENSE_PTR(sp);
-
-        cp = GET_CMD_SP(sp);
-        if (cp == NULL) {
-                ql_log(ql_log_warn, vha, 0x3025,
-                    "cmd is NULL: already returned to OS (sp=%p).\n", sp);
 
-                rsp->status_srb = NULL;
-                return;
-        }
-
-        if (sense_len > sizeof(pkt->data))
-                sense_sz = sizeof(pkt->data);
-        else
-                sense_sz = sense_len;
+        if (sp != NULL && sp->request_sense_length != 0) {
+                cp = sp->cmd;
+                if (cp == NULL) {
+                        ql_log(ql_log_warn, vha, 0x3025,
+                            "cmd is NULL: already returned to OS (sp=%p).\n",
+                            sp);
 
-        /* Move sense data. */
-        if (IS_FWI2_CAPABLE(ha))
-                host_to_fcp_swap(pkt->data, sizeof(pkt->data));
-        memcpy(sense_ptr, pkt->data, sense_sz);
-        ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302c,
-                sense_ptr, sense_sz);
-
-        sense_len -= sense_sz;
-        sense_ptr += sense_sz;
+                        rsp->status_srb = NULL;
+                        return;
+                }
 
-        SET_CMD_SENSE_PTR(sp, sense_ptr);
-        SET_CMD_SENSE_LEN(sp, sense_len);
+                if (sp->request_sense_length > sizeof(pkt->data)) {
+                        sense_sz = sizeof(pkt->data);
+                } else {
+                        sense_sz = sp->request_sense_length;
+                }
 
-        /* Place command on done queue. */
-        if (sense_len == 0) {
-                rsp->status_srb = NULL;
-                sp->done(ha, sp, cp->result);
+                /* Move sense data. */
+                if (IS_FWI2_CAPABLE(ha))
+                        host_to_fcp_swap(pkt->data, sizeof(pkt->data));
+                memcpy(sp->request_sense_ptr, pkt->data, sense_sz);
+                ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302c,
+                        sp->request_sense_ptr, sense_sz);
+
+                sp->request_sense_ptr += sense_sz;
+                sp->request_sense_length -= sense_sz;
+
+                /* Place command on done queue. */
+                if (sp->request_sense_length == 0) {
+                        rsp->status_srb = NULL;
+                        qla2x00_sp_compl(ha, sp);
+                }
         }
 }
 
@@ -2265,36 +1909,63 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)
 {
         srb_t *sp;
         struct qla_hw_data *ha = vha->hw;
-        const char func[] = "ERROR-IOCB";
+        uint32_t handle = LSW(pkt->handle);
         uint16_t que = MSW(pkt->handle);
-        struct req_que *req = NULL;
-        int res = DID_ERROR << 16;
-
-        ql_dbg(ql_dbg_async, vha, 0x502a,
-            "type of error status in response: 0x%x\n", pkt->entry_status);
+        struct req_que *req = ha->req_q_map[que];
+
+        if (pkt->entry_status & RF_INV_E_ORDER)
+                ql_dbg(ql_dbg_async, vha, 0x502a,
+                    "Invalid Entry Order.\n");
+        else if (pkt->entry_status & RF_INV_E_COUNT)
+                ql_dbg(ql_dbg_async, vha, 0x502b,
+                    "Invalid Entry Count.\n");
+        else if (pkt->entry_status & RF_INV_E_PARAM)
+                ql_dbg(ql_dbg_async, vha, 0x502c,
+                    "Invalid Entry Parameter.\n");
+        else if (pkt->entry_status & RF_INV_E_TYPE)
+                ql_dbg(ql_dbg_async, vha, 0x502d,
+                    "Invalid Entry Type.\n");
+        else if (pkt->entry_status & RF_BUSY)
+                ql_dbg(ql_dbg_async, vha, 0x502e,
+                    "Busy.\n");
+        else
+                ql_dbg(ql_dbg_async, vha, 0x502f,
+                    "UNKNOWN flag error.\n");
 
-        if (que >= ha->max_req_queues || !ha->req_q_map[que])
-                goto fatal;
+        /* Validate handle. */
+        if (handle < MAX_OUTSTANDING_COMMANDS)
+                sp = req->outstanding_cmds[handle];
+        else
+                sp = NULL;
 
-        req = ha->req_q_map[que];
+        if (sp) {
+                /* Free outstanding command slot. */
+                req->outstanding_cmds[handle] = NULL;
+
+                /* Bad payload or header */
+                if (pkt->entry_status &
+                    (RF_INV_E_ORDER | RF_INV_E_COUNT |
+                     RF_INV_E_PARAM | RF_INV_E_TYPE)) {
+                        sp->cmd->result = DID_ERROR << 16;
+                } else if (pkt->entry_status & RF_BUSY) {
+                        sp->cmd->result = DID_BUS_BUSY << 16;
+                } else {
+                        sp->cmd->result = DID_ERROR << 16;
+                }
+                qla2x00_sp_compl(ha, sp);
 
-        if (pkt->entry_status & RF_BUSY)
-                res = DID_BUS_BUSY << 16;
+        } else if (pkt->entry_type == COMMAND_A64_TYPE || pkt->entry_type ==
+                COMMAND_TYPE || pkt->entry_type == COMMAND_TYPE_7
+                || pkt->entry_type == COMMAND_TYPE_6) {
+                ql_log(ql_log_warn, vha, 0x5030,
+                    "Error entry - invalid handle.\n");
 
-        sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
-        if (sp) {
-                sp->done(ha, sp, res);
-                return;
+                if (IS_QLA82XX(ha))
+                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
+                else
+                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                qla2xxx_wake_dpc(vha);
         }
-fatal:
-        ql_log(ql_log_warn, vha, 0x5030,
-            "Error entry - invalid handle/queue.\n");
-
-        if (IS_QLA82XX(ha))
-                set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
-        else
-                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        qla2xxx_wake_dpc(vha);
 }
 
 /**
@@ -2306,31 +1977,27 @@ static void
 qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 {
         uint16_t        cnt;
-        uint32_t        mboxes;
         uint16_t __iomem *wptr;
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
-        /* Read all mbox registers? */
-        mboxes = (1 << ha->mbx_count) - 1;
-        if (!ha->mcp)
-                ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERROR.\n");
-        else
-                mboxes = ha->mcp->in_mb;
-
         /* Load return mailbox registers. */
         ha->flags.mbox_int = 1;
         ha->mailbox_out[0] = mb0;
-        mboxes >>= 1;
         wptr = (uint16_t __iomem *)&reg->mailbox1;
 
         for (cnt = 1; cnt < ha->mbx_count; cnt++) {
-                if (mboxes & BIT_0)
-                        ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
-
-                mboxes >>= 1;
+                ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
                 wptr++;
         }
+
+        if (ha->mcp) {
+                ql_dbg(ql_dbg_async, vha, 0x504d,
+                    "Got mailbox completion. cmd=%x.\n", ha->mcp->mb[0]);
+        } else {
+                ql_dbg(ql_dbg_async, vha, 0x504e,
+                    "MBX pointer ERROR.\n");
+        }
 }
 
 /**
@@ -2358,10 +2025,10 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
                 }
 
                 if (pkt->entry_status != 0) {
-                        qla2x00_error_entry(vha, rsp, (sts_entry_t *) pkt);
-
-                        (void)qlt_24xx_process_response_error(vha, pkt);
+                        ql_dbg(ql_dbg_async, vha, 0x5029,
+                            "Process error entry.\n");
 
+                        qla2x00_error_entry(vha, rsp, (sts_entry_t *) pkt);
                         ((response_t *)pkt)->signature = RESPONSE_PROCESSED;
                         wmb();
                         continue;
@@ -2388,23 +2055,11 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
                         break;
                 case CT_IOCB_TYPE:
                         qla24xx_els_ct_entry(vha, rsp->req, pkt, CT_IOCB_TYPE);
+                        clear_bit(MBX_INTERRUPT, &vha->hw->mbx_cmd_flags);
                         break;
                 case ELS_IOCB_TYPE:
                         qla24xx_els_ct_entry(vha, rsp->req, pkt, ELS_IOCB_TYPE);
                         break;
-                case ABTS_RECV_24XX:
-                        /* ensure that the ATIO queue is empty */
-                        qlt_24xx_process_atio_queue(vha);
-                case ABTS_RESP_24XX:
-                case CTIO_TYPE7:
-                case NOTIFY_ACK_TYPE:
-                        qlt_response_pkt_all_vps(vha, (response_t *)pkt);
-                        break;
-                case MARKER_TYPE:
-                        /* Do nothing in this case, this check is to prevent it
-                         * from falling into default case
-                         */
-                        break;
                 default:
                         /* Type Not Supported. */
                         ql_dbg(ql_dbg_async, vha, 0x5042,
@@ -2433,7 +2088,7 @@ qla2xxx_check_risc_status(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
-        if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))
                 return;
 
         rval = QLA_SUCCESS;
@@ -2474,7 +2129,7 @@ done:
 }
 
 /**
- * qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP24xx.
+ * qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP63xx.
  * @irq:
  * @dev_id: SCSI driver HA context
  *
@@ -2492,14 +2147,14 @@ qla24xx_intr_handler(int irq, void *dev_id)
         unsigned long   iter;
         uint32_t        stat;
         uint32_t        hccr;
-        uint16_t        mb[8];
+        uint16_t        mb[4];
         struct rsp_que *rsp;
         unsigned long   flags;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x5059,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                    "%s(): NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
 
@@ -2533,30 +2188,23 @@ qla24xx_intr_handler(int irq, void *dev_id)
                         break;
 
                 switch (stat & 0xff) {
-                case INTR_ROM_MB_SUCCESS:
-                case INTR_ROM_MB_FAILED:
-                case INTR_MB_SUCCESS:
-                case INTR_MB_FAILED:
+                case 0x1:
+                case 0x2:
+                case 0x10:
+                case 0x11:
                         qla24xx_mbx_completion(vha, MSW(stat));
                         status |= MBX_INTERRUPT;
 
                         break;
-                case INTR_ASYNC_EVENT:
+                case 0x12:
                         mb[0] = MSW(stat);
                         mb[1] = RD_REG_WORD(&reg->mailbox1);
                         mb[2] = RD_REG_WORD(&reg->mailbox2);
                         mb[3] = RD_REG_WORD(&reg->mailbox3);
                         qla2x00_async_event(vha, rsp, mb);
                         break;
-                case INTR_RSP_QUE_UPDATE:
-                case INTR_RSP_QUE_UPDATE_83XX:
-                        qla24xx_process_response_queue(vha, rsp);
-                        break;
-                case INTR_ATIO_QUE_UPDATE:
-                        qlt_24xx_process_atio_queue(vha);
-                        break;
-                case INTR_ATIO_RSP_QUE_UPDATE:
-                        qlt_24xx_process_atio_queue(vha);
+                case 0x13:
+                case 0x14:
                         qla24xx_process_response_queue(vha, rsp);
                         break;
                 default:
@@ -2566,8 +2214,6 @@ qla24xx_intr_handler(int irq, void *dev_id)
                 }
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
                 RD_REG_DWORD_RELAXED(&reg->hccr);
-                if (unlikely(IS_QLA83XX(ha) && (ha->pdev->revision == 1)))
-                        ndelay(3500);
         }
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
@@ -2591,8 +2237,8 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x505a,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                "%s(): NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
         ha = rsp->hw;
@@ -2621,14 +2267,14 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x505b,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                        "%s(): NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
         ha = rsp->hw;
 
         /* Clear the interrupt, if enabled, for this response queue */
-        if (!ha->flags.disable_msix_handshake) {
+        if (rsp->options & ~BIT_6) {
                 reg = &ha->iobase->isp24;
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
@@ -2650,13 +2296,13 @@ qla24xx_msix_default(int irq, void *dev_id)
         int             status;
         uint32_t        stat;
         uint32_t        hccr;
-        uint16_t        mb[8];
+        uint16_t        mb[4];
         unsigned long flags;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0x505c,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                        "%s(): NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
         ha = rsp->hw;
@@ -2686,30 +2332,23 @@ qla24xx_msix_default(int irq, void *dev_id)
                         break;
 
                 switch (stat & 0xff) {
-                case INTR_ROM_MB_SUCCESS:
-                case INTR_ROM_MB_FAILED:
-                case INTR_MB_SUCCESS:
-                case INTR_MB_FAILED:
+                case 0x1:
+                case 0x2:
+                case 0x10:
+                case 0x11:
                         qla24xx_mbx_completion(vha, MSW(stat));
                         status |= MBX_INTERRUPT;
 
                         break;
-                case INTR_ASYNC_EVENT:
+                case 0x12:
                         mb[0] = MSW(stat);
                         mb[1] = RD_REG_WORD(&reg->mailbox1);
                         mb[2] = RD_REG_WORD(&reg->mailbox2);
                         mb[3] = RD_REG_WORD(&reg->mailbox3);
                         qla2x00_async_event(vha, rsp, mb);
                         break;
-                case INTR_RSP_QUE_UPDATE:
-                case INTR_RSP_QUE_UPDATE_83XX:
-                        qla24xx_process_response_queue(vha, rsp);
-                        break;
-                case INTR_ATIO_QUE_UPDATE:
-                        qlt_24xx_process_atio_queue(vha);
-                        break;
-                case INTR_ATIO_RSP_QUE_UPDATE:
-                        qlt_24xx_process_atio_queue(vha);
+                case 0x13:
+                case 0x14:
                         qla24xx_process_response_queue(vha, rsp);
                         break;
                 default:
@@ -2852,14 +2491,8 @@ msix_failed:
         }
 
         /* Enable MSI-X vector for response queue update for queue 0 */
-        if (IS_QLA83XX(ha)) {
-                if (ha->msixbase && ha->mqiobase &&
-                    (ha->max_rsp_queues > 1 || ha->max_req_queues > 1))
-                        ha->mqenable = 1;
-        } else
-                if (ha->mqiobase
-                    && (ha->max_rsp_queues > 1 || ha->max_req_queues > 1))
-                        ha->mqenable = 1;
+        if (ha->mqiobase &&  (ha->max_rsp_queues > 1 || ha->max_req_queues > 1))
+                ha->mqenable = 1;
         ql_dbg(ql_dbg_multiq, vha, 0xc005,
             "mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n",
             ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
@@ -2880,8 +2513,8 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
         /* If possible, enable MSI-X. */
-        if (!IS_QLA2432(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
-                !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
+        if (!IS_QLA2432(ha) && !IS_QLA2532(ha) &&
+                !IS_QLA8432(ha) && !IS_QLA8XXX_TYPE(ha))
                 goto skip_msi;
 
         if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_HP &&
@@ -2914,7 +2547,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
 skip_msix:
 
         if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
-            !IS_QLA8001(ha) && !IS_QLA82XX(ha))
+            !IS_QLA8001(ha))
                 goto skip_msi;
 
         ret = pci_enable_msi(ha->pdev);
@@ -2925,11 +2558,6 @@ skip_msix:
         } else
                 ql_log(ql_log_warn, vha, 0x0039,
                     "MSI-X; Falling back-to INTa mode -- %d.\n", ret);
-
-        /* Skip INTx on ISP82xx. */
-        if (!ha->flags.msi_enabled && IS_QLA82XX(ha))
-                return QLA_FUNCTION_FAILED;
-
 skip_msi:
 
         ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
@@ -2940,15 +2568,25 @@ skip_msi:
                     "Failed to reserve interrupt %d already in use.\n",
                     ha->pdev->irq);
                 goto fail;
-        } else if (!ha->flags.msi_enabled)
-                ql_dbg(ql_dbg_init, vha, 0x0125,
-                    "INTa mode: Enabled.\n");
+        }
 
 clear_risc_ints:
 
+        /*
+         * FIXME: Noted that 8014s were being dropped during NK testing.
+         * Timing deltas during MSI-X/INTa transitions?
+         */
+        if (IS_QLA81XX(ha) || IS_QLA82XX(ha))
+                goto fail;
         spin_lock_irq(&ha->hardware_lock);
-        if (!IS_FWI2_CAPABLE(ha))
+        if (IS_FWI2_CAPABLE(ha)) {
+                WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_HOST_INT);
+                WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_RISC_INT);
+        } else {
                 WRT_REG_WORD(&reg->isp.semaphore, 0);
+                WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_RISC_INT);
+                WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT);
+        }
         spin_unlock_irq(&ha->hardware_lock);
 
 fail:
@@ -2959,15 +2597,7 @@ void
 qla2x00_free_irqs(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct rsp_que *rsp;
-
-        /*
-         * We need to check that ha->rsp_q_map is valid in case we are called
-         * from a probe failure context.
-         */
-        if (!ha->rsp_q_map || !ha->rsp_q_map[0])
-                return;
-        rsp = ha->rsp_q_map[0];
+        struct rsp_que *rsp = ha->rsp_q_map[0];
 
         if (ha->flags.msix_enabled)
                 qla24xx_disable_msix(ha);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 68c55eaa318..f7604ea1af8 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1,11 +1,10 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
-#include "qla_target.h"
 
 #include <linux/delay.h>
 #include <linux/gfp.h>
@@ -47,17 +46,17 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         struct qla_hw_data *ha = vha->hw;
         scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, base_vha, 0x1000, "Entered %s.\n", __func__);
 
         if (ha->pdev->error_state > pci_channel_io_frozen) {
-                ql_log(ql_log_warn, vha, 0x1001,
+                ql_log(ql_log_warn, base_vha, 0x1001,
                     "error_state is greater than pci_channel_io_frozen, "
                     "exiting.\n");
                 return QLA_FUNCTION_TIMEOUT;
         }
 
         if (vha->device_flags & DFLG_DEV_FAILED) {
-                ql_log(ql_log_warn, vha, 0x1002,
+                ql_log(ql_log_warn, base_vha, 0x1002,
                     "Device in failed state, exiting.\n");
                 return QLA_FUNCTION_TIMEOUT;
         }
@@ -70,17 +69,18 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 
 
         if (ha->flags.pci_channel_io_perm_failure) {
-                ql_log(ql_log_warn, vha, 0x1003,
+                ql_log(ql_log_warn, base_vha, 0x1003,
                     "Perm failure on EEH timeout MBX, exiting.\n");
                 return QLA_FUNCTION_TIMEOUT;
         }
 
-        if (IS_QLA82XX(ha) && ha->flags.isp82xx_fw_hung) {
+        if (ha->flags.isp82xx_fw_hung) {
                 /* Setting Link-Down error */
                 mcp->mb[0] = MBS_LINK_DOWN_ERROR;
-                ql_log(ql_log_warn, vha, 0x1004,
+                ql_log(ql_log_warn, base_vha, 0x1004,
                     "FW hung = %d.\n", ha->flags.isp82xx_fw_hung);
-                return QLA_FUNCTION_TIMEOUT;
+                rval = QLA_FUNCTION_FAILED;
+                goto premature_exit;
         }
 
         /*
@@ -90,9 +90,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
          */
         if (!wait_for_completion_timeout(&ha->mbx_cmd_comp, mcp->tov * HZ)) {
                 /* Timeout occurred. Return error. */
-                ql_log(ql_log_warn, vha, 0x1005,
-                    "Cmd access timeout, cmd=0x%x, Exiting.\n",
-                    mcp->mb[0]);
+                ql_log(ql_log_warn, base_vha, 0x1005,
+                    "Cmd access timeout, Exiting.\n");
                 return QLA_FUNCTION_TIMEOUT;
         }
 
@@ -100,7 +99,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         /* Save mailbox command for debug */
         ha->mcp = mcp;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1006,
+        ql_dbg(ql_dbg_mbx, base_vha, 0x1006,
             "Prepare to issue mbox cmd=0x%x.\n", mcp->mb[0]);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -129,28 +128,28 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                 iptr++;
         }
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1111,
+        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1111,
             "Loaded MBX registers (displayed in bytes) =.\n");
-        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1112,
+        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1112,
             (uint8_t *)mcp->mb, 16);
-        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1113,
+        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1113,
             ".\n");
-        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1114,
+        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1114,
             ((uint8_t *)mcp->mb + 0x10), 16);
-        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1115,
+        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1115,
             ".\n");
-        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1116,
+        ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1116,
             ((uint8_t *)mcp->mb + 0x20), 8);
-        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1117,
+        ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1117,
             "I/O Address = %p.\n", optr);
-        ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x100e);
+        ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x100e);
 
         /* Issue set host interrupt command to send cmd out. */
         ha->flags.mbox_int = 0;
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
         /* Unlock mbx registers and wait for interrupt */
-        ql_dbg(ql_dbg_mbx, vha, 0x100f,
+        ql_dbg(ql_dbg_mbx, base_vha, 0x100f,
             "Going to unlock irq & waiting for interrupts. "
             "jiffies=%lx.\n", jiffies);
 
@@ -164,8 +163,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                                 HINT_MBX_INT_PENDING) {
                                 spin_unlock_irqrestore(&ha->hardware_lock,
                                         flags);
-                                ha->flags.mbox_busy = 0;
-                                ql_dbg(ql_dbg_mbx, vha, 0x1010,
+                                ql_dbg(ql_dbg_mbx, base_vha, 0x1010,
                                     "Pending mailbox timeout, exiting.\n");
                                 rval = QLA_FUNCTION_TIMEOUT;
                                 goto premature_exit;
@@ -182,7 +180,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                 clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
 
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1011,
+                ql_dbg(ql_dbg_mbx, base_vha, 0x1011,
                     "Cmd=%x Polling Mode.\n", command);
 
                 if (IS_QLA82XX(ha)) {
@@ -190,8 +188,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                                 HINT_MBX_INT_PENDING) {
                                 spin_unlock_irqrestore(&ha->hardware_lock,
                                         flags);
-                                ha->flags.mbox_busy = 0;
-                                ql_dbg(ql_dbg_mbx, vha, 0x1012,
+                                ql_dbg(ql_dbg_mbx, base_vha, 0x1012,
                                     "Pending mailbox timeout, exiting.\n");
                                 rval = QLA_FUNCTION_TIMEOUT;
                                 goto premature_exit;
@@ -216,7 +213,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                             command == MBC_LOAD_RISC_RAM_EXTENDED))
                                 msleep(10);
                 } /* while */
-                ql_dbg(ql_dbg_mbx, vha, 0x1013,
+                ql_dbg(ql_dbg_mbx, base_vha, 0x1013,
                     "Waited %d sec.\n",
                     (uint)((jiffies - (wait_time - (mcp->tov * HZ)))/HZ));
         }
@@ -225,20 +222,20 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         if (ha->flags.mbox_int) {
                 uint16_t *iptr2;
 
-                ql_dbg(ql_dbg_mbx, vha, 0x1014,
+                ql_dbg(ql_dbg_mbx, base_vha, 0x1014,
                     "Cmd=%x completed.\n", command);
 
                 /* Got interrupt. Clear the flag. */
                 ha->flags.mbox_int = 0;
                 clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
-                if ((IS_QLA82XX(ha) && ha->flags.isp82xx_fw_hung)) {
+                if (ha->flags.isp82xx_fw_hung) {
                         ha->flags.mbox_busy = 0;
                         /* Setting Link-Down error */
                         mcp->mb[0] = MBS_LINK_DOWN_ERROR;
                         ha->mcp = NULL;
                         rval = QLA_FUNCTION_FAILED;
-                        ql_log(ql_log_warn, vha, 0x1015,
+                        ql_log(ql_log_warn, base_vha, 0x1015,
                             "FW hung = %d.\n", ha->flags.isp82xx_fw_hung);
                         goto premature_exit;
                 }
@@ -270,16 +267,13 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                         mb0 = RD_MAILBOX_REG(ha, &reg->isp, 0);
                         ictrl = RD_REG_WORD(&reg->isp.ictrl);
                 }
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1119,
-                    "MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx "
-                    "mb[0]=0x%x\n", command, ictrl, jiffies, mb0);
-                ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1019);
-
-                /*
-                 * Attempt to capture a firmware dump for further analysis
-                 * of the current firmware state
-                 */
-                ha->isp_ops->fw_dump(vha, 0);
+                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1119,
+                    "MBX Command timeout for cmd %x.\n", command);
+                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x111a,
+                    "iocontrol=%x jiffies=%lx.\n", ictrl, jiffies);
+                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x111b,
+                    "mb[0] = 0x%x.\n", mb0);
+                ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, base_vha, 0x1019);
 
                 rval = QLA_FUNCTION_TIMEOUT;
         }
@@ -290,7 +284,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         ha->mcp = NULL;
 
         if ((abort_active || !io_lock_on) && !IS_NOPOLLING_TYPE(ha)) {
-                ql_dbg(ql_dbg_mbx, vha, 0x101a,
+                ql_dbg(ql_dbg_mbx, base_vha, 0x101a,
                     "Checking for additional resp interrupt.\n");
 
                 /* polling mode for non isp_abort commands. */
@@ -302,63 +296,43 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                 if (!io_lock_on || (mcp->flags & IOCTL_CMD) ||
                     ha->flags.eeh_busy) {
                         /* not in dpc. schedule it for dpc to take over. */
-                        ql_dbg(ql_dbg_mbx, vha, 0x101b,
+                        ql_dbg(ql_dbg_mbx, base_vha, 0x101b,
                             "Timeout, schedule isp_abort_needed.\n");
 
                         if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&
                             !test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&
                             !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                                if (IS_QLA82XX(ha)) {
-                                        ql_dbg(ql_dbg_mbx, vha, 0x112a,
-                                            "disabling pause transmit on port "
-                                            "0 & 1.\n");
-                                        qla82xx_wr_32(ha,
-                                            QLA82XX_CRB_NIU + 0x98,
-                                            CRB_NIU_XG_PAUSE_CTL_P0|
-                                            CRB_NIU_XG_PAUSE_CTL_P1);
-                                }
+
                                 ql_log(ql_log_info, base_vha, 0x101c,
-                                    "Mailbox cmd timeout occurred, cmd=0x%x, "
-                                    "mb[0]=0x%x, eeh_busy=0x%x. Scheduling ISP "
-                                    "abort.\n", command, mcp->mb[0],
-                                    ha->flags.eeh_busy);
+                                    "Mailbox cmd timeout occured. "
+                                    "Scheduling ISP abort eeh_busy=0x%x.\n",
+                                        ha->flags.eeh_busy);
                                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                                 qla2xxx_wake_dpc(vha);
                         }
                 } else if (!abort_active) {
                         /* call abort directly since we are in the DPC thread */
-                        ql_dbg(ql_dbg_mbx, vha, 0x101d,
+                        ql_dbg(ql_dbg_mbx, base_vha, 0x101d,
                             "Timeout, calling abort_isp.\n");
 
                         if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&
                             !test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&
                             !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                                if (IS_QLA82XX(ha)) {
-                                        ql_dbg(ql_dbg_mbx, vha, 0x112b,
-                                            "disabling pause transmit on port "
-                                            "0 & 1.\n");
-                                        qla82xx_wr_32(ha,
-                                            QLA82XX_CRB_NIU + 0x98,
-                                            CRB_NIU_XG_PAUSE_CTL_P0|
-                                            CRB_NIU_XG_PAUSE_CTL_P1);
-                                }
+
                                 ql_log(ql_log_info, base_vha, 0x101e,
-                                    "Mailbox cmd timeout occurred, cmd=0x%x, "
-                                    "mb[0]=0x%x. Scheduling ISP abort ",
-                                    command, mcp->mb[0]);
+                                    "Mailbox cmd timeout occured. "
+                                    "Scheduling ISP abort.\n");
+
                                 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
                                 clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                                /* Allow next mbx cmd to come in. */
-                                complete(&ha->mbx_cmd_comp);
                                 if (ha->isp_ops->abort_isp(vha)) {
                                         /* Failed. retry later. */
                                         set_bit(ISP_ABORT_NEEDED,
                                             &vha->dpc_flags);
                                 }
                                 clear_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
-                                ql_dbg(ql_dbg_mbx, vha, 0x101f,
+                                ql_dbg(ql_dbg_mbx, base_vha, 0x101f,
                                     "Finished abort_isp.\n");
-                                goto mbx_done;
                         }
                 }
         }
@@ -367,11 +341,10 @@ premature_exit:
         /* Allow next mbx cmd to come in. */
         complete(&ha->mbx_cmd_comp);
 
-mbx_done:
         if (rval) {
-                ql_log(ql_log_warn, base_vha, 0x1020,
-                    "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x, cmd=%x ****.\n",
-                    mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3], command);
+                ql_dbg(ql_dbg_mbx, base_vha, 0x1020,
+                    "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, cmd=%x ****.\n",
+                    mcp->mb[0], mcp->mb[1], mcp->mb[2], command);
         } else {
                 ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__);
         }
@@ -388,8 +361,7 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1022,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1022, "Entered %s.\n", __func__);
 
         if (MSW(risc_addr) || IS_FWI2_CAPABLE(ha)) {
                 mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED;
@@ -423,8 +395,7 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1023,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1024,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1024, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -454,8 +425,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1025,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1025, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_EXECUTE_FIRMWARE;
         mcp->out_mb = MBX_0;
@@ -464,7 +434,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
                 mcp->mb[1] = MSW(risc_addr);
                 mcp->mb[2] = LSW(risc_addr);
                 mcp->mb[3] = 0;
-                if (IS_QLA81XX(ha) || IS_QLA83XX(ha)) {
+                if (IS_QLA81XX(ha)) {
                         struct nvram_81xx *nv = ha->nvram;
                         mcp->mb[4] = (nv->enhanced_features &
                             EXTENDED_BB_CREDITS);
@@ -490,11 +460,10 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 if (IS_FWI2_CAPABLE(ha)) {
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1027,
+                        ql_dbg(ql_dbg_mbx, vha, 0x1027,
                             "Done exchanges=%x.\n", mcp->mb[1]);
                 } else {
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,
-                            "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx, vha, 0x1028, "Done %s.\n", __func__);
                 }
         }
 
@@ -518,23 +487,21 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
  *      Kernel context.
  */
 int
-qla2x00_get_fw_version(scsi_qla_host_t *vha)
+qla2x00_get_fw_version(scsi_qla_host_t *vha, uint16_t *major, uint16_t *minor,
+    uint16_t *subminor, uint16_t *attributes, uint32_t *memory, uint8_t *mpi,
+    uint32_t *mpi_caps, uint8_t *phy)
 {
         int             rval;
         mbx_cmd_t       mc;
         mbx_cmd_t       *mcp = &mc;
-        struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1029,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1029, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_VERSION;
         mcp->out_mb = MBX_0;
         mcp->in_mb = MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-        if (IS_QLA81XX(vha->hw) || IS_QLA8031(ha))
+        if (IS_QLA81XX(vha->hw))
                 mcp->in_mb |= MBX_13|MBX_12|MBX_11|MBX_10|MBX_9|MBX_8;
-        if (IS_FWI2_CAPABLE(ha))
-                mcp->in_mb |= MBX_17|MBX_16|MBX_15;
         mcp->flags = 0;
         mcp->tov = MBX_TOV_SECONDS;
         rval = qla2x00_mailbox_command(vha, mcp);
@@ -542,43 +509,30 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
                 goto failed;
 
         /* Return mailbox data. */
-        ha->fw_major_version = mcp->mb[1];
-        ha->fw_minor_version = mcp->mb[2];
-        ha->fw_subminor_version = mcp->mb[3];
-        ha->fw_attributes = mcp->mb[6];
+        *major = mcp->mb[1];
+        *minor = mcp->mb[2];
+        *subminor = mcp->mb[3];
+        *attributes = mcp->mb[6];
         if (IS_QLA2100(vha->hw) || IS_QLA2200(vha->hw))
-                ha->fw_memory_size = 0x1FFFF;           /* Defaults to 128KB. */
+                *memory = 0x1FFFF;                      /* Defaults to 128KB. */
         else
-                ha->fw_memory_size = (mcp->mb[5] << 16) | mcp->mb[4];
-        if (IS_QLA81XX(vha->hw) || IS_QLA8031(vha->hw)) {
-                ha->mpi_version[0] = mcp->mb[10] & 0xff;
-                ha->mpi_version[1] = mcp->mb[11] >> 8;
-                ha->mpi_version[2] = mcp->mb[11] & 0xff;
-                ha->mpi_capabilities = (mcp->mb[12] << 16) | mcp->mb[13];
-                ha->phy_version[0] = mcp->mb[8] & 0xff;
-                ha->phy_version[1] = mcp->mb[9] >> 8;
-                ha->phy_version[2] = mcp->mb[9] & 0xff;
+                *memory = (mcp->mb[5] << 16) | mcp->mb[4];
+        if (IS_QLA81XX(vha->hw)) {
+                mpi[0] = mcp->mb[10] & 0xff;
+                mpi[1] = mcp->mb[11] >> 8;
+                mpi[2] = mcp->mb[11] & 0xff;
+                *mpi_caps = (mcp->mb[12] << 16) | mcp->mb[13];
+                phy[0] = mcp->mb[8] & 0xff;
+                phy[1] = mcp->mb[9] >> 8;
+                phy[2] = mcp->mb[9] & 0xff;
         }
-        if (IS_FWI2_CAPABLE(ha)) {
-                ha->fw_attributes_h = mcp->mb[15];
-                ha->fw_attributes_ext[0] = mcp->mb[16];
-                ha->fw_attributes_ext[1] = mcp->mb[17];
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1139,
-                    "%s: FW_attributes Upper: 0x%x, Lower: 0x%x.\n",
-                    __func__, mcp->mb[15], mcp->mb[6]);
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x112f,
-                    "%s: Ext_FwAttributes Upper: 0x%x, Lower: 0x%x.\n",
-                    __func__, mcp->mb[17], mcp->mb[16]);
-        }
-
 failed:
         if (rval != QLA_SUCCESS) {
                 /*EMPTY*/
                 ql_dbg(ql_dbg_mbx, vha, 0x102a, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102b,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x102b, "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -604,8 +558,7 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102c,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x102c, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_OPTION;
         mcp->out_mb = MBX_0;
@@ -623,8 +576,7 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                 fwopts[2] = mcp->mb[2];
                 fwopts[3] = mcp->mb[3];
 
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102e,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x102e, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -652,8 +604,7 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102f,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x102f, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_FIRMWARE_OPTION;
         mcp->mb[1] = fwopts[1];
@@ -681,8 +632,7 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                     "Failed=%x (%x/%x).\n", rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1031,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1031, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -710,8 +660,7 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1032,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1032, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST;
         mcp->mb[1] = 0xAAAA;
@@ -741,8 +690,7 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1033, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1034,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1034, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -770,8 +718,7 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1035,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1035, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_VERIFY_CHECKSUM;
         mcp->out_mb = MBX_0;
@@ -796,8 +743,7 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x chm sum=%x.\n", rval, IS_FWI2_CAPABLE(vha->hw) ?
                     (mcp->mb[2] << 16) | mcp->mb[1] : mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1037,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1037, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -829,8 +775,7 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
         mbx_cmd_t       mc;
         mbx_cmd_t       *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1038,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1038, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IOCB_COMMAND_A64;
         mcp->mb[1] = 0;
@@ -853,8 +798,7 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
                 /* Mask reserved bits. */
                 sts_entry->entry_status &=
                     IS_FWI2_CAPABLE(vha->hw) ? RF_MASK_24XX : RF_MASK;
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103a,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x103a, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -894,10 +838,8 @@ qla2x00_abort_command(srb_t *sp)
         scsi_qla_host_t *vha = fcport->vha;
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = vha->req;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103b,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x103b, "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -918,7 +860,7 @@ qla2x00_abort_command(srb_t *sp)
                 mcp->mb[1] = fcport->loop_id << 8;
         mcp->mb[2] = (uint16_t)handle;
         mcp->mb[3] = (uint16_t)(handle >> 16);
-        mcp->mb[6] = (uint16_t)cmd->device->lun;
+        mcp->mb[6] = (uint16_t)sp->cmd->device->lun;
         mcp->out_mb = MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
         mcp->in_mb = MBX_0;
         mcp->tov = MBX_TOV_SECONDS;
@@ -928,8 +870,7 @@ qla2x00_abort_command(srb_t *sp)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x103c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103d,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x103d, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -948,8 +889,7 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         l = l;
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103e,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x103e, "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -970,8 +910,7 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(vha, mcp);
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103f,
-                    "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x103f, "Failed=%x.\n", rval);
         }
 
         /* Issue marker IOCB. */
@@ -981,8 +920,7 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1040,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1041,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1041, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1000,8 +938,7 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
 
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1042,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1042, "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -1030,8 +967,7 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1044,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1045,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1045, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1065,14 +1001,13 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1046,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1046, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
         mcp->mb[9] = vha->vp_idx;
         mcp->out_mb = MBX_9|MBX_0;
         mcp->in_mb = MBX_9|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
-        if (IS_CNA_CAPABLE(vha->hw))
+        if (IS_QLA8XXX_TYPE(vha->hw))
                 mcp->in_mb |= MBX_13|MBX_12|MBX_11|MBX_10;
         mcp->tov = MBX_TOV_SECONDS;
         mcp->flags = 0;
@@ -1094,10 +1029,9 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
                 /*EMPTY*/
                 ql_dbg(ql_dbg_mbx, vha, 0x1047, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1048,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1048, "Done %s.\n", __func__);
 
-                if (IS_CNA_CAPABLE(vha->hw)) {
+                if (IS_QLA8XXX_TYPE(vha->hw)) {
                         vha->fcoe_vlan_id = mcp->mb[9] & 0xfff;
                         vha->fcoe_fcf_idx = mcp->mb[10];
                         vha->fcoe_vn_port_mac[5] = mcp->mb[11] >> 8;
@@ -1136,8 +1070,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1049,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1049, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RETRY_COUNT;
         mcp->out_mb = MBX_0;
@@ -1160,7 +1093,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
                         *tov = ratov;
                 }
 
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104b,
+                ql_dbg(ql_dbg_mbx, vha, 0x104b,
                     "Done %s mb3=%d ratov=%d.\n", __func__, mcp->mb[3], ratov);
         }
 
@@ -1192,8 +1125,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104c,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x104c, "Entered %s.\n", __func__);
 
         if (IS_QLA82XX(ha) && ql2xdbwr)
                 qla82xx_wr_32(ha, ha->nxdb_wr_ptr,
@@ -1210,7 +1142,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
         mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
         mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
-        if ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) && ha->ex_init_cb->ex_version) {
+        if (IS_QLA81XX(ha) && ha->ex_init_cb->ex_version) {
                 mcp->mb[1] = BIT_0;
                 mcp->mb[10] = MSW(ha->ex_init_cb_dma);
                 mcp->mb[11] = LSW(ha->ex_init_cb_dma);
@@ -1219,11 +1151,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
                 mcp->mb[14] = sizeof(*ha->ex_init_cb);
                 mcp->out_mb |= MBX_14|MBX_13|MBX_12|MBX_11|MBX_10;
         }
-        /* 1 and 2 should normally be captured. */
-        mcp->in_mb = MBX_2|MBX_1|MBX_0;
-        if (IS_QLA83XX(ha))
-                /* mb3 is additional info about the installed SFP. */
-                mcp->in_mb  |= MBX_3;
+        mcp->in_mb = MBX_0;
         mcp->buf_size = size;
         mcp->flags = MBX_DMA_OUT;
         mcp->tov = MBX_TOV_SECONDS;
@@ -1232,104 +1160,12 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         if (rval != QLA_SUCCESS) {
                 /*EMPTY*/
                 ql_dbg(ql_dbg_mbx, vha, 0x104d,
-                    "Failed=%x mb[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x,.\n",
-                    rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3]);
+                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104e,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-/*
- * qla2x00_get_node_name_list
- *      Issue get node name list mailbox command, kmalloc()
- *      and return the resulting list. Caller must kfree() it!
- *
- * Input:
- *      ha = adapter state pointer.
- *      out_data = resulting list
- *      out_len = length of the resulting list
- *
- * Returns:
- *      qla2x00 local function return status code.
- *
- * Context:
- *      Kernel context.
- */
-int
-qla2x00_get_node_name_list(scsi_qla_host_t *vha, void **out_data, int *out_len)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_port_24xx_data *list = NULL;
-        void *pmap;
-        mbx_cmd_t mc;
-        dma_addr_t pmap_dma;
-        ulong dma_size;
-        int rval, left;
-
-        left = 1;
-        while (left > 0) {
-                dma_size = left * sizeof(*list);
-                pmap = dma_alloc_coherent(&ha->pdev->dev, dma_size,
-                                         &pmap_dma, GFP_KERNEL);
-                if (!pmap) {
-                        ql_log(ql_log_warn, vha, 0x113f,
-                            "%s(%ld): DMA Alloc failed of %ld\n",
-                            __func__, vha->host_no, dma_size);
-                        rval = QLA_MEMORY_ALLOC_FAILED;
-                        goto out;
-                }
-
-                mc.mb[0] = MBC_PORT_NODE_NAME_LIST;
-                mc.mb[1] = BIT_1 | BIT_3;
-                mc.mb[2] = MSW(pmap_dma);
-                mc.mb[3] = LSW(pmap_dma);
-                mc.mb[6] = MSW(MSD(pmap_dma));
-                mc.mb[7] = LSW(MSD(pmap_dma));
-                mc.mb[8] = dma_size;
-                mc.out_mb = MBX_0|MBX_1|MBX_2|MBX_3|MBX_6|MBX_7|MBX_8;
-                mc.in_mb = MBX_0|MBX_1;
-                mc.tov = 30;
-                mc.flags = MBX_DMA_IN;
-
-                rval = qla2x00_mailbox_command(vha, &mc);
-                if (rval != QLA_SUCCESS) {
-                        if ((mc.mb[0] == MBS_COMMAND_ERROR) &&
-                            (mc.mb[1] == 0xA)) {
-                                left += le16_to_cpu(mc.mb[2]) /
-                                    sizeof(struct qla_port_24xx_data);
-                                goto restart;
-                        }
-                        goto out_free;
-                }
-
-                left = 0;
-
-                list = kzalloc(dma_size, GFP_KERNEL);
-                if (!list) {
-                        ql_log(ql_log_warn, vha, 0x1140,
-                            "%s(%ld): failed to allocate node names list "
-                            "structure.\n", __func__, vha->host_no);
-                        rval = QLA_MEMORY_ALLOC_FAILED;
-                        goto out_free;
-                }
-
-                memcpy(list, pmap, dma_size);
-restart:
-                dma_free_coherent(&ha->pdev->dev, dma_size, pmap, pmap_dma);
+                ql_dbg(ql_dbg_mbx, vha, 0x104e, "Done %s.\n", __func__);
         }
 
-        *out_data = list;
-        *out_len = dma_size;
-
-out:
-        return rval;
-
-out_free:
-        dma_free_coherent(&ha->pdev->dev, dma_size, pmap, pmap_dma);
         return rval;
 }
 
@@ -1360,8 +1196,7 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
         dma_addr_t pd_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104f,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x104f, "Entered %s.\n", __func__);
 
         pd24 = NULL;
         pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
@@ -1404,7 +1239,6 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
                 goto gpd_error_out;
 
         if (IS_FWI2_CAPABLE(ha)) {
-                uint64_t zero = 0;
                 pd24 = (struct port_database_24xx *) pd;
 
                 /* Check for logged in state. */
@@ -1418,14 +1252,6 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
                         goto gpd_error_out;
                 }
 
-                if (fcport->loop_id == FC_NO_LOOP_ID ||
-                    (memcmp(fcport->port_name, (uint8_t *)&zero, 8) &&
-                     memcmp(fcport->port_name, pd24->port_name, 8))) {
-                        /* We lost the device mid way. */
-                        rval = QLA_NOT_LOGGED_IN;
-                        goto gpd_error_out;
-                }
-
                 /* Names are little-endian. */
                 memcpy(fcport->node_name, pd24->node_name, WWN_SIZE);
                 memcpy(fcport->port_name, pd24->port_name, WWN_SIZE);
@@ -1441,16 +1267,7 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
                         fcport->port_type = FCT_INITIATOR;
                 else
                         fcport->port_type = FCT_TARGET;
-
-                /* Passback COS information. */
-                fcport->supported_classes = (pd24->flags & PDF_CLASS_2) ?
-                                FC_COS_CLASS2 : FC_COS_CLASS3;
-
-                if (pd24->prli_svc_param_word_3[0] & BIT_7)
-                        fcport->flags |= FCF_CONF_COMP_SUPPORTED;
         } else {
-                uint64_t zero = 0;
-
                 /* Check for logged in state. */
                 if (pd->master_state != PD_STATE_PORT_LOGGED_IN &&
                     pd->slave_state != PD_STATE_PORT_LOGGED_IN) {
@@ -1463,14 +1280,6 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
                         goto gpd_error_out;
                 }
 
-                if (fcport->loop_id == FC_NO_LOOP_ID ||
-                    (memcmp(fcport->port_name, (uint8_t *)&zero, 8) &&
-                     memcmp(fcport->port_name, pd->port_name, 8))) {
-                        /* We lost the device mid way. */
-                        rval = QLA_NOT_LOGGED_IN;
-                        goto gpd_error_out;
-                }
-
                 /* Names are little-endian. */
                 memcpy(fcport->node_name, pd->node_name, WWN_SIZE);
                 memcpy(fcport->port_name, pd->port_name, WWN_SIZE);
@@ -1500,8 +1309,7 @@ gpd_error_out:
                     "Failed=%x mb[0]=%x mb[1]=%x.\n", rval,
                     mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1053,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1053, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1530,8 +1338,7 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1054,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1054, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
         mcp->out_mb = MBX_0;
@@ -1557,8 +1364,7 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
                 ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1056,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1056, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1590,8 +1396,7 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1057,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1057, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_PORT_NAME;
         mcp->mb[9] = vha->vp_idx;
@@ -1625,8 +1430,7 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
                         name[7] = LSB(mcp->mb[7]);
                 }
 
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1059,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1059, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1654,10 +1458,9 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x105a, "Entered %s.\n", __func__);
 
-        if (IS_CNA_CAPABLE(vha->hw)) {
+        if (IS_QLA8XXX_TYPE(vha->hw)) {
                 /* Logout across all FCFs. */
                 mcp->mb[0] = MBC_LIP_FULL_LOGIN;
                 mcp->mb[1] = BIT_1;
@@ -1692,8 +1495,7 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x105b, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105c,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x105c, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1725,10 +1527,9 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105d,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x105d, "Entered %s.\n", __func__);
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105e,
+        ql_dbg(ql_dbg_mbx, vha, 0x105e,
             "Retry cnt=%d ratov=%d total tov=%d.\n",
             vha->hw->retry_count, vha->hw->login_timeout, mcp->tov);
 
@@ -1752,8 +1553,7 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1060,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1060, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1772,8 +1572,7 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1061,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1061, "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 req = ha->req_q_map[0];
@@ -1802,8 +1601,7 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         lg->port_id[1] = area;
         lg->port_id[2] = domain;
         lg->vp_index = vha->vp_idx;
-        rval = qla2x00_issue_iocb_timeout(vha, lg, lg_dma, 0,
-            (ha->r_a_tov / 10 * 2) + 2);
+        rval = qla2x00_issue_iocb(vha, lg, lg_dma, 0);
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1063,
                     "Failed to issue login IOCB (%x).\n", rval);
@@ -1847,8 +1645,7 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                         break;
                 }
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1066,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1066, "Done %s.\n", __func__);
 
                 iop[0] = le32_to_cpu(lg->io_parameter[0]);
 
@@ -1866,10 +1663,6 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                         mb[10] |= BIT_0;        /* Class 2. */
                 if (lg->io_parameter[9] || lg->io_parameter[10])
                         mb[10] |= BIT_1;        /* Class 3. */
-                if (lg->io_parameter[0] & __constant_cpu_to_le32(BIT_7))
-                        mb[10] |= BIT_7;        /* Confirmed Completion
-                                                 * Allowed
-                                                 */
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1907,8 +1700,7 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1067,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1067, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGIN_FABRIC_PORT;
         mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
@@ -1956,8 +1748,7 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1069,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1069, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1988,8 +1779,7 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106a,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x106a, "Entered %s.\n", __func__);
 
         if (IS_FWI2_CAPABLE(ha))
                 return qla24xx_login_fabric(vha, fcport->loop_id,
@@ -2031,8 +1821,7 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[6], mcp->mb[7]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106c,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x106c, "Done %s.\n", __func__);
         }
 
         return (rval);
@@ -2049,8 +1838,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106d,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x106d, "Entered %s.\n", __func__);
 
         lg = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &lg_dma);
         if (lg == NULL) {
@@ -2076,8 +1864,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         lg->port_id[1] = area;
         lg->port_id[2] = domain;
         lg->vp_index = vha->vp_idx;
-        rval = qla2x00_issue_iocb_timeout(vha, lg, lg_dma, 0,
-            (ha->r_a_tov / 10 * 2) + 2);
+
+        rval = qla2x00_issue_iocb(vha, lg, lg_dma, 0);
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x106f,
                     "Failed to issue logout IOCB (%x).\n", rval);
@@ -2094,8 +1882,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     le32_to_cpu(lg->io_parameter[1]));
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1072,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1072, "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -2127,8 +1914,7 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1073,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1073, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT;
         mcp->out_mb = MBX_1|MBX_0;
@@ -2151,8 +1937,7 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     "Failed=%x mb[1]=%x.\n", rval, mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1075,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1075, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2180,8 +1965,7 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1076,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1076, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LIP_FULL_LOGIN;
         mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0;
@@ -2198,8 +1982,7 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1077, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1078,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1078, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2225,8 +2008,7 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1079,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1079, "Entered %s.\n", __func__);
 
         if (id_list == NULL)
                 return QLA_FUNCTION_FAILED;
@@ -2258,8 +2040,7 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
                 ql_dbg(ql_dbg_mbx, vha, 0x107a, "Failed=%x.\n", rval);
         } else {
                 *entries = mcp->mb[1];
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107b,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x107b, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2287,13 +2068,12 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107c,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x107c, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RESOURCE_COUNTS;
         mcp->out_mb = MBX_0;
         mcp->in_mb = MBX_11|MBX_10|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
-        if (IS_QLA81XX(vha->hw) || IS_QLA83XX(vha->hw))
+        if (IS_QLA81XX(vha->hw))
                 mcp->in_mb |= MBX_12;
         mcp->tov = MBX_TOV_SECONDS;
         mcp->flags = 0;
@@ -2304,7 +2084,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
                 ql_dbg(ql_dbg_mbx, vha, 0x107d,
                     "Failed mb[0]=%x.\n", mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107e,
+                ql_dbg(ql_dbg_mbx, vha, 0x107e,
                     "Done %s mb1=%x mb2=%x mb3=%x mb6=%x mb7=%x mb10=%x "
                     "mb11=%x mb12=%x.\n", __func__, mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[6], mcp->mb[7], mcp->mb[10],
@@ -2320,7 +2100,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
                         *orig_iocb_cnt = mcp->mb[10];
                 if (vha->hw->flags.npiv_supported && max_npiv_vports)
                         *max_npiv_vports = mcp->mb[11];
-                if ((IS_QLA81XX(vha->hw) || IS_QLA83XX(vha->hw)) && max_fcfs)
+                if (IS_QLA81XX(vha->hw) && max_fcfs)
                         *max_fcfs = mcp->mb[12];
         }
 
@@ -2351,8 +2131,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         dma_addr_t pmap_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107f,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x107f, "Entered %s.\n", __func__);
 
         pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
         if (pmap  == NULL) {
@@ -2375,7 +2154,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         rval = qla2x00_mailbox_command(vha, mcp);
 
         if (rval == QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1081,
+                ql_dbg(ql_dbg_mbx, vha, 0x1081,
                     "mb0/mb1=%x/%X FC/AL position map size (%x).\n",
                     mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]);
                 ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111d,
@@ -2389,8 +2168,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1082, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1083,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1083, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2419,8 +2197,7 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
         uint32_t *siter, *diter, dwords;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1084,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1084, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_STATUS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2454,8 +2231,7 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         /* Copy over data -- firmware data is LE. */
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1086,
-                            "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx, vha, 0x1086, "Done %s.\n", __func__);
                         dwords = offsetof(struct link_statistics, unused1) / 4;
                         siter = diter = &stats->link_fail_cnt;
                         while (dwords--)
@@ -2478,8 +2254,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
         mbx_cmd_t *mcp = &mc;
         uint32_t *siter, *diter, dwords;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1088, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_PRIV_STATS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2501,8 +2276,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
                             "Failed mb[0]=%x.\n", mcp->mb[0]);
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108a,
-                            "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx, vha, 0x108a, "Done %s.\n", __func__);
                         /* Copy over data -- firmware data is LE. */
                         dwords = sizeof(struct link_statistics) / 4;
                         siter = diter = &stats->link_fail_cnt;
@@ -2531,8 +2305,7 @@ qla24xx_abort_command(srb_t *sp)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = vha->req;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x108c, "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -2561,7 +2334,7 @@ qla24xx_abort_command(srb_t *sp)
         abt->port_id[0] = fcport->d_id.b.al_pa;
         abt->port_id[1] = fcport->d_id.b.area;
         abt->port_id[2] = fcport->d_id.b.domain;
-        abt->vp_index = fcport->vha->vp_idx;
+        abt->vp_index = fcport->vp_idx;
 
         abt->req_que_no = cpu_to_le16(req->id);
 
@@ -2580,8 +2353,7 @@ qla24xx_abort_command(srb_t *sp)
                     le16_to_cpu(abt->nport_handle));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1091,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1091, "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, abt, abt_dma);
@@ -2613,8 +2385,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         ha = vha->hw;
         req = vha->req;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1092,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1092, "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 rsp = ha->rsp_q_map[tag + 1];
@@ -2637,7 +2408,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         tsk->p.tsk.port_id[0] = fcport->d_id.b.al_pa;
         tsk->p.tsk.port_id[1] = fcport->d_id.b.area;
         tsk->p.tsk.port_id[2] = fcport->d_id.b.domain;
-        tsk->p.tsk.vp_index = fcport->vha->vp_idx;
+        tsk->p.tsk.vp_index = fcport->vp_idx;
         if (type == TCF_LUN_RESET) {
                 int_to_scsilun(l, &tsk->p.tsk.lun);
                 host_to_fcp_swap((uint8_t *)&tsk->p.tsk.lun,
@@ -2663,7 +2434,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         } else if (le16_to_cpu(sts->scsi_status) &
             SS_RESPONSE_INFO_LEN_VALID) {
                 if (le32_to_cpu(sts->rsp_data_len) < 4) {
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1097,
+                        ql_dbg(ql_dbg_mbx, vha, 0x1097,
                             "Ignoring inconsistent data length -- not enough "
                             "response info (%d).\n",
                             le32_to_cpu(sts->rsp_data_len));
@@ -2682,8 +2453,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
                 ql_dbg(ql_dbg_mbx, vha, 0x1099,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109a,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x109a, "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, tsk, tsk_dma);
@@ -2724,8 +2494,7 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109b,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x109b, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GEN_SYSTEM_ERROR;
         mcp->out_mb = MBX_0;
@@ -2737,8 +2506,7 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x109c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109d,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x109d, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2758,8 +2526,7 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109e,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x109e, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SERDES_PARAMS;
         mcp->mb[1] = BIT_0;
@@ -2778,8 +2545,7 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a0,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10a0, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2795,12 +2561,10 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a1,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10a1, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_STOP_FIRMWARE;
-        mcp->mb[1] = 0;
-        mcp->out_mb = MBX_1|MBX_0;
+        mcp->out_mb = MBX_0;
         mcp->in_mb = MBX_0;
         mcp->tov = 5;
         mcp->flags = 0;
@@ -2811,8 +2575,7 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
                 if (mcp->mb[0] == MBS_INVALID_COMMAND)
                         rval = QLA_INVALID_COMMAND;
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a3,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10a3, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2826,8 +2589,7 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a4,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10a4, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2853,8 +2615,7 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a6,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10a6, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2867,8 +2628,7 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a7,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10a7, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2888,8 +2648,7 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a9,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10a9, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2903,11 +2662,9 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10aa,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10aa, "Entered %s.\n", __func__);
 
-        if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw) &&
-            !IS_QLA83XX(vha->hw))
+        if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         if (unlikely(pci_channel_offline(vha->hw->pdev)))
@@ -2935,8 +2692,7 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ac,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10ac, "Done %s.\n", __func__);
 
                 if (mb)
                         memcpy(mb, mcp->mb, 8 * sizeof(*mb));
@@ -2954,8 +2710,7 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ad,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10ad, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2977,8 +2732,7 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10af,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10af, "Done %s.\n", __func__);
 
                 if (wr)
                         *wr = (uint64_t) mcp->mb[5] << 48 |
@@ -3003,8 +2757,7 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b0,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10b0, "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3029,8 +2782,7 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10b1, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b2,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10b2, "Done %s.\n", __func__);
                 if (port_speed)
                         *port_speed = mcp->mb[3];
         }
@@ -3046,8 +2798,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b3,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10b3, "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3055,7 +2806,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mcp->mb[0] = MBC_PORT_PARAMS;
         mcp->mb[1] = loop_id;
         mcp->mb[2] = BIT_0;
-        if (IS_CNA_CAPABLE(vha->hw))
+        if (IS_QLA8XXX_TYPE(vha->hw))
                 mcp->mb[3] = port_speed & (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0);
         else
                 mcp->mb[3] = port_speed & (BIT_2|BIT_1|BIT_0);
@@ -3074,11 +2825,9 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         }
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b4,
-                    "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10b4, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b5,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10b5, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3094,25 +2843,24 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
         scsi_qla_host_t *vp;
         unsigned long   flags;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b6,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10b6, "Entered %s.\n", __func__);
 
         if (rptid_entry->entry_status != 0)
                 return;
 
         if (rptid_entry->format == 0) {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b7,
+                ql_dbg(ql_dbg_mbx, vha, 0x10b7,
                     "Format 0 : Number of VPs setup %d, number of "
                     "VPs acquired %d.\n",
                     MSB(le16_to_cpu(rptid_entry->vp_count)),
                     LSB(le16_to_cpu(rptid_entry->vp_count)));
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b8,
+                ql_dbg(ql_dbg_mbx, vha, 0x10b8,
                     "Primary port id %02x%02x%02x.\n",
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
                     rptid_entry->port_id[0]);
         } else if (rptid_entry->format == 1) {
                 vp_idx = LSB(stat);
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b9,
+                ql_dbg(ql_dbg_mbx, vha, 0x10b9,
                     "Format 1: VP[%d] enabled - status %d - with "
                     "port id %02x%02x%02x.\n", vp_idx, MSB(stat),
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
@@ -3122,7 +2870,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                 if (vp_idx == 0 && (MSB(stat) != 1))
                         goto reg_needed;
 
-                if (MSB(stat) != 0 && MSB(stat) != 2) {
+                if (MSB(stat) == 1) {
                         ql_dbg(ql_dbg_mbx, vha, 0x10ba,
                             "Could not acquire ID for VP[%d].\n", vp_idx);
                         return;
@@ -3179,8 +2927,7 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
 
         /* This can be called by the parent */
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10bb,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10bb, "Entered %s.\n", __func__);
 
         vpmod = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vpmod_dma);
         if (!vpmod) {
@@ -3196,9 +2943,6 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
         vpmod->vp_count = 1;
         vpmod->vp_index1 = vha->vp_idx;
         vpmod->options_idx1 = BIT_3|BIT_4|BIT_5;
-
-        qlt_modify_vp_config(vha, vpmod);
-
         memcpy(vpmod->node_name_idx1, vha->node_name, WWN_SIZE);
         memcpy(vpmod->port_name_idx1, vha->port_name, WWN_SIZE);
         vpmod->entry_count = 1;
@@ -3219,8 +2963,7 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 /* EMPTY */
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c0,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10c0, "Done %s.\n", __func__);
                 fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING);
         }
         dma_pool_free(ha->s_dma_pool, vpmod, vpmod_dma);
@@ -3254,7 +2997,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
         int     vp_index = vha->vp_idx;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c1,
+        ql_dbg(ql_dbg_mbx, vha, 0x10c1,
             "Entered %s enabling index %d.\n", __func__, vp_index);
 
         if (vp_index == 0 || vp_index >= ha->max_npiv_vports)
@@ -3297,8 +3040,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
                     le16_to_cpu(vce->comp_status));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c6,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10c6, "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, vce, vce_dma);
@@ -3335,8 +3077,14 @@ qla2x00_send_change_request(scsi_qla_host_t *vha, uint16_t format,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c7,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10c7, "Entered %s.\n", __func__);
+
+        /*
+         * This command is implicitly executed by firmware during login for the
+         * physical hosts
+         */
+        if (vp_idx == 0)
+                return QLA_FUNCTION_FAILED;
 
         mcp->mb[0] = MBC_SEND_CHANGE_REQUEST;
         mcp->mb[1] = format;
@@ -3365,8 +3113,7 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1009,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1009, "Entered %s.\n", __func__);
 
         if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {
                 mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;
@@ -3400,12 +3147,12 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1008,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1007,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1007, "Done %s.\n", __func__);
         }
 
         return rval;
 }
+
 /* 84XX Support **************************************************************/
 
 struct cs84xx_mgmt_cmd {
@@ -3425,8 +3172,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
         unsigned long flags;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c8,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10c8, "Entered %s.\n", __func__);
 
         mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma);
         if (mn == NULL) {
@@ -3467,7 +3213,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                 status[0] = le16_to_cpu(mn->p.rsp.comp_status);
                 status[1] = status[0] == CS_VCS_CHIP_FAILURE ?
                     le16_to_cpu(mn->p.rsp.failure_code) : 0;
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ce,
+                ql_dbg(ql_dbg_mbx, vha, 0x10ce,
                     "cs=%x fc=%x.\n", status[0], status[1]);
 
                 if (status[0] != CS_COMPLETE) {
@@ -3481,7 +3227,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                                 retry = 1;
                         }
                 } else {
-                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d0,
+                        ql_dbg(ql_dbg_mbx, vha, 0x10d0,
                             "Firmware updated to %x.\n",
                             le32_to_cpu(mn->p.rsp.fw_ver));
 
@@ -3498,11 +3244,9 @@ verify_done:
         dma_pool_free(ha->s_dma_pool, mn, mn_dma);
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d1,
-                    "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d1, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d2,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d2, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3518,8 +3262,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d3,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10d3, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = req->options;
@@ -3533,10 +3276,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
         mcp->mb[12] = req->qos;
         mcp->mb[11] = req->vp_idx;
         mcp->mb[13] = req->rid;
-        if (IS_QLA83XX(ha))
-                mcp->mb[15] = 0;
 
-        reg = (struct device_reg_25xxmq __iomem *)((ha->mqiobase) +
+        reg = (struct device_reg_25xxmq *)((void *)(ha->mqiobase) +
                 QLA_QUE_PAGE * req->id);
 
         mcp->mb[4] = req->id;
@@ -3548,21 +3289,12 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
                         MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
         mcp->in_mb = MBX_0;
         mcp->flags = MBX_DMA_OUT;
-        mcp->tov = MBX_TOV_SECONDS * 2;
-
-        if (IS_QLA81XX(ha) || IS_QLA83XX(ha))
-                mcp->in_mb |= MBX_1;
-        if (IS_QLA83XX(ha)) {
-                mcp->out_mb |= MBX_15;
-                /* debug q create issue in SR-IOV */
-                mcp->in_mb |= MBX_9 | MBX_8 | MBX_7;
-        }
+        mcp->tov = 60;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         if (!(req->options & BIT_0)) {
                 WRT_REG_DWORD(&reg->req_q_in, 0);
-                if (!IS_QLA83XX(ha))
-                        WRT_REG_DWORD(&reg->req_q_out, 0);
+                WRT_REG_DWORD(&reg->req_q_out, 0);
         }
         req->req_q_in = &reg->req_q_in;
         req->req_q_out = &reg->req_q_out;
@@ -3573,8 +3305,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d4,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d5,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d5, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3590,8 +3321,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d6,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10d6, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = rsp->options;
@@ -3602,10 +3332,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         mcp->mb[5] = rsp->length;
         mcp->mb[14] = rsp->msix->entry;
         mcp->mb[13] = rsp->rid;
-        if (IS_QLA83XX(ha))
-                mcp->mb[15] = 0;
 
-        reg = (struct device_reg_25xxmq __iomem *)((ha->mqiobase) +
+        reg = (struct device_reg_25xxmq *)((void *)(ha->mqiobase) +
                 QLA_QUE_PAGE * rsp->id);
 
         mcp->mb[4] = rsp->id;
@@ -3617,23 +3345,12 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
                         |MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
         mcp->in_mb = MBX_0;
         mcp->flags = MBX_DMA_OUT;
-        mcp->tov = MBX_TOV_SECONDS * 2;
-
-        if (IS_QLA81XX(ha)) {
-                mcp->out_mb |= MBX_12|MBX_11|MBX_10;
-                mcp->in_mb |= MBX_1;
-        } else if (IS_QLA83XX(ha)) {
-                mcp->out_mb |= MBX_15|MBX_12|MBX_11|MBX_10;
-                mcp->in_mb |= MBX_1;
-                /* debug q create issue in SR-IOV */
-                mcp->in_mb |= MBX_9 | MBX_8 | MBX_7;
-        }
+        mcp->tov = 60;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         if (!(rsp->options & BIT_0)) {
                 WRT_REG_DWORD(&reg->rsp_q_out, 0);
-                if (!IS_QLA83XX(ha))
-                        WRT_REG_DWORD(&reg->rsp_q_in, 0);
+                WRT_REG_DWORD(&reg->rsp_q_in, 0);
         }
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -3643,8 +3360,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d7,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d8,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d8, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3657,8 +3373,7 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d9,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10d9, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IDC_ACK;
         memcpy(&mcp->mb[1], mb, QLA_IDC_ACK_REGS * sizeof(uint16_t));
@@ -3672,8 +3387,7 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x10da,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10db,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10db, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3686,10 +3400,9 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10dc,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10dc, "Entered %s.\n", __func__);
 
-        if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
+        if (!IS_QLA81XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
@@ -3705,8 +3418,7 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10de,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10de, "Done %s.\n", __func__);
                 *sector_size = mcp->mb[1];
         }
 
@@ -3720,11 +3432,10 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
+        if (!IS_QLA81XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10df,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10df, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = enable ? FAC_OPT_CMD_WRITE_ENABLE :
@@ -3740,8 +3451,7 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e1,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10e1, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3754,11 +3464,10 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
+        if (!IS_QLA81XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10e2, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = FAC_OPT_CMD_ERASE_SECTOR;
@@ -3777,8 +3486,7 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10e4, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3791,8 +3499,7 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e5,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10e5, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_RESTART_MPI_FW;
         mcp->out_mb = MBX_0;
@@ -3806,8 +3513,7 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e7,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10e7, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3822,8 +3528,7 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10e8, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3853,8 +3558,7 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10e9,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10ea, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3869,8 +3573,7 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10eb,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10eb, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3900,8 +3603,7 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10ec,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ed,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10ed, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3915,10 +3617,9 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ee,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10ee, "Entered %s.\n", __func__);
 
-        if (!IS_CNA_CAPABLE(vha->hw))
+        if (!IS_QLA8XXX_TYPE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         mcp->mb[0] = MBC_GET_XGMAC_STATS;
@@ -3938,8 +3639,7 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f0,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10f0, "Done %s.\n", __func__);
 
 
                 *actual_size = mcp->mb[2] << 2;
@@ -3956,10 +3656,9 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f1,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10f1, "Entered %s.\n", __func__);
 
-        if (!IS_CNA_CAPABLE(vha->hw))
+        if (!IS_QLA8XXX_TYPE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         mcp->mb[0] = MBC_GET_DCBX_PARAMS;
@@ -3980,8 +3679,7 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f3,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10f3, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3994,8 +3692,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f4,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10f4, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -4012,8 +3709,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
                 ql_dbg(ql_dbg_mbx, vha, 0x10f5,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f6,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10f6, "Done %s.\n", __func__);
                 *data = mcp->mb[3] << 16 | mcp->mb[2];
         }
 
@@ -4029,8 +3725,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         uint32_t iter_cnt = 0x1;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f7,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10f7, "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
@@ -4058,7 +3753,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
 
         mcp->out_mb = MBX_21|MBX_20|MBX_19|MBX_18|MBX_17|MBX_16|MBX_15|
             MBX_14|MBX_13|MBX_12|MBX_11|MBX_10|MBX_7|MBX_6|MBX_1|MBX_0;
-        if (IS_CNA_CAPABLE(vha->hw))
+        if (IS_QLA8XXX_TYPE(vha->hw))
                 mcp->out_mb |= MBX_2;
         mcp->in_mb = MBX_19|MBX_18|MBX_3|MBX_2|MBX_1|MBX_0;
 
@@ -4074,8 +3769,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "mb[19]=%x.\n", rval, mcp->mb[0], mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[18], mcp->mb[19]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f9,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10f9, "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -4092,13 +3786,12 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fa,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10fa, "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
         mcp->mb[1] = mreq->options | BIT_6;     /* BIT_6 specifies 64bit address */
-        if (IS_CNA_CAPABLE(ha)) {
+        if (IS_QLA8XXX_TYPE(ha)) {
                 mcp->mb[1] |= BIT_15;
                 mcp->mb[2] = vha->fcoe_fcf_idx;
         }
@@ -4116,14 +3809,13 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
 
         mcp->out_mb = MBX_21|MBX_20|MBX_17|MBX_16|MBX_15|
             MBX_14|MBX_10|MBX_7|MBX_6|MBX_1|MBX_0;
-        if (IS_CNA_CAPABLE(ha))
+        if (IS_QLA8XXX_TYPE(ha))
                 mcp->out_mb |= MBX_2;
 
         mcp->in_mb = MBX_0;
-        if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) ||
-            IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))
+        if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) || IS_QLA8XXX_TYPE(ha))
                 mcp->in_mb |= MBX_1;
-        if (IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))
+        if (IS_QLA8XXX_TYPE(ha))
                 mcp->in_mb |= MBX_3;
 
         mcp->tov = MBX_TOV_SECONDS;
@@ -4137,8 +3829,7 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fc,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10fc, "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -4153,7 +3844,7 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fd,
+        ql_dbg(ql_dbg_mbx, vha, 0x10fd,
             "Entered %s enable_diag=%d.\n", __func__, enable_diagnostic);
 
         mcp->mb[0] = MBC_ISP84XX_RESET;
@@ -4167,8 +3858,7 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         if (rval != QLA_SUCCESS)
                 ql_dbg(ql_dbg_mbx, vha, 0x10fe, "Failed=%x.\n", rval);
         else
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ff,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10ff, "Done %s.\n", __func__);
 
         return rval;
 }
@@ -4180,8 +3870,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1100,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1100, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -4200,8 +3889,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
                 ql_dbg(ql_dbg_mbx, vha, 0x1101,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1102,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1102, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4218,8 +3906,7 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
 
         rval = QLA_SUCCESS;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1103,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1103, "Entered %s.\n", __func__);
 
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
@@ -4262,13 +3949,11 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x1104,
                     "Failed=%x mb[0]=%x.\n", rval, mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1105,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1105, "Done %s.\n", __func__);
         }
 
         return rval;
 }
-
 int
 qla2x00_get_data_rate(scsi_qla_host_t *vha)
 {
@@ -4277,8 +3962,7 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1106,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1106, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4287,8 +3971,6 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
         mcp->mb[1] = 0;
         mcp->out_mb = MBX_1|MBX_0;
         mcp->in_mb = MBX_2|MBX_1|MBX_0;
-        if (IS_QLA83XX(ha))
-                mcp->in_mb |= MBX_3;
         mcp->tov = MBX_TOV_SECONDS;
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(vha, mcp);
@@ -4296,8 +3978,7 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1107,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1108,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x1108, "Done %s.\n", __func__);
                 if (mcp->mb[1] != 0x7)
                         ha->link_data_rate = mcp->mb[1];
         }
@@ -4313,10 +3994,9 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1109,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1109, "Entered %s.\n", __func__);
 
-        if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA81XX(ha))
                 return QLA_FUNCTION_FAILED;
         mcp->mb[0] = MBC_GET_PORT_CONFIG;
         mcp->out_mb = MBX_0;
@@ -4333,8 +4013,7 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 /* Copy all bits to preserve original value */
                 memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4);
 
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110b,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x110b, "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -4346,8 +4025,7 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110c,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x110c, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_PORT_CONFIG;
         /* Copy all bits to preserve original setting */
@@ -4362,8 +4040,7 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x110d,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110e,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x110e, "Done %s.\n", __func__);
 
         return rval;
 }
@@ -4378,8 +4055,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110f,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x110f, "Entered %s.\n", __func__);
 
         if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4407,8 +4083,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10cd, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10cc,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x10cc, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4421,12 +4096,10 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         uint8_t byte;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ca,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x10ca, "Entered %s.\n", __func__);
 
         /* Integer part */
-        rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x01, 1,
-                BIT_13|BIT_12|BIT_0);
+        rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x01, 1, BIT_13|BIT_0);
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10c9, "Failed=%x.\n", rval);
                 ha->flags.thermal_supported = 0;
@@ -4435,8 +4108,7 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         *temp = byte;
 
         /* Fraction part */
-        rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x10, 1,
-                BIT_13|BIT_12|BIT_0);
+        rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x10, 1, BIT_13|BIT_0);
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1019, "Failed=%x.\n", rval);
                 ha->flags.thermal_supported = 0;
@@ -4444,8 +4116,7 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         }
         *frac = (byte >> 6) * 25;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1018,
-            "Done %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1018, "Done %s.\n", __func__);
 fail:
         return rval;
 }
@@ -4458,8 +4129,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1017,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x1017, "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4478,8 +4148,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1016,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100e,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x100e, "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4493,8 +4162,7 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100d,
-            "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx, vha, 0x100d, "Entered %s.\n", __func__);
 
         if (!IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4513,485 +4181,7 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x100c,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100b,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla82xx_md_get_template_size(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-        int rval = QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111f,
-            "Entered %s.\n", __func__);
-
-        memset(mcp->mb, 0 , sizeof(mcp->mb));
-        mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
-        mcp->mb[1] = MSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
-        mcp->mb[2] = LSW(RQST_TMPLT_SIZE);
-        mcp->mb[3] = MSW(RQST_TMPLT_SIZE);
-
-        mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_14|MBX_13|MBX_12|MBX_11|MBX_10|MBX_9|MBX_8|
-            MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-
-        mcp->flags = MBX_DMA_OUT|MBX_DMA_IN|IOCTL_CMD;
-        mcp->tov = MBX_TOV_SECONDS;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        /* Always copy back return mailbox values. */
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1120,
-                    "mailbox command FAILED=0x%x, subcode=%x.\n",
-                    (mcp->mb[1] << 16) | mcp->mb[0],
-                    (mcp->mb[3] << 16) | mcp->mb[2]);
-        } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1121,
-                    "Done %s.\n", __func__);
-                ha->md_template_size = ((mcp->mb[3] << 16) | mcp->mb[2]);
-                if (!ha->md_template_size) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1122,
-                            "Null template size obtained.\n");
-                        rval = QLA_FUNCTION_FAILED;
-                }
-        }
-        return rval;
-}
-
-int
-qla82xx_md_get_template(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-        int rval = QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1123,
-            "Entered %s.\n", __func__);
-
-        ha->md_tmplt_hdr = dma_alloc_coherent(&ha->pdev->dev,
-           ha->md_template_size, &ha->md_tmplt_hdr_dma, GFP_KERNEL);
-        if (!ha->md_tmplt_hdr) {
-                ql_log(ql_log_warn, vha, 0x1124,
-                    "Unable to allocate memory for Minidump template.\n");
-                return rval;
-        }
-
-        memset(mcp->mb, 0 , sizeof(mcp->mb));
-        mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
-        mcp->mb[1] = MSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
-        mcp->mb[2] = LSW(RQST_TMPLT);
-        mcp->mb[3] = MSW(RQST_TMPLT);
-        mcp->mb[4] = LSW(LSD(ha->md_tmplt_hdr_dma));
-        mcp->mb[5] = MSW(LSD(ha->md_tmplt_hdr_dma));
-        mcp->mb[6] = LSW(MSD(ha->md_tmplt_hdr_dma));
-        mcp->mb[7] = MSW(MSD(ha->md_tmplt_hdr_dma));
-        mcp->mb[8] = LSW(ha->md_template_size);
-        mcp->mb[9] = MSW(ha->md_template_size);
-
-        mcp->flags = MBX_DMA_OUT|MBX_DMA_IN|IOCTL_CMD;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->out_mb = MBX_11|MBX_10|MBX_9|MBX_8|
-            MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_3|MBX_2|MBX_1|MBX_0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1125,
-                    "mailbox command FAILED=0x%x, subcode=%x.\n",
-                    ((mcp->mb[1] << 16) | mcp->mb[0]),
-                    ((mcp->mb[3] << 16) | mcp->mb[2]));
-        } else
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1126,
-                    "Done %s.\n", __func__);
-        return rval;
-}
-
-int
-qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
-{
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1133,
-            "Entered %s.\n", __func__);
-
-        memset(mcp, 0, sizeof(mbx_cmd_t));
-        mcp->mb[0] = MBC_SET_LED_CONFIG;
-        mcp->mb[1] = led_cfg[0];
-        mcp->mb[2] = led_cfg[1];
-        if (IS_QLA8031(ha)) {
-                mcp->mb[3] = led_cfg[2];
-                mcp->mb[4] = led_cfg[3];
-                mcp->mb[5] = led_cfg[4];
-                mcp->mb[6] = led_cfg[5];
-        }
-
-        mcp->out_mb = MBX_2|MBX_1|MBX_0;
-        if (IS_QLA8031(ha))
-                mcp->out_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
-        mcp->in_mb = MBX_0;
-        mcp->tov = 30;
-        mcp->flags = 0;
-
-        rval = qla2x00_mailbox_command(vha, mcp);
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1134,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1135,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
-{
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1136,
-            "Entered %s.\n", __func__);
-
-        memset(mcp, 0, sizeof(mbx_cmd_t));
-        mcp->mb[0] = MBC_GET_LED_CONFIG;
-
-        mcp->out_mb = MBX_0;
-        mcp->in_mb = MBX_2|MBX_1|MBX_0;
-        if (IS_QLA8031(ha))
-                mcp->in_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
-        mcp->tov = 30;
-        mcp->flags = 0;
-
-        rval = qla2x00_mailbox_command(vha, mcp);
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1137,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        } else {
-                led_cfg[0] = mcp->mb[1];
-                led_cfg[1] = mcp->mb[2];
-                if (IS_QLA8031(ha)) {
-                        led_cfg[2] = mcp->mb[3];
-                        led_cfg[3] = mcp->mb[4];
-                        led_cfg[4] = mcp->mb[5];
-                        led_cfg[5] = mcp->mb[6];
-                }
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1138,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
-{
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (!IS_QLA82XX(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1127,
-                "Entered %s.\n", __func__);
-
-        memset(mcp, 0, sizeof(mbx_cmd_t));
-        mcp->mb[0] = MBC_SET_LED_CONFIG;
-        if (enable)
-                mcp->mb[7] = 0xE;
-        else
-                mcp->mb[7] = 0xD;
-
-        mcp->out_mb = MBX_7|MBX_0;
-        mcp->in_mb = MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-
-        rval = qla2x00_mailbox_command(vha, mcp);
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1128,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1129,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla83xx_wr_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
-{
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (!IS_QLA83XX(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1130,
-            "Entered %s.\n", __func__);
-
-        mcp->mb[0] = MBC_WRITE_REMOTE_REG;
-        mcp->mb[1] = LSW(reg);
-        mcp->mb[2] = MSW(reg);
-        mcp->mb[3] = LSW(data);
-        mcp->mb[4] = MSW(data);
-        mcp->out_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
-
-        mcp->in_mb = MBX_1|MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1131,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1132,
-                    "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
-{
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113b,
-                    "Implicit LOGO Unsupported.\n");
-                return QLA_FUNCTION_FAILED;
-        }
-
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113c,
-            "Entering %s.\n",  __func__);
-
-        /* Perform Implicit LOGO. */
-        mcp->mb[0] = MBC_PORT_LOGOUT;
-        mcp->mb[1] = fcport->loop_id;
-        mcp->mb[10] = BIT_15;
-        mcp->out_mb = MBX_10|MBX_1|MBX_0;
-        mcp->in_mb = MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-        if (rval != QLA_SUCCESS)
-                ql_dbg(ql_dbg_mbx, vha, 0x113d,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        else
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113e,
-                    "Done %s.\n", __func__);
-
-        return rval;
-}
-
-int
-qla83xx_rd_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t *data)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long retry_max_time = jiffies + (2 * HZ);
-
-        if (!IS_QLA83XX(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx, vha, 0x114b, "Entered %s.\n", __func__);
-
-retry_rd_reg:
-        mcp->mb[0] = MBC_READ_REMOTE_REG;
-        mcp->mb[1] = LSW(reg);
-        mcp->mb[2] = MSW(reg);
-        mcp->out_mb = MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_4|MBX_3|MBX_1|MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x114c,
-                    "Failed=%x mb[0]=%x mb[1]=%x.\n",
-                    rval, mcp->mb[0], mcp->mb[1]);
-        } else {
-                *data = (mcp->mb[3] | (mcp->mb[4] << 16));
-                if (*data == QLA8XXX_BAD_VALUE) {
-                        /*
-                         * During soft-reset CAMRAM register reads might
-                         * return 0xbad0bad0. So retry for MAX of 2 sec
-                         * while reading camram registers.
-                         */
-                        if (time_after(jiffies, retry_max_time)) {
-                                ql_dbg(ql_dbg_mbx, vha, 0x1141,
-                                    "Failure to read CAMRAM register. "
-                                    "data=0x%x.\n", *data);
-                                return QLA_FUNCTION_FAILED;
-                        }
-                        msleep(100);
-                        goto retry_rd_reg;
-                }
-                ql_dbg(ql_dbg_mbx, vha, 0x1142, "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla83xx_restart_nic_firmware(scsi_qla_host_t *vha)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-        struct qla_hw_data *ha = vha->hw;
-
-        if (!IS_QLA83XX(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx, vha, 0x1143, "Entered %s.\n", __func__);
-
-        mcp->mb[0] = MBC_RESTART_NIC_FIRMWARE;
-        mcp->out_mb = MBX_0;
-        mcp->in_mb = MBX_1|MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1144,
-                    "Failed=%x mb[0]=%x mb[1]=%x.\n",
-                    rval, mcp->mb[0], mcp->mb[1]);
-                ha->isp_ops->fw_dump(vha, 0);
-        } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1145, "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla83xx_access_control(scsi_qla_host_t *vha, uint16_t options,
-        uint32_t start_addr, uint32_t end_addr, uint16_t *sector_size)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-        uint8_t subcode = (uint8_t)options;
-        struct qla_hw_data *ha = vha->hw;
-
-        if (!IS_QLA8031(ha))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx, vha, 0x1146, "Entered %s.\n", __func__);
-
-        mcp->mb[0] = MBC_SET_ACCESS_CONTROL;
-        mcp->mb[1] = options;
-        mcp->out_mb = MBX_1|MBX_0;
-        if (subcode & BIT_2) {
-                mcp->mb[2] = LSW(start_addr);
-                mcp->mb[3] = MSW(start_addr);
-                mcp->mb[4] = LSW(end_addr);
-                mcp->mb[5] = MSW(end_addr);
-                mcp->out_mb |= MBX_5|MBX_4|MBX_3|MBX_2;
-        }
-        mcp->in_mb = MBX_2|MBX_1|MBX_0;
-        if (!(subcode & (BIT_2 | BIT_5)))
-                mcp->in_mb |= MBX_4|MBX_3;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1147,
-                    "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x mb[3]=%x mb[4]=%x.\n",
-                    rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3],
-                    mcp->mb[4]);
-                ha->isp_ops->fw_dump(vha, 0);
-        } else {
-                if (subcode & BIT_5)
-                        *sector_size = mcp->mb[1];
-                else if (subcode & (BIT_6 | BIT_7)) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1148,
-                            "Driver-lock id=%x%x", mcp->mb[4], mcp->mb[3]);
-                } else if (subcode & (BIT_3 | BIT_4)) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1149,
-                            "Flash-lock id=%x%x", mcp->mb[4], mcp->mb[3]);
-                }
-                ql_dbg(ql_dbg_mbx, vha, 0x114a, "Done %s.\n", __func__);
-        }
-
-        return rval;
-}
-
-int
-qla2x00_dump_mctp_data(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
-        uint32_t size)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        if (!IS_MCTP_CAPABLE(vha->hw))
-                return QLA_FUNCTION_FAILED;
-
-        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x114f,
-            "Entered %s.\n", __func__);
-
-        mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;
-        mcp->mb[1] = LSW(addr);
-        mcp->mb[2] = MSW(req_dma);
-        mcp->mb[3] = LSW(req_dma);
-        mcp->mb[4] = MSW(size);
-        mcp->mb[5] = LSW(size);
-        mcp->mb[6] = MSW(MSD(req_dma));
-        mcp->mb[7] = LSW(MSD(req_dma));
-        mcp->mb[8] = MSW(addr);
-        /* Setting RAM ID to valid */
-        mcp->mb[10] |= BIT_7;
-        /* For MCTP RAM ID is 0x40 */
-        mcp->mb[10] |= 0x40;
-
-        mcp->out_mb |= MBX_10|MBX_8|MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|
-            MBX_0;
-
-        mcp->in_mb = MBX_0;
-        mcp->tov = MBX_TOV_SECONDS;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(vha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x114e,
-                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
-        } else {
-                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x114d,
-                    "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx, vha, 0x100b, "Done %s.\n", __func__);
         }
 
         return rval;
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 20fd974f903..f488cc69fc7 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -1,12 +1,11 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
 #include "qla_gbl.h"
-#include "qla_target.h"
 
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
@@ -50,9 +49,6 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
 
         spin_lock_irqsave(&ha->vport_slock, flags);
         list_add_tail(&vha->list, &ha->vp_list);
-
-        qlt_update_vp_map(vha, SET_VP_IDX);
-
         spin_unlock_irqrestore(&ha->vport_slock, flags);
 
         mutex_unlock(&ha->vport_lock);
@@ -83,7 +79,6 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
                 spin_lock_irqsave(&ha->vport_slock, flags);
         }
         list_del(&vha->list);
-        qlt_update_vp_map(vha, RESET_VP_IDX);
         spin_unlock_irqrestore(&ha->vport_slock, flags);
 
         vp_id = vha->vp_idx;
@@ -139,7 +134,7 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha)
         list_for_each_entry(fcport, &vha->vp_fcports, list) {
                 ql_dbg(ql_dbg_vport, vha, 0xa001,
                     "Marking port dead, loop_id=0x%04x : %x.\n",
-                    fcport->loop_id, fcport->vha->vp_idx);
+                    fcport->loop_id, fcport->vp_idx);
 
                 qla2x00_mark_device_lost(vha, fcport, 0, 0);
                 qla2x00_set_fcport_state(fcport, FCS_UNCONFIGURED);
@@ -149,18 +144,12 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha)
 int
 qla24xx_disable_vp(scsi_qla_host_t *vha)
 {
-        unsigned long flags;
         int ret;
 
         ret = qla24xx_control_vp(vha, VCE_COMMAND_DISABLE_VPS_LOGO_ALL);
         atomic_set(&vha->loop_state, LOOP_DOWN);
         atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 
-        /* Remove port id from vp target map */
-        spin_lock_irqsave(&vha->hw->vport_slock, flags);
-        qlt_update_vp_map(vha, RESET_AL_PA);
-        spin_unlock_irqrestore(&vha->hw->vport_slock, flags);
-
         qla2x00_mark_vp_devices_dead(vha);
         atomic_set(&vha->vp_state, VP_FAILED);
         vha->flags.management_server_logged_in = 0;
@@ -306,8 +295,10 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 static int
 qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
 {
-        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
-            "Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);
+        ql_dbg(ql_dbg_dpc, vha, 0x4012,
+            "Entering %s.\n", __func__);
+        ql_dbg(ql_dbg_dpc, vha, 0x4013,
+            "vp_flags: 0x%lx.\n", vha->vp_flags);
 
         qla2x00_do_work(vha);
 
@@ -357,7 +348,7 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
                 }
         }
 
-        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x401c,
+        ql_dbg(ql_dbg_dpc, vha, 0x401c,
             "Exiting %s.\n", __func__);
         return 0;
 }
@@ -479,6 +470,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 
         vha->req = base_vha->req;
         host->can_queue = base_vha->req->length + 128;
+        host->this_id = 255;
         host->cmd_per_lun = 3;
         if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif)
                 host->max_cmd_len = 32;
@@ -487,7 +479,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         host->max_channel = MAX_BUSES - 1;
         host->max_lun = ql2xmaxlun;
         host->unique_id = host->host_no;
-        host->max_id = ha->max_fibre_devices;
+        host->max_id = MAX_TARGETS_2200;
         host->transportt = qla2xxx_transport_vport_template;
 
         ql_dbg(ql_dbg_vport, vha, 0xa007,
@@ -645,7 +637,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
                         &req->dma, GFP_KERNEL);
         if (req->ring == NULL) {
                 ql_log(ql_log_fatal, base_vha, 0x00da,
-                    "Failed to allocate memory for request_ring.\n");
+                    "Failed to allocte memory for request_ring.\n");
                 goto que_failed;
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 3e3f593bada..049807cda41 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1,14 +1,12 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/ratelimit.h>
-#include <linux/vmalloc.h>
 #include <scsi/scsi_tcq.h>
 
 #define MASK(n)                 ((1ULL<<(n))-1)
@@ -36,7 +34,7 @@
 
 #define MAX_CRB_XFORM 60
 static unsigned long crb_addr_xform[MAX_CRB_XFORM];
-static int qla82xx_crb_table_initialized;
+int qla82xx_crb_table_initialized;
 
 #define qla82xx_crb_addr_transform(name) \
         (crb_addr_xform[QLA82XX_HW_PX_MAP_CRB_##name] = \
@@ -102,7 +100,7 @@ static void qla82xx_crb_addr_transform_setup(void)
         qla82xx_crb_table_initialized = 1;
 }
 
-static struct crb_128M_2M_block_map crb_128M_2M_map[64] = {
+struct crb_128M_2M_block_map crb_128M_2M_map[64] = {
         {{{0, 0,         0,         0} } },
         {{{1, 0x0100000, 0x0102000, 0x120000},
         {1, 0x0110000, 0x0120000, 0x130000},
@@ -262,7 +260,7 @@ static struct crb_128M_2M_block_map crb_128M_2M_map[64] = {
 /*
  * top 12 bits of crb internal address (hub, agent)
  */
-static unsigned qla82xx_crb_hub_agt[64] = {
+unsigned qla82xx_crb_hub_agt[64] = {
         0,
         QLA82XX_HW_CRB_HUB_AGT_ADR_PS,
         QLA82XX_HW_CRB_HUB_AGT_ADR_MN,
@@ -330,7 +328,7 @@ static unsigned qla82xx_crb_hub_agt[64] = {
 };
 
 /* Device states */
-static char *q_dev_state[] = {
+char *qdev_state[] = {
          "Unknown",
         "Cold",
         "Initializing",
@@ -341,11 +339,6 @@ static char *q_dev_state[] = {
         "Quiescent",
 };
 
-char *qdev_state(uint32_t dev_state)
-{
-        return q_dev_state[dev_state];
-}
-
 /*
  * In: 'off' is offset from CRB space in 128M pci map
  * Out: 'off' is 2M pci map addr
@@ -359,18 +352,17 @@ qla82xx_pci_set_crbwindow_2M(struct qla_hw_data *ha, ulong *off)
 
         ha->crb_win = CRB_HI(*off);
         writel(ha->crb_win,
-                (void __iomem *)(CRB_WINDOW_2M + ha->nx_pcibase));
+                (void *)(CRB_WINDOW_2M + ha->nx_pcibase));
 
         /* Read back value to make sure write has gone through before trying
          * to use it.
          */
-        win_read = RD_REG_DWORD((void __iomem *)
-            (CRB_WINDOW_2M + ha->nx_pcibase));
+        win_read = RD_REG_DWORD((void *)(CRB_WINDOW_2M + ha->nx_pcibase));
         if (win_read != ha->crb_win) {
                 ql_dbg(ql_dbg_p3p, vha, 0xb000,
                     "%s: Written crbwin (0x%x) "
                     "!= Read crbwin (0x%x), off=0x%lx.\n",
-                    __func__, ha->crb_win, win_read, *off);
+                    ha->crb_win, win_read, *off);
         }
         *off = (*off & MASK(16)) + CRB_INDIRECT_2M + ha->nx_pcibase;
 }
@@ -410,7 +402,7 @@ qla82xx_pci_set_crbwindow(struct qla_hw_data *ha, u64 off)
         }
         /* strange address given */
         ql_dbg(ql_dbg_p3p, vha, 0xb001,
-            "%s: Warning: unm_nic_pci_set_crbwindow "
+            "%x: Warning: unm_nic_pci_set_crbwindow "
             "called with an unknown address(%llx).\n",
             QLA2XXX_DRIVER_NAME, off);
         return off;
@@ -568,7 +560,7 @@ qla82xx_pci_mem_bound_check(struct qla_hw_data *ha,
                 return 1;
 }
 
-static int qla82xx_pci_set_window_warning_count;
+int qla82xx_pci_set_window_warning_count;
 
 static unsigned long
 qla82xx_pci_set_window(struct qla_hw_data *ha, unsigned long long addr)
@@ -678,10 +670,10 @@ static int qla82xx_pci_mem_read_direct(struct qla_hw_data *ha,
         u64 off, void *data, int size)
 {
         unsigned long   flags;
-        void __iomem *addr = NULL;
+        void           *addr = NULL;
         int             ret = 0;
         u64             start;
-        uint8_t __iomem  *mem_ptr = NULL;
+        uint8_t         *mem_ptr = NULL;
         unsigned long   mem_base;
         unsigned long   mem_page;
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
@@ -713,7 +705,7 @@ static int qla82xx_pci_mem_read_direct(struct qla_hw_data *ha,
                 mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE * 2);
         else
                 mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
-        if (mem_ptr == NULL) {
+        if (mem_ptr == 0UL) {
                 *(u8  *)data = 0;
                 return -1;
         }
@@ -750,10 +742,10 @@ qla82xx_pci_mem_write_direct(struct qla_hw_data *ha,
         u64 off, void *data, int size)
 {
         unsigned long   flags;
-        void  __iomem *addr = NULL;
+        void           *addr = NULL;
         int             ret = 0;
         u64             start;
-        uint8_t __iomem *mem_ptr = NULL;
+        uint8_t         *mem_ptr = NULL;
         unsigned long   mem_base;
         unsigned long   mem_page;
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
@@ -785,7 +777,7 @@ qla82xx_pci_mem_write_direct(struct qla_hw_data *ha,
                 mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE*2);
         else
                 mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
-        if (mem_ptr == NULL)
+        if (mem_ptr == 0UL)
                 return -1;
 
         addr = mem_ptr;
@@ -910,36 +902,26 @@ qla82xx_wait_rom_done(struct qla_hw_data *ha)
 }
 
 static 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 __iomem *)(CRB_WINDOW_2M + ha->nx_pcibase),
-            (off & 0xFFFF0000));
-
-        /* Read back value to make sure write has gone through */
-        RD_REG_DWORD((void __iomem *)(CRB_WINDOW_2M + ha->nx_pcibase));
-        off_value  = (off & 0x0000FFFF);
-
-        if (flag)
-                WRT_REG_DWORD((void __iomem *)
-                    (off_value + CRB_INDIRECT_2M + ha->nx_pcibase),
-                    data);
-        else
-                rval = RD_REG_DWORD((void __iomem *)
-                    (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)
 {
-        /* 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);
+        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
+        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;
 }
 
@@ -956,7 +938,7 @@ qla82xx_rom_fast_read(struct qla_hw_data *ha, int addr, int *valp)
         }
         if (loops >= 50000) {
                 ql_log(ql_log_fatal, vha, 0x00b9,
-                    "Failed to acquire SEM2 lock.\n");
+                    "Failed to aquire SEM2 lock.\n");
                 return -1;
         }
         ret = qla82xx_do_rom_fast_read(ha, addr, valp);
@@ -1066,7 +1048,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)
                     "ROM lock failed.\n");
                 return -1;
         }
-        return 0;
+        return 0;;
 }
 
 static int
@@ -1123,7 +1105,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
                 long data;
         };
 
-        /* Halt all the individual PEGs and other blocks of the ISP */
+        /* Halt all the indiviual PEGs and other blocks of the ISP */
         qla82xx_rom_lock(ha);
 
         /* disable all I2Q */
@@ -1176,6 +1158,19 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
                 qla82xx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xfeffffff);
         else
                 qla82xx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xffffffff);
+
+        /* reset ms */
+        val = qla82xx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
+        val |= (1 << 1);
+        qla82xx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
+        msleep(20);
+
+        /* unreset ms */
+        val = qla82xx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
+        val &= ~(1 << 1);
+        qla82xx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
+        msleep(20);
+
         qla82xx_rom_unlock(ha);
 
         /* Read the signature value from the flash.
@@ -1191,12 +1186,12 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
         }
 
         /* Offset in flash = lower 16 bits
-         * Number of entries = upper 16 bits
+         * Number of enteries = upper 16 bits
          */
         offset = n & 0xffffU;
         n = (n >> 16) & 0xffffU;
 
-        /* number of addr/value pair should not exceed 1024 entries */
+        /* number of addr/value pair should not exceed 1024 enteries */
         if (n  >= 1024) {
                 ql_log(ql_log_fatal, vha, 0x0071,
                     "Card flash not initialized:n=0x%x.\n", n);
@@ -1613,6 +1608,25 @@ qla82xx_get_fw_offs(struct qla_hw_data *ha)
 }
 
 /* PCI related functions */
+char *
+qla82xx_pci_info_str(struct scsi_qla_host *vha, char *str)
+{
+        int pcie_reg;
+        struct qla_hw_data *ha = vha->hw;
+        char lwstr[6];
+        uint16_t lnk;
+
+        pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP);
+        pci_read_config_word(ha->pdev, pcie_reg + PCI_EXP_LNKSTA, &lnk);
+        ha->link_width = (lnk >> 4) & 0x3f;
+
+        strcpy(str, "PCIe (");
+        strcat(str, "2.5Gb/s ");
+        snprintf(lwstr, sizeof(lwstr), "x%d)", ha->link_width);
+        strcat(str, lwstr);
+        return str;
+}
+
 int qla82xx_pci_region_offset(struct pci_dev *pdev, int region)
 {
         unsigned long val = 0;
@@ -1655,6 +1669,7 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
         if (!ha->nx_pcibase) {
                 ql_log_pci(ql_log_fatal, ha->pdev, 0x000e,
                     "Cannot remap pcibase MMIO, aborting.\n");
+                pci_release_regions(ha->pdev);
                 goto iospace_error_exit;
         }
 
@@ -1669,6 +1684,7 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
                 if (!ha->nxdb_wr_ptr) {
                         ql_log_pci(ql_log_fatal, ha->pdev, 0x000f,
                             "Cannot remap MMIO, aborting.\n");
+                        pci_release_regions(ha->pdev);
                         goto iospace_error_exit;
                 }
 
@@ -1688,12 +1704,12 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
         ql_dbg_pci(ql_dbg_multiq, ha->pdev, 0xc006,
             "nx_pci_base=%p iobase=%p "
             "max_req_queues=%d msix_count=%d.\n",
-            (void *)ha->nx_pcibase, ha->iobase,
+            ha->nx_pcibase, ha->iobase,
             ha->max_req_queues, ha->msix_count);
         ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0010,
             "nx_pci_base=%p iobase=%p "
             "max_req_queues=%d msix_count=%d.\n",
-            (void *)ha->nx_pcibase, ha->iobase,
+            ha->nx_pcibase, ha->iobase,
             ha->max_req_queues, ha->msix_count);
         return 0;
 
@@ -1721,7 +1737,7 @@ qla82xx_pci_config(scsi_qla_host_t *vha)
         ret = pci_set_mwi(ha->pdev);
         ha->chip_revision = ha->pdev->revision;
         ql_dbg(ql_dbg_init, vha, 0x0043,
-            "Chip revision:%d.\n",
+            "Chip revision:%ld.\n",
             ha->chip_revision);
         return 0;
 }
@@ -1763,6 +1779,14 @@ void qla82xx_config_rings(struct scsi_qla_host *vha)
         WRT_REG_DWORD((unsigned long  __iomem *)&reg->rsp_q_out[0], 0);
 }
 
+void qla82xx_reset_adapter(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        vha->flags.online = 0;
+        qla2x00_try_to_stop_firmware(vha);
+        ha->isp_ops->disable_intrs(ha);
+}
+
 static int
 qla82xx_fw_load_from_blob(struct qla_hw_data *ha)
 {
@@ -1847,7 +1871,7 @@ qla82xx_set_product_offset(struct qla_hw_data *ha)
         return -1;
 }
 
-static int
+int
 qla82xx_validate_firmware_blob(scsi_qla_host_t *vha, uint8_t fw_type)
 {
         __le32 val;
@@ -1952,6 +1976,20 @@ qla82xx_check_rcvpeg_state(struct qla_hw_data *ha)
 }
 
 /* ISR related functions */
+uint32_t qla82xx_isr_int_target_mask_enable[8] = {
+        ISR_INT_TARGET_MASK, ISR_INT_TARGET_MASK_F1,
+        ISR_INT_TARGET_MASK_F2, ISR_INT_TARGET_MASK_F3,
+        ISR_INT_TARGET_MASK_F4, ISR_INT_TARGET_MASK_F5,
+        ISR_INT_TARGET_MASK_F7, ISR_INT_TARGET_MASK_F7
+};
+
+uint32_t qla82xx_isr_int_target_status[8] = {
+        ISR_INT_TARGET_STATUS, ISR_INT_TARGET_STATUS_F1,
+        ISR_INT_TARGET_STATUS_F2, ISR_INT_TARGET_STATUS_F3,
+        ISR_INT_TARGET_STATUS_F4, ISR_INT_TARGET_STATUS_F5,
+        ISR_INT_TARGET_STATUS_F7, ISR_INT_TARGET_STATUS_F7
+};
+
 static struct qla82xx_legacy_intr_set legacy_intr[] = \
         QLA82XX_LEGACY_INTR_CONFIG;
 
@@ -1978,9 +2016,13 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
                 wptr++;
         }
 
-        if (!ha->mcp)
+        if (ha->mcp) {
+                ql_dbg(ql_dbg_async, vha, 0x5052,
+                    "Got mailbox completion. cmd=%x.\n", ha->mcp->mb[0]);
+        } else {
                 ql_dbg(ql_dbg_async, vha, 0x5053,
                     "MBX pointer ERROR.\n");
+        }
 }
 
 /*
@@ -2008,8 +2050,8 @@ qla82xx_intr_handler(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0xb053,
-                    "%s: NULL response queue pointer.\n", __func__);
+                printk(KERN_INFO
+                        "%s(): NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
         ha = rsp->hw;
@@ -2280,29 +2322,6 @@ void qla82xx_init_flags(struct qla_hw_data *ha)
 }
 
 inline void
-qla82xx_set_idc_version(scsi_qla_host_t *vha)
-{
-        int idc_ver;
-        uint32_t drv_active;
-        struct qla_hw_data *ha = vha->hw;
-
-        drv_active = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
-        if (drv_active == (QLA82XX_DRV_ACTIVE << (ha->portnum * 4))) {
-                qla82xx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION,
-                    QLA82XX_IDC_VERSION);
-                ql_log(ql_log_info, vha, 0xb082,
-                    "IDC version updated to %d\n", QLA82XX_IDC_VERSION);
-        } else {
-                idc_ver = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_IDC_VERSION);
-                if (idc_ver != QLA82XX_IDC_VERSION)
-                        ql_log(ql_log_info, vha, 0xb083,
-                            "qla2xxx driver IDC version %d is not compatible "
-                            "with IDC version %d of the other drivers\n",
-                            QLA82XX_IDC_VERSION, idc_ver);
-        }
-}
-
-inline void
 qla82xx_set_drv_active(scsi_qla_host_t *vha)
 {
         uint32_t drv_active;
@@ -2336,13 +2355,9 @@ qla82xx_need_reset(struct qla_hw_data *ha)
         uint32_t drv_state;
         int rval;
 
-        if (ha->flags.nic_core_reset_owner)
-                return 1;
-        else {
-                drv_state = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
-                rval = drv_state & (QLA82XX_DRVST_RST_RDY << (ha->portnum * 4));
-                return rval;
-        }
+        drv_state = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
+        rval = drv_state & (QLA82XX_DRVST_RST_RDY << (ha->portnum * 4));
+        return rval;
 }
 
 static inline void
@@ -2359,8 +2374,8 @@ qla82xx_set_rst_ready(struct qla_hw_data *ha)
                 drv_state = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
         }
         drv_state |= (QLA82XX_DRVST_RST_RDY << (ha->portnum * 4));
-        ql_dbg(ql_dbg_init, vha, 0x00bb,
-            "drv_state = 0x%08x.\n", drv_state);
+        ql_log(ql_log_info, vha, 0x00bb,
+            "drv_state = 0x%x.\n", drv_state);
         qla82xx_wr_32(ha, QLA82XX_CRB_DRV_STATE, drv_state);
 }
 
@@ -2427,7 +2442,7 @@ qla82xx_load_fw(scsi_qla_host_t *vha)
 
         if (qla82xx_fw_load_from_flash(ha) == QLA_SUCCESS) {
                 ql_log(ql_log_info, vha, 0x00a1,
-                    "Firmware loaded successfully from flash.\n");
+                    "Firmware loaded successully from flash.\n");
                 return QLA_SUCCESS;
         } else {
                 ql_log(ql_log_warn, vha, 0x0108,
@@ -2442,7 +2457,7 @@ try_blob_fw:
         blob = ha->hablob = qla2x00_request_firmware(vha);
         if (!blob) {
                 ql_log(ql_log_fatal, vha, 0x00a3,
-                    "Firmware image not present.\n");
+                    "Firmware image not preset.\n");
                 goto fw_load_failed;
         }
 
@@ -2478,6 +2493,7 @@ fw_load_failed:
 int
 qla82xx_start_firmware(scsi_qla_host_t *vha)
 {
+        int           pcie_cap;
         uint16_t      lnk;
         struct qla_hw_data *ha = vha->hw;
 
@@ -2508,13 +2524,492 @@ qla82xx_start_firmware(scsi_qla_host_t *vha)
         }
 
         /* Negotiated Link width */
-        pcie_capability_read_word(ha->pdev, PCI_EXP_LNKSTA, &lnk);
+        pcie_cap = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP);
+        pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk);
         ha->link_width = (lnk >> 4) & 0x3f;
 
         /* Synchronize with Receive peg */
         return qla82xx_check_rcvpeg_state(ha);
 }
 
+static inline int
+qla2xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,
+        uint16_t tot_dsds)
+{
+        uint32_t *cur_dsd = NULL;
+        scsi_qla_host_t *vha;
+        struct qla_hw_data *ha;
+        struct scsi_cmnd *cmd;
+        struct  scatterlist *cur_seg;
+        uint32_t *dsd_seg;
+        void *next_dsd;
+        uint8_t avail_dsds;
+        uint8_t first_iocb = 1;
+        uint32_t dsd_list_len;
+        struct dsd_dma *dsd_ptr;
+        struct ct6_dsd *ctx;
+
+        cmd = sp->cmd;
+
+        /* Update entry type to indicate Command Type 3 IOCB */
+        *((uint32_t *)(&cmd_pkt->entry_type)) =
+                __constant_cpu_to_le32(COMMAND_TYPE_6);
+
+        /* No data transfer */
+        if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {
+                cmd_pkt->byte_count = __constant_cpu_to_le32(0);
+                return 0;
+        }
+
+        vha = sp->fcport->vha;
+        ha = vha->hw;
+
+        /* Set transfer direction */
+        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
+                cmd_pkt->control_flags =
+                    __constant_cpu_to_le16(CF_WRITE_DATA);
+                ha->qla_stats.output_bytes += scsi_bufflen(cmd);
+        } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
+                cmd_pkt->control_flags =
+                    __constant_cpu_to_le16(CF_READ_DATA);
+                ha->qla_stats.input_bytes += scsi_bufflen(cmd);
+        }
+
+        cur_seg = scsi_sglist(cmd);
+        ctx = sp->ctx;
+
+        while (tot_dsds) {
+                avail_dsds = (tot_dsds > QLA_DSDS_PER_IOCB) ?
+                    QLA_DSDS_PER_IOCB : tot_dsds;
+                tot_dsds -= avail_dsds;
+                dsd_list_len = (avail_dsds + 1) * QLA_DSD_SIZE;
+
+                dsd_ptr = list_first_entry(&ha->gbl_dsd_list,
+                    struct dsd_dma, list);
+                next_dsd = dsd_ptr->dsd_addr;
+                list_del(&dsd_ptr->list);
+                ha->gbl_dsd_avail--;
+                list_add_tail(&dsd_ptr->list, &ctx->dsd_list);
+                ctx->dsd_use_cnt++;
+                ha->gbl_dsd_inuse++;
+
+                if (first_iocb) {
+                        first_iocb = 0;
+                        dsd_seg = (uint32_t *)&cmd_pkt->fcp_data_dseg_address;
+                        *dsd_seg++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));
+                        *dsd_seg++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));
+                        *dsd_seg++ = cpu_to_le32(dsd_list_len);
+                } else {
+                        *cur_dsd++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));
+                        *cur_dsd++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));
+                        *cur_dsd++ = cpu_to_le32(dsd_list_len);
+                }
+                cur_dsd = (uint32_t *)next_dsd;
+                while (avail_dsds) {
+                        dma_addr_t      sle_dma;
+
+                        sle_dma = sg_dma_address(cur_seg);
+                        *cur_dsd++ = cpu_to_le32(LSD(sle_dma));
+                        *cur_dsd++ = cpu_to_le32(MSD(sle_dma));
+                        *cur_dsd++ = cpu_to_le32(sg_dma_len(cur_seg));
+                        cur_seg = sg_next(cur_seg);
+                        avail_dsds--;
+                }
+        }
+
+        /* Null termination */
+        *cur_dsd++ =  0;
+        *cur_dsd++ = 0;
+        *cur_dsd++ = 0;
+        cmd_pkt->control_flags |= CF_DATA_SEG_DESCR_ENABLE;
+        return 0;
+}
+
+/*
+ * qla82xx_calc_dsd_lists() - Determine number of DSD list required
+ * for Command Type 6.
+ *
+ * @dsds: number of data segment decriptors needed
+ *
+ * Returns the number of dsd list needed to store @dsds.
+ */
+inline uint16_t
+qla82xx_calc_dsd_lists(uint16_t dsds)
+{
+        uint16_t dsd_lists = 0;
+
+        dsd_lists = (dsds/QLA_DSDS_PER_IOCB);
+        if (dsds % QLA_DSDS_PER_IOCB)
+                dsd_lists++;
+        return dsd_lists;
+}
+
+/*
+ * qla82xx_start_scsi() - Send a SCSI command to the ISP
+ * @sp: command to send to the ISP
+ *
+ * Returns non-zero if a failure occurred, else zero.
+ */
+int
+qla82xx_start_scsi(srb_t *sp)
+{
+        int             ret, nseg;
+        unsigned long   flags;
+        struct scsi_cmnd *cmd;
+        uint32_t        *clr_ptr;
+        uint32_t        index;
+        uint32_t        handle;
+        uint16_t        cnt;
+        uint16_t        req_cnt;
+        uint16_t        tot_dsds;
+        struct device_reg_82xx __iomem *reg;
+        uint32_t dbval;
+        uint32_t *fcp_dl;
+        uint8_t additional_cdb_len;
+        struct ct6_dsd *ctx;
+        struct scsi_qla_host *vha = sp->fcport->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct req_que *req = NULL;
+        struct rsp_que *rsp = NULL;
+        char            tag[2];
+
+        /* Setup device pointers. */
+        ret = 0;
+        reg = &ha->iobase->isp82;
+        cmd = sp->cmd;
+        req = vha->req;
+        rsp = ha->rsp_q_map[0];
+
+        /* So we know we haven't pci_map'ed anything yet */
+        tot_dsds = 0;
+
+        dbval = 0x04 | (ha->portnum << 5);
+
+        /* Send marker if required */
+        if (vha->marker_needed != 0) {
+                if (qla2x00_marker(vha, req,
+                        rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {
+                        ql_log(ql_log_warn, vha, 0x300c,
+                            "qla2x00_marker failed for cmd=%p.\n", cmd);
+                        return QLA_FUNCTION_FAILED;
+                }
+                vha->marker_needed = 0;
+        }
+
+        /* Acquire ring specific lock */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        /* Check for room in outstanding command list. */
+        handle = req->current_outstanding_cmd;
+        for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
+                handle++;
+                if (handle == MAX_OUTSTANDING_COMMANDS)
+                        handle = 1;
+                if (!req->outstanding_cmds[handle])
+                        break;
+        }
+        if (index == MAX_OUTSTANDING_COMMANDS)
+                goto queuing_error;
+
+        /* Map the sg table so we have an accurate count of sg entries needed */
+        if (scsi_sg_count(cmd)) {
+                nseg = dma_map_sg(&ha->pdev->dev, scsi_sglist(cmd),
+                    scsi_sg_count(cmd), cmd->sc_data_direction);
+                if (unlikely(!nseg))
+                        goto queuing_error;
+        } else
+                nseg = 0;
+
+        tot_dsds = nseg;
+
+        if (tot_dsds > ql2xshiftctondsd) {
+                struct cmd_type_6 *cmd_pkt;
+                uint16_t more_dsd_lists = 0;
+                struct dsd_dma *dsd_ptr;
+                uint16_t i;
+
+                more_dsd_lists = qla82xx_calc_dsd_lists(tot_dsds);
+                if ((more_dsd_lists + ha->gbl_dsd_inuse) >= NUM_DSD_CHAIN) {
+                        ql_dbg(ql_dbg_io, vha, 0x300d,
+                            "Num of DSD list %d is than %d for cmd=%p.\n",
+                            more_dsd_lists + ha->gbl_dsd_inuse, NUM_DSD_CHAIN,
+                            cmd);
+                        goto queuing_error;
+                }
+
+                if (more_dsd_lists <= ha->gbl_dsd_avail)
+                        goto sufficient_dsds;
+                else
+                        more_dsd_lists -= ha->gbl_dsd_avail;
+
+                for (i = 0; i < more_dsd_lists; i++) {
+                        dsd_ptr = kzalloc(sizeof(struct dsd_dma), GFP_ATOMIC);
+                        if (!dsd_ptr) {
+                                ql_log(ql_log_fatal, vha, 0x300e,
+                                    "Failed to allocate memory for dsd_dma "
+                                    "for cmd=%p.\n", cmd);
+                                goto queuing_error;
+                        }
+
+                        dsd_ptr->dsd_addr = dma_pool_alloc(ha->dl_dma_pool,
+                                GFP_ATOMIC, &dsd_ptr->dsd_list_dma);
+                        if (!dsd_ptr->dsd_addr) {
+                                kfree(dsd_ptr);
+                                ql_log(ql_log_fatal, vha, 0x300f,
+                                    "Failed to allocate memory for dsd_addr "
+                                    "for cmd=%p.\n", cmd);
+                                goto queuing_error;
+                        }
+                        list_add_tail(&dsd_ptr->list, &ha->gbl_dsd_list);
+                        ha->gbl_dsd_avail++;
+                }
+
+sufficient_dsds:
+                req_cnt = 1;
+
+                if (req->cnt < (req_cnt + 2)) {
+                        cnt = (uint16_t)RD_REG_DWORD_RELAXED(
+                                &reg->req_q_out[0]);
+                        if (req->ring_index < cnt)
+                                req->cnt = cnt - req->ring_index;
+                        else
+                                req->cnt = req->length -
+                                        (req->ring_index - cnt);
+                }
+
+                if (req->cnt < (req_cnt + 2))
+                        goto queuing_error;
+
+                ctx = sp->ctx = mempool_alloc(ha->ctx_mempool, GFP_ATOMIC);
+                if (!sp->ctx) {
+                        ql_log(ql_log_fatal, vha, 0x3010,
+                            "Failed to allocate ctx for cmd=%p.\n", cmd);
+                        goto queuing_error;
+                }
+                memset(ctx, 0, sizeof(struct ct6_dsd));
+                ctx->fcp_cmnd = dma_pool_alloc(ha->fcp_cmnd_dma_pool,
+                        GFP_ATOMIC, &ctx->fcp_cmnd_dma);
+                if (!ctx->fcp_cmnd) {
+                        ql_log(ql_log_fatal, vha, 0x3011,
+                            "Failed to allocate fcp_cmnd for cmd=%p.\n", cmd);
+                        goto queuing_error_fcp_cmnd;
+                }
+
+                /* Initialize the DSD list and dma handle */
+                INIT_LIST_HEAD(&ctx->dsd_list);
+                ctx->dsd_use_cnt = 0;
+
+                if (cmd->cmd_len > 16) {
+                        additional_cdb_len = cmd->cmd_len - 16;
+                        if ((cmd->cmd_len % 4) != 0) {
+                                /* SCSI command bigger than 16 bytes must be
+                                 * multiple of 4
+                                 */
+                                ql_log(ql_log_warn, vha, 0x3012,
+                                    "scsi cmd len %d not multiple of 4 "
+                                    "for cmd=%p.\n", cmd->cmd_len, cmd);
+                                goto queuing_error_fcp_cmnd;
+                        }
+                        ctx->fcp_cmnd_len = 12 + cmd->cmd_len + 4;
+                } else {
+                        additional_cdb_len = 0;
+                        ctx->fcp_cmnd_len = 12 + 16 + 4;
+                }
+
+                cmd_pkt = (struct cmd_type_6 *)req->ring_ptr;
+                cmd_pkt->handle = MAKE_HANDLE(req->id, handle);
+
+                /* Zero out remaining portion of packet. */
+                /*    tagged queuing modifier -- default is TSK_SIMPLE (0). */
+                clr_ptr = (uint32_t *)cmd_pkt + 2;
+                memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
+                cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
+
+                /* Set NPORT-ID and LUN number*/
+                cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id);
+                cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
+                cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
+                cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
+                cmd_pkt->vp_index = sp->fcport->vp_idx;
+
+                /* Build IOCB segments */
+                if (qla2xx_build_scsi_type_6_iocbs(sp, cmd_pkt, tot_dsds))
+                        goto queuing_error_fcp_cmnd;
+
+                int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
+                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
+
+                /* build FCP_CMND IU */
+                memset(ctx->fcp_cmnd, 0, sizeof(struct fcp_cmnd));
+                int_to_scsilun(sp->cmd->device->lun, &ctx->fcp_cmnd->lun);
+                ctx->fcp_cmnd->additional_cdb_len = additional_cdb_len;
+
+                if (cmd->sc_data_direction == DMA_TO_DEVICE)
+                        ctx->fcp_cmnd->additional_cdb_len |= 1;
+                else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
+                        ctx->fcp_cmnd->additional_cdb_len |= 2;
+
+                /*
+                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
+                 */
+                if (scsi_populate_tag_msg(cmd, tag)) {
+                        switch (tag[0]) {
+                        case HEAD_OF_QUEUE_TAG:
+                                ctx->fcp_cmnd->task_attribute =
+                                    TSK_HEAD_OF_QUEUE;
+                                break;
+                        case ORDERED_QUEUE_TAG:
+                                ctx->fcp_cmnd->task_attribute =
+                                    TSK_ORDERED;
+                                break;
+                        }
+                }
+
+                memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
+
+                fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +
+                    additional_cdb_len);
+                *fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));
+
+                cmd_pkt->fcp_cmnd_dseg_len = cpu_to_le16(ctx->fcp_cmnd_len);
+                cmd_pkt->fcp_cmnd_dseg_address[0] =
+                    cpu_to_le32(LSD(ctx->fcp_cmnd_dma));
+                cmd_pkt->fcp_cmnd_dseg_address[1] =
+                    cpu_to_le32(MSD(ctx->fcp_cmnd_dma));
+
+                sp->flags |= SRB_FCP_CMND_DMA_VALID;
+                cmd_pkt->byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));
+                /* Set total data segment count. */
+                cmd_pkt->entry_count = (uint8_t)req_cnt;
+                /* Specify response queue number where
+                 * completion should happen
+                 */
+                cmd_pkt->entry_status = (uint8_t) rsp->id;
+        } else {
+                struct cmd_type_7 *cmd_pkt;
+                req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
+                if (req->cnt < (req_cnt + 2)) {
+                        cnt = (uint16_t)RD_REG_DWORD_RELAXED(
+                            &reg->req_q_out[0]);
+                        if (req->ring_index < cnt)
+                                req->cnt = cnt - req->ring_index;
+                        else
+                                req->cnt = req->length -
+                                        (req->ring_index - cnt);
+                }
+                if (req->cnt < (req_cnt + 2))
+                        goto queuing_error;
+
+                cmd_pkt = (struct cmd_type_7 *)req->ring_ptr;
+                cmd_pkt->handle = MAKE_HANDLE(req->id, handle);
+
+                /* Zero out remaining portion of packet. */
+                /* tagged queuing modifier -- default is TSK_SIMPLE (0).*/
+                clr_ptr = (uint32_t *)cmd_pkt + 2;
+                memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
+                cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
+
+                /* Set NPORT-ID and LUN number*/
+                cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id);
+                cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
+                cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
+                cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
+                cmd_pkt->vp_index = sp->fcport->vp_idx;
+
+                int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
+                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun,
+                        sizeof(cmd_pkt->lun));
+
+                /*
+                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
+                 */
+                if (scsi_populate_tag_msg(cmd, tag)) {
+                        switch (tag[0]) {
+                        case HEAD_OF_QUEUE_TAG:
+                                cmd_pkt->task = TSK_HEAD_OF_QUEUE;
+                                break;
+                        case ORDERED_QUEUE_TAG:
+                                cmd_pkt->task = TSK_ORDERED;
+                                break;
+                        }
+                }
+
+                /* Load SCSI command packet. */
+                memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
+                host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb));
+
+                cmd_pkt->byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));
+
+                /* Build IOCB segments */
+                qla24xx_build_scsi_iocbs(sp, cmd_pkt, tot_dsds);
+
+                /* Set total data segment count. */
+                cmd_pkt->entry_count = (uint8_t)req_cnt;
+                /* Specify response queue number where
+                 * completion should happen.
+                 */
+                cmd_pkt->entry_status = (uint8_t) rsp->id;
+
+        }
+        /* Build command packet. */
+        req->current_outstanding_cmd = handle;
+        req->outstanding_cmds[handle] = sp;
+        sp->handle = handle;
+        sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
+        req->cnt -= req_cnt;
+        wmb();
+
+        /* Adjust ring index. */
+        req->ring_index++;
+        if (req->ring_index == req->length) {
+                req->ring_index = 0;
+                req->ring_ptr = req->ring;
+        } else
+                req->ring_ptr++;
+
+        sp->flags |= SRB_DMA_VALID;
+
+        /* Set chip new ring index. */
+        /* write, read and verify logic */
+        dbval = dbval | (req->id << 8) | (req->ring_index << 16);
+        if (ql2xdbwr)
+                qla82xx_wr_32(ha, ha->nxdb_wr_ptr, dbval);
+        else {
+                WRT_REG_DWORD(
+                        (unsigned long __iomem *)ha->nxdb_wr_ptr,
+                        dbval);
+                wmb();
+                while (RD_REG_DWORD(ha->nxdb_rd_ptr) != dbval) {
+                        WRT_REG_DWORD(
+                                (unsigned long __iomem *)ha->nxdb_wr_ptr,
+                                dbval);
+                        wmb();
+                }
+        }
+
+        /* Manage unprocessed RIO/ZIO commands in response queue. */
+        if (vha->flags.process_response_queue &&
+            rsp->ring_ptr->signature != RESPONSE_PROCESSED)
+                qla24xx_process_response_queue(vha, rsp);
+
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        return QLA_SUCCESS;
+
+queuing_error_fcp_cmnd:
+        dma_pool_free(ha->fcp_cmnd_dma_pool, ctx->fcp_cmnd, ctx->fcp_cmnd_dma);
+queuing_error:
+        if (tot_dsds)
+                scsi_dma_unmap(cmd);
+
+        if (sp->ctx) {
+                mempool_free(sp->ctx, ha->ctx_mempool);
+                sp->ctx = NULL;
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return QLA_FUNCTION_FAILED;
+}
+
 static uint32_t *
 qla82xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,
         uint32_t length)
@@ -2668,7 +3163,7 @@ qla82xx_write_flash_data(struct scsi_qla_host *vha, uint32_t *dwptr,
                 if (!optrom) {
                         ql_log(ql_log_warn, vha, 0xb01b,
                             "Unable to allocate memory "
-                            "for optrom burst write (%x KB).\n",
+                            "for optron burst write (%x KB).\n",
                             OPTROM_BURST_SIZE / 1024);
                 }
         }
@@ -2766,9 +3261,9 @@ qla82xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
 }
 
 void
-qla82xx_start_iocbs(scsi_qla_host_t *vha)
+qla82xx_start_iocbs(srb_t *sp)
 {
-        struct qla_hw_data *ha = vha->hw;
+        struct qla_hw_data *ha = sp->fcport->vha->hw;
         struct req_que *req = ha->req_q_map[0];
         struct device_reg_82xx __iomem *reg;
         uint32_t dbval;
@@ -2790,7 +3285,7 @@ qla82xx_start_iocbs(scsi_qla_host_t *vha)
         else {
                 WRT_REG_DWORD((unsigned long __iomem *)ha->nxdb_wr_ptr, dbval);
                 wmb();
-                while (RD_REG_DWORD((void __iomem *)ha->nxdb_rd_ptr) != dbval) {
+                while (RD_REG_DWORD(ha->nxdb_rd_ptr) != dbval) {
                         WRT_REG_DWORD((unsigned long  __iomem *)ha->nxdb_wr_ptr,
                                 dbval);
                         wmb();
@@ -2798,8 +3293,7 @@ qla82xx_start_iocbs(scsi_qla_host_t *vha)
         }
 }
 
-static void
-qla82xx_rom_lock_recovery(struct qla_hw_data *ha)
+void qla82xx_rom_lock_recovery(struct qla_hw_data *ha)
 {
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
@@ -2844,7 +3338,7 @@ qla82xx_device_bootstrap(scsi_qla_host_t *vha)
                 timeout = msleep_interruptible(200);
                 if (timeout) {
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                                QLA8XXX_DEV_FAILED);
+                                QLA82XX_DEV_FAILED);
                         return QLA_FUNCTION_FAILED;
                 }
 
@@ -2875,7 +3369,10 @@ dev_initialize:
         /* set to DEV_INITIALIZING */
         ql_log(ql_log_info, vha, 0x009e,
             "HW State: INITIALIZING.\n");
-        qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA8XXX_DEV_INITIALIZING);
+        qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_INITIALIZING);
+
+        /* Driver that sets device state to initializating sets IDC version */
+        qla82xx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION, QLA82XX_IDC_VERSION);
 
         qla82xx_idc_unlock(ha);
         rval = qla82xx_start_firmware(vha);
@@ -2885,14 +3382,14 @@ dev_initialize:
                 ql_log(ql_log_fatal, vha, 0x00ad,
                     "HW State: FAILED.\n");
                 qla82xx_clear_drv_active(ha);
-                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA8XXX_DEV_FAILED);
+                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_FAILED);
                 return rval;
         }
 
 dev_ready:
         ql_log(ql_log_info, vha, 0x00ae,
             "HW State: READY.\n");
-        qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA8XXX_DEV_READY);
+        qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_READY);
 
         return QLA_SUCCESS;
 }
@@ -2916,7 +3413,7 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha)
 
         if (vha->flags.online) {
                 /*Block any further I/O and wait for pending cmnds to complete*/
-                qla2x00_quiesce_io(vha);
+                qla82xx_quiescent_state_cleanup(vha);
         }
 
         /* Set the quiescence ready bit */
@@ -2937,11 +3434,12 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha)
                          * changing the state to DEV_READY
                          */
                         ql_log(ql_log_info, vha, 0xb023,
-                            "%s : QUIESCENT TIMEOUT DRV_ACTIVE:%d "
-                            "DRV_STATE:%d.\n", QLA2XXX_DRIVER_NAME,
+                            "%s : QUIESCENT TIMEOUT.\n", QLA2XXX_DRIVER_NAME);
+                        ql_log(ql_log_info, vha, 0xb024,
+                            "DRV_ACTIVE:%d DRV_STATE:%d.\n",
                             drv_active, drv_state);
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                            QLA8XXX_DEV_READY);
+                            QLA82XX_DEV_READY);
                         ql_log(ql_log_info, vha, 0xb025,
                             "HW State: DEV_READY.\n");
                         qla82xx_idc_unlock(ha);
@@ -2962,10 +3460,10 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha)
         }
         dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
         /* everyone acked so set the state to DEV_QUIESCENCE */
-        if (dev_state == QLA8XXX_DEV_NEED_QUIESCENT) {
+        if (dev_state == QLA82XX_DEV_NEED_QUIESCENT) {
                 ql_log(ql_log_info, vha, 0xb026,
                     "HW State: DEV_QUIESCENT.\n");
-                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA8XXX_DEV_QUIESCENT);
+                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_QUIESCENT);
         }
 }
 
@@ -2995,8 +3493,8 @@ qla82xx_wait_for_state_change(scsi_qla_host_t *vha, uint32_t curr_state)
         return dev_state;
 }
 
-void
-qla8xxx_dev_failed_handler(scsi_qla_host_t *vha)
+static void
+qla82xx_dev_failed_handler(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
 
@@ -3004,10 +3502,9 @@ qla8xxx_dev_failed_handler(scsi_qla_host_t *vha)
         ql_log(ql_log_fatal, vha, 0x00b8,
             "Disabling the board.\n");
 
-        if (IS_QLA82XX(ha)) {
-                qla82xx_clear_drv_active(ha);
-                qla82xx_idc_unlock(ha);
-        }
+        qla82xx_idc_lock(ha);
+        qla82xx_clear_drv_active(ha);
+        qla82xx_idc_unlock(ha);
 
         /* Set DEV_FAILED flag to disable timer */
         vha->device_flags |= DFLG_DEV_FAILED;
@@ -3032,7 +3529,6 @@ static void
 qla82xx_need_reset_handler(scsi_qla_host_t *vha)
 {
         uint32_t dev_state, drv_state, drv_active;
-        uint32_t active_mask = 0;
         unsigned long reset_timeout;
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = ha->req_q_map[0];
@@ -3045,32 +3541,15 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                 qla82xx_idc_lock(ha);
         }
 
-        drv_active = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
-        if (!ha->flags.nic_core_reset_owner) {
-                ql_dbg(ql_dbg_p3p, vha, 0xb028,
-                    "reset_acknowledged by 0x%x\n", ha->portnum);
-                qla82xx_set_rst_ready(ha);
-        } else {
-                active_mask = ~(QLA82XX_DRV_ACTIVE << (ha->portnum * 4));
-                drv_active &= active_mask;
-                ql_dbg(ql_dbg_p3p, vha, 0xb029,
-                    "active_mask: 0x%08x\n", active_mask);
-        }
+        qla82xx_set_rst_ready(ha);
 
         /* wait for 10 seconds for reset ack from all functions */
-        reset_timeout = jiffies + (ha->fcoe_reset_timeout * HZ);
+        reset_timeout = jiffies + (ha->nx_reset_timeout * HZ);
 
         drv_state = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
         drv_active = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
-        dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-
-        ql_dbg(ql_dbg_p3p, vha, 0xb02a,
-            "drv_state: 0x%08x, drv_active: 0x%08x, "
-            "dev_state: 0x%08x, active_mask: 0x%08x\n",
-            drv_state, drv_active, dev_state, active_mask);
 
-        while (drv_state != drv_active &&
-            dev_state != QLA8XXX_DEV_INITIALIZING) {
+        while (drv_state != drv_active) {
                 if (time_after_eq(jiffies, reset_timeout)) {
                         ql_log(ql_log_warn, vha, 0x00b5,
                             "Reset timeout.\n");
@@ -3081,81 +3560,23 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                 qla82xx_idc_lock(ha);
                 drv_state = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
                 drv_active = qla82xx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
-                if (ha->flags.nic_core_reset_owner)
-                        drv_active &= active_mask;
-                dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
         }
 
-        ql_dbg(ql_dbg_p3p, vha, 0xb02b,
-            "drv_state: 0x%08x, drv_active: 0x%08x, "
-            "dev_state: 0x%08x, active_mask: 0x%08x\n",
-            drv_state, drv_active, dev_state, active_mask);
-
+        dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
         ql_log(ql_log_info, vha, 0x00b6,
             "Device state is 0x%x = %s.\n",
             dev_state,
-            dev_state < MAX_STATES ? qdev_state(dev_state) : "Unknown");
+            dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
 
         /* Force to DEV_COLD unless someone else is starting a reset */
-        if (dev_state != QLA8XXX_DEV_INITIALIZING &&
-            dev_state != QLA8XXX_DEV_COLD) {
+        if (dev_state != QLA82XX_DEV_INITIALIZING) {
                 ql_log(ql_log_info, vha, 0x00b7,
                     "HW State: COLD/RE-INIT.\n");
-                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA8XXX_DEV_COLD);
-                qla82xx_set_rst_ready(ha);
-                if (ql2xmdenable) {
-                        if (qla82xx_md_collect(vha))
-                                ql_log(ql_log_warn, vha, 0xb02c,
-                                    "Minidump not collected.\n");
-                } else
-                        ql_log(ql_log_warn, vha, 0xb04f,
-                            "Minidump disabled.\n");
+                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_COLD);
         }
 }
 
 int
-qla82xx_check_md_needed(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint16_t fw_major_version, fw_minor_version, fw_subminor_version;
-        int rval = QLA_SUCCESS;
-
-        fw_major_version = ha->fw_major_version;
-        fw_minor_version = ha->fw_minor_version;
-        fw_subminor_version = ha->fw_subminor_version;
-
-        rval = qla2x00_get_fw_version(vha);
-        if (rval != QLA_SUCCESS)
-                return rval;
-
-        if (ql2xmdenable) {
-                if (!ha->fw_dumped) {
-                        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 - "
-                                    "New version: %d:%d:%d\n",
-                                    fw_major_version, fw_minor_version,
-                                    fw_subminor_version,
-                                    ha->fw_major_version,
-                                    ha->fw_minor_version,
-                                    ha->fw_subminor_version);
-                                /* Release MiniDump resources */
-                                qla82xx_md_free(vha);
-                                /* ALlocate MiniDump resources */
-                                qla82xx_md_prep(vha);
-                        }
-                } else
-                        ql_log(ql_log_info, vha, 0xb02e,
-                            "Firmware dump available to retrieve\n");
-        }
-        return rval;
-}
-
-
-static int
 qla82xx_check_fw_alive(scsi_qla_host_t *vha)
 {
         uint32_t fw_heartbeat_counter;
@@ -3208,20 +3629,18 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
         int loopcount = 0;
 
         qla82xx_idc_lock(ha);
-        if (!vha->flags.init_done) {
+        if (!vha->flags.init_done)
                 qla82xx_set_drv_active(vha);
-                qla82xx_set_idc_version(vha);
-        }
 
         dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
         old_dev_state = dev_state;
         ql_log(ql_log_info, vha, 0x009b,
             "Device state is 0x%x = %s.\n",
             dev_state,
-            dev_state < MAX_STATES ? qdev_state(dev_state) : "Unknown");
+            dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
 
         /* wait for 30 seconds for device to go ready */
-        dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout * HZ);
+        dev_init_timeout = jiffies + (ha->nx_dev_init_timeout * HZ);
 
         while (1) {
 
@@ -3240,56 +3659,50 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
                         ql_log(ql_log_info, vha, 0x009d,
                             "Device state is 0x%x = %s.\n",
                             dev_state,
-                            dev_state < MAX_STATES ? qdev_state(dev_state) :
+                            dev_state < MAX_STATES ? qdev_state[dev_state] :
                             "Unknown");
                 }
 
                 switch (dev_state) {
-                case QLA8XXX_DEV_READY:
-                        ha->flags.nic_core_reset_owner = 0;
-                        goto rel_lock;
-                case QLA8XXX_DEV_COLD:
+                case QLA82XX_DEV_READY:
+                        goto exit;
+                case QLA82XX_DEV_COLD:
                         rval = qla82xx_device_bootstrap(vha);
-                        break;
-                case QLA8XXX_DEV_INITIALIZING:
+                        goto exit;
+                case QLA82XX_DEV_INITIALIZING:
                         qla82xx_idc_unlock(ha);
                         msleep(1000);
                         qla82xx_idc_lock(ha);
                         break;
-                case QLA8XXX_DEV_NEED_RESET:
-                        if (!ql2xdontresethba)
-                                qla82xx_need_reset_handler(vha);
-                        else {
-                                qla82xx_idc_unlock(ha);
-                                msleep(1000);
-                                qla82xx_idc_lock(ha);
-                        }
+                case QLA82XX_DEV_NEED_RESET:
+                    if (!ql2xdontresethba)
+                        qla82xx_need_reset_handler(vha);
                         dev_init_timeout = jiffies +
-                            (ha->fcoe_dev_init_timeout * HZ);
+                                (ha->nx_dev_init_timeout * HZ);
                         break;
-                case QLA8XXX_DEV_NEED_QUIESCENT:
+                case QLA82XX_DEV_NEED_QUIESCENT:
                         qla82xx_need_qsnt_handler(vha);
                         /* Reset timeout value after quiescence handler */
-                        dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\
+                        dev_init_timeout = jiffies + (ha->nx_dev_init_timeout\
                                                          * HZ);
                         break;
-                case QLA8XXX_DEV_QUIESCENT:
+                case QLA82XX_DEV_QUIESCENT:
                         /* Owner will exit and other will wait for the state
                          * to get changed
                          */
                         if (ha->flags.quiesce_owner)
-                                goto rel_lock;
+                                goto exit;
 
                         qla82xx_idc_unlock(ha);
                         msleep(1000);
                         qla82xx_idc_lock(ha);
 
                         /* Reset timeout value after quiescence handler */
-                        dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\
+                        dev_init_timeout = jiffies + (ha->nx_dev_init_timeout\
                                                          * HZ);
                         break;
-                case QLA8XXX_DEV_FAILED:
-                        qla8xxx_dev_failed_handler(vha);
+                case QLA82XX_DEV_FAILED:
+                        qla82xx_dev_failed_handler(vha);
                         rval = QLA_FUNCTION_FAILED;
                         goto exit;
                 default:
@@ -3299,89 +3712,36 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
                 }
                 loopcount++;
         }
-rel_lock:
-        qla82xx_idc_unlock(ha);
 exit:
+        qla82xx_idc_unlock(ha);
         return rval;
 }
 
-static int qla82xx_check_temp(scsi_qla_host_t *vha)
-{
-        uint32_t temp, temp_state, temp_val;
-        struct qla_hw_data *ha = vha->hw;
-
-        temp = qla82xx_rd_32(ha, CRB_TEMP_STATE);
-        temp_state = qla82xx_get_temp_state(temp);
-        temp_val = qla82xx_get_temp_val(temp);
-
-        if (temp_state == QLA82XX_TEMP_PANIC) {
-                ql_log(ql_log_warn, vha, 0x600e,
-                    "Device temperature %d degrees C exceeds "
-                    " maximum allowed. Hardware has been shut down.\n",
-                    temp_val);
-                return 1;
-        } else if (temp_state == QLA82XX_TEMP_WARN) {
-                ql_log(ql_log_warn, vha, 0x600f,
-                    "Device temperature %d degrees C exceeds "
-                    "operating range. Immediate action needed.\n",
-                    temp_val);
-        }
-        return 0;
-}
-
-void qla82xx_clear_pending_mbx(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        if (ha->flags.mbox_busy) {
-                ha->flags.mbox_int = 1;
-                ha->flags.mbox_busy = 0;
-                ql_log(ql_log_warn, vha, 0x6010,
-                    "Doing premature completion of mbx command.\n");
-                if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags))
-                        complete(&ha->mbx_intr_comp);
-        }
-}
-
 void qla82xx_watchdog(scsi_qla_host_t *vha)
 {
         uint32_t dev_state, halt_status;
         struct qla_hw_data *ha = vha->hw;
 
         /* don't poll if reset is going on */
-        if (!ha->flags.nic_core_reset_hdlr_active) {
+        if (!ha->flags.isp82xx_reset_hdlr_active) {
                 dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-                if (qla82xx_check_temp(vha)) {
-                        set_bit(ISP_UNRECOVERABLE, &vha->dpc_flags);
-                        ha->flags.isp82xx_fw_hung = 1;
-                        qla82xx_clear_pending_mbx(vha);
-                } else if (dev_state == QLA8XXX_DEV_NEED_RESET &&
+                if (dev_state == QLA82XX_DEV_NEED_RESET &&
                     !test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags)) {
                         ql_log(ql_log_warn, vha, 0x6001,
                             "Adapter reset needed.\n");
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                } else if (dev_state == QLA8XXX_DEV_NEED_QUIESCENT &&
+                        qla2xxx_wake_dpc(vha);
+                } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&
                         !test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) {
                         ql_log(ql_log_warn, vha, 0x6002,
                             "Quiescent needed.\n");
                         set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags);
-                } else if (dev_state == QLA8XXX_DEV_FAILED &&
-                        !test_bit(ISP_UNRECOVERABLE, &vha->dpc_flags) &&
-                        vha->flags.online == 1) {
-                        ql_log(ql_log_warn, vha, 0xb055,
-                            "Adapter state is failed. Offlining.\n");
-                        set_bit(ISP_UNRECOVERABLE, &vha->dpc_flags);
-                        ha->flags.isp82xx_fw_hung = 1;
-                        qla82xx_clear_pending_mbx(vha);
+                        qla2xxx_wake_dpc(vha);
                 } else {
                         if (qla82xx_check_fw_alive(vha)) {
-                                ql_dbg(ql_dbg_timer, vha, 0x6011,
-                                    "disabling pause transmit on port 0 & 1.\n");
-                                qla82xx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
-                                    CRB_NIU_XG_PAUSE_CTL_P0|CRB_NIU_XG_PAUSE_CTL_P1);
                                 halt_status = qla82xx_rd_32(ha,
                                     QLA82XX_PEG_HALT_STATUS1);
-                                ql_log(ql_log_info, vha, 0x6005,
+                                ql_dbg(ql_dbg_timer, vha, 0x6005,
                                     "dumping hw/fw registers:.\n "
                                     " PEG_HALT_STATUS1: 0x%x, PEG_HALT_STATUS2: 0x%x,.\n "
                                     " PEG_NET_0_PC: 0x%x, PEG_NET_1_PC: 0x%x,.\n "
@@ -3398,11 +3758,6 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
                                             QLA82XX_CRB_PEG_NET_3 + 0x3c),
                                     qla82xx_rd_32(ha,
                                             QLA82XX_CRB_PEG_NET_4 + 0x3c));
-                                if (((halt_status & 0x1fffff00) >> 8) == 0x67)
-                                        ql_log(ql_log_warn, vha, 0xb052,
-                                            "Firmware aborted with "
-                                            "error code 0x00006700. Device is "
-                                            "being reset.\n");
                                 if (halt_status & HALT_STATUS_UNRECOVERABLE) {
                                         set_bit(ISP_UNRECOVERABLE,
                                             &vha->dpc_flags);
@@ -3412,9 +3767,18 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
                                         set_bit(ISP_ABORT_NEEDED,
                                             &vha->dpc_flags);
                                 }
+                                qla2xxx_wake_dpc(vha);
                                 ha->flags.isp82xx_fw_hung = 1;
-                                ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n");
-                                qla82xx_clear_pending_mbx(vha);
+                                if (ha->flags.mbox_busy) {
+                                        ha->flags.mbox_int = 1;
+                                        ql_log(ql_log_warn, vha, 0x6007,
+                                            "Due to FW hung, doing "
+                                            "premature completion of mbx "
+                                            "command.\n");
+                                        if (test_bit(MBX_INTR_WAIT,
+                                            &ha->mbx_cmd_flags))
+                                                complete(&ha->mbx_intr_comp);
+                                }
                         }
                 }
         }
@@ -3427,28 +3791,6 @@ int qla82xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
         return rval;
 }
 
-void
-qla82xx_set_reset_owner(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t dev_state;
-
-        dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-        if (dev_state == QLA8XXX_DEV_READY) {
-                ql_log(ql_log_info, vha, 0xb02f,
-                    "HW State: NEED RESET\n");
-                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                        QLA8XXX_DEV_NEED_RESET);
-                ha->flags.nic_core_reset_owner = 1;
-                ql_dbg(ql_dbg_p3p, vha, 0xb030,
-                    "reset_owner is 0x%x\n", ha->portnum);
-        } else
-                ql_log(ql_log_info, vha, 0xb031,
-                    "Device state is 0x%x = %s.\n",
-                    dev_state,
-                    dev_state < MAX_STATES ? qdev_state(dev_state) : "Unknown");
-}
-
 /*
  *  qla82xx_abort_isp
  *      Resets ISP and aborts all outstanding commands.
@@ -3464,16 +3806,26 @@ qla82xx_abort_isp(scsi_qla_host_t *vha)
 {
         int rval;
         struct qla_hw_data *ha = vha->hw;
+        uint32_t dev_state;
 
         if (vha->device_flags & DFLG_DEV_FAILED) {
                 ql_log(ql_log_warn, vha, 0x8024,
                     "Device in failed state, exiting.\n");
                 return QLA_SUCCESS;
         }
-        ha->flags.nic_core_reset_hdlr_active = 1;
+        ha->flags.isp82xx_reset_hdlr_active = 1;
 
         qla82xx_idc_lock(ha);
-        qla82xx_set_reset_owner(vha);
+        dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+        if (dev_state == QLA82XX_DEV_READY) {
+                ql_log(ql_log_info, vha, 0x8025,
+                    "HW State: NEED RESET.\n");
+                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
+                        QLA82XX_DEV_NEED_RESET);
+        } else
+                ql_log(ql_log_info, vha, 0x8026,
+                    "Hw State: %s.\n", dev_state < MAX_STATES ?
+                    qdev_state[dev_state] : "Unknown");
         qla82xx_idc_unlock(ha);
 
         rval = qla82xx_device_state_handler(vha);
@@ -3484,7 +3836,7 @@ qla82xx_abort_isp(scsi_qla_host_t *vha)
 
         if (rval == QLA_SUCCESS) {
                 ha->flags.isp82xx_fw_hung = 0;
-                ha->flags.nic_core_reset_hdlr_active = 0;
+                ha->flags.isp82xx_reset_hdlr_active = 0;
                 qla82xx_restart_isp(vha);
         }
 
@@ -3588,7 +3940,7 @@ int qla2x00_wait_for_fcoe_ctx_reset(scsi_qla_host_t *vha)
                 }
         }
         ql_dbg(ql_dbg_p3p, vha, 0xb027,
-               "%s: status=%d.\n", __func__, status);
+            "%s status=%d.\n", status);
 
         return status;
 }
@@ -3609,7 +3961,10 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
                         msleep(1000);
                         if (qla82xx_check_fw_alive(vha)) {
                                 ha->flags.isp82xx_fw_hung = 1;
-                                qla82xx_clear_pending_mbx(vha);
+                                if (ha->flags.mbox_busy) {
+                                        ha->flags.mbox_int = 1;
+                                        complete(&ha->mbx_intr_comp);
+                                }
                                 break;
                         }
                 }
@@ -3632,7 +3987,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->u.scmd.ctx ||
+                                        if (!sp->ctx ||
                                             (sp->flags & SRB_FCP_CMND_DMA_VALID)) {
                                                 spin_unlock_irqrestore(
                                                     &ha->hardware_lock, flags);
@@ -3661,790 +4016,3 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
                 }
         }
 }
-
-/* Minidump related functions */
-static int
-qla82xx_minidump_process_control(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla82xx_md_entry_crb *crb_entry;
-        uint32_t read_value, opcode, poll_time;
-        uint32_t addr, index, crb_addr;
-        unsigned long wtime;
-        struct qla82xx_md_template_hdr *tmplt_hdr;
-        uint32_t rval = QLA_SUCCESS;
-        int i;
-
-        tmplt_hdr = (struct qla82xx_md_template_hdr *)ha->md_tmplt_hdr;
-        crb_entry = (struct qla82xx_md_entry_crb *)entry_hdr;
-        crb_addr = crb_entry->addr;
-
-        for (i = 0; i < crb_entry->op_count; i++) {
-                opcode = crb_entry->crb_ctrl.opcode;
-                if (opcode & QLA82XX_DBG_OPCODE_WR) {
-                        qla82xx_md_rw_32(ha, crb_addr,
-                            crb_entry->value_1, 1);
-                        opcode &= ~QLA82XX_DBG_OPCODE_WR;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_RW) {
-                        read_value = qla82xx_md_rw_32(ha, crb_addr, 0, 0);
-                        qla82xx_md_rw_32(ha, crb_addr, read_value, 1);
-                        opcode &= ~QLA82XX_DBG_OPCODE_RW;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_AND) {
-                        read_value = qla82xx_md_rw_32(ha, crb_addr, 0, 0);
-                        read_value &= crb_entry->value_2;
-                        opcode &= ~QLA82XX_DBG_OPCODE_AND;
-                        if (opcode & QLA82XX_DBG_OPCODE_OR) {
-                                read_value |= crb_entry->value_3;
-                                opcode &= ~QLA82XX_DBG_OPCODE_OR;
-                        }
-                        qla82xx_md_rw_32(ha, crb_addr, read_value, 1);
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_OR) {
-                        read_value = qla82xx_md_rw_32(ha, crb_addr, 0, 0);
-                        read_value |= crb_entry->value_3;
-                        qla82xx_md_rw_32(ha, crb_addr, read_value, 1);
-                        opcode &= ~QLA82XX_DBG_OPCODE_OR;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_POLL) {
-                        poll_time = crb_entry->crb_strd.poll_timeout;
-                        wtime = jiffies + poll_time;
-                        read_value = qla82xx_md_rw_32(ha, crb_addr, 0, 0);
-
-                        do {
-                                if ((read_value & crb_entry->value_2)
-                                    == crb_entry->value_1)
-                                        break;
-                                else if (time_after_eq(jiffies, wtime)) {
-                                        /* capturing dump failed */
-                                        rval = QLA_FUNCTION_FAILED;
-                                        break;
-                                } else
-                                        read_value = qla82xx_md_rw_32(ha,
-                                            crb_addr, 0, 0);
-                        } while (1);
-                        opcode &= ~QLA82XX_DBG_OPCODE_POLL;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_RDSTATE) {
-                        if (crb_entry->crb_strd.state_index_a) {
-                                index = crb_entry->crb_strd.state_index_a;
-                                addr = tmplt_hdr->saved_state_array[index];
-                        } else
-                                addr = crb_addr;
-
-                        read_value = qla82xx_md_rw_32(ha, addr, 0, 0);
-                        index = crb_entry->crb_ctrl.state_index_v;
-                        tmplt_hdr->saved_state_array[index] = read_value;
-                        opcode &= ~QLA82XX_DBG_OPCODE_RDSTATE;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_WRSTATE) {
-                        if (crb_entry->crb_strd.state_index_a) {
-                                index = crb_entry->crb_strd.state_index_a;
-                                addr = tmplt_hdr->saved_state_array[index];
-                        } else
-                                addr = crb_addr;
-
-                        if (crb_entry->crb_ctrl.state_index_v) {
-                                index = crb_entry->crb_ctrl.state_index_v;
-                                read_value =
-                                    tmplt_hdr->saved_state_array[index];
-                        } else
-                                read_value = crb_entry->value_1;
-
-                        qla82xx_md_rw_32(ha, addr, read_value, 1);
-                        opcode &= ~QLA82XX_DBG_OPCODE_WRSTATE;
-                }
-
-                if (opcode & QLA82XX_DBG_OPCODE_MDSTATE) {
-                        index = crb_entry->crb_ctrl.state_index_v;
-                        read_value = tmplt_hdr->saved_state_array[index];
-                        read_value <<= crb_entry->crb_ctrl.shl;
-                        read_value >>= crb_entry->crb_ctrl.shr;
-                        if (crb_entry->value_2)
-                                read_value &= crb_entry->value_2;
-                        read_value |= crb_entry->value_3;
-                        read_value += crb_entry->value_1;
-                        tmplt_hdr->saved_state_array[index] = read_value;
-                        opcode &= ~QLA82XX_DBG_OPCODE_MDSTATE;
-                }
-                crb_addr += crb_entry->crb_strd.addr_stride;
-        }
-        return rval;
-}
-
-static void
-qla82xx_minidump_process_rdocm(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t r_addr, r_stride, loop_cnt, i, r_value;
-        struct qla82xx_md_entry_rdocm *ocm_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        ocm_hdr = (struct qla82xx_md_entry_rdocm *)entry_hdr;
-        r_addr = ocm_hdr->read_addr;
-        r_stride = ocm_hdr->read_addr_stride;
-        loop_cnt = ocm_hdr->op_count;
-
-        for (i = 0; i < loop_cnt; i++) {
-                r_value = RD_REG_DWORD((void __iomem *)
-                    (r_addr + ha->nx_pcibase));
-                *data_ptr++ = cpu_to_le32(r_value);
-                r_addr += r_stride;
-        }
-        *d_ptr = data_ptr;
-}
-
-static void
-qla82xx_minidump_process_rdmux(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t r_addr, s_stride, s_addr, s_value, loop_cnt, i, r_value;
-        struct qla82xx_md_entry_mux *mux_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        mux_hdr = (struct qla82xx_md_entry_mux *)entry_hdr;
-        r_addr = mux_hdr->read_addr;
-        s_addr = mux_hdr->select_addr;
-        s_stride = mux_hdr->select_value_stride;
-        s_value = mux_hdr->select_value;
-        loop_cnt = mux_hdr->op_count;
-
-        for (i = 0; i < loop_cnt; i++) {
-                qla82xx_md_rw_32(ha, s_addr, s_value, 1);
-                r_value = qla82xx_md_rw_32(ha, r_addr, 0, 0);
-                *data_ptr++ = cpu_to_le32(s_value);
-                *data_ptr++ = cpu_to_le32(r_value);
-                s_value += s_stride;
-        }
-        *d_ptr = data_ptr;
-}
-
-static void
-qla82xx_minidump_process_rdcrb(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t r_addr, r_stride, loop_cnt, i, r_value;
-        struct qla82xx_md_entry_crb *crb_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        crb_hdr = (struct qla82xx_md_entry_crb *)entry_hdr;
-        r_addr = crb_hdr->addr;
-        r_stride = crb_hdr->crb_strd.addr_stride;
-        loop_cnt = crb_hdr->op_count;
-
-        for (i = 0; i < loop_cnt; i++) {
-                r_value = qla82xx_md_rw_32(ha, r_addr, 0, 0);
-                *data_ptr++ = cpu_to_le32(r_addr);
-                *data_ptr++ = cpu_to_le32(r_value);
-                r_addr += r_stride;
-        }
-        *d_ptr = data_ptr;
-}
-
-static int
-qla82xx_minidump_process_l2tag(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t addr, r_addr, c_addr, t_r_addr;
-        uint32_t i, k, loop_count, t_value, r_cnt, r_value;
-        unsigned long p_wait, w_time, p_mask;
-        uint32_t c_value_w, c_value_r;
-        struct qla82xx_md_entry_cache *cache_hdr;
-        int rval = QLA_FUNCTION_FAILED;
-        uint32_t *data_ptr = *d_ptr;
-
-        cache_hdr = (struct qla82xx_md_entry_cache *)entry_hdr;
-        loop_count = cache_hdr->op_count;
-        r_addr = cache_hdr->read_addr;
-        c_addr = cache_hdr->control_addr;
-        c_value_w = cache_hdr->cache_ctrl.write_value;
-
-        t_r_addr = cache_hdr->tag_reg_addr;
-        t_value = cache_hdr->addr_ctrl.init_tag_value;
-        r_cnt = cache_hdr->read_ctrl.read_addr_cnt;
-        p_wait = cache_hdr->cache_ctrl.poll_wait;
-        p_mask = cache_hdr->cache_ctrl.poll_mask;
-
-        for (i = 0; i < loop_count; i++) {
-                qla82xx_md_rw_32(ha, t_r_addr, t_value, 1);
-                if (c_value_w)
-                        qla82xx_md_rw_32(ha, c_addr, c_value_w, 1);
-
-                if (p_mask) {
-                        w_time = jiffies + p_wait;
-                        do {
-                                c_value_r = qla82xx_md_rw_32(ha, c_addr, 0, 0);
-                                if ((c_value_r & p_mask) == 0)
-                                        break;
-                                else if (time_after_eq(jiffies, w_time)) {
-                                        /* capturing dump failed */
-                                        ql_dbg(ql_dbg_p3p, vha, 0xb032,
-                                            "c_value_r: 0x%x, poll_mask: 0x%lx, "
-                                            "w_time: 0x%lx\n",
-                                            c_value_r, p_mask, w_time);
-                                        return rval;
-                                }
-                        } while (1);
-                }
-
-                addr = r_addr;
-                for (k = 0; k < r_cnt; k++) {
-                        r_value = qla82xx_md_rw_32(ha, addr, 0, 0);
-                        *data_ptr++ = cpu_to_le32(r_value);
-                        addr += cache_hdr->read_ctrl.read_addr_stride;
-                }
-                t_value += cache_hdr->addr_ctrl.tag_value_stride;
-        }
-        *d_ptr = data_ptr;
-        return QLA_SUCCESS;
-}
-
-static void
-qla82xx_minidump_process_l1cache(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t addr, r_addr, c_addr, t_r_addr;
-        uint32_t i, k, loop_count, t_value, r_cnt, r_value;
-        uint32_t c_value_w;
-        struct qla82xx_md_entry_cache *cache_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        cache_hdr = (struct qla82xx_md_entry_cache *)entry_hdr;
-        loop_count = cache_hdr->op_count;
-        r_addr = cache_hdr->read_addr;
-        c_addr = cache_hdr->control_addr;
-        c_value_w = cache_hdr->cache_ctrl.write_value;
-
-        t_r_addr = cache_hdr->tag_reg_addr;
-        t_value = cache_hdr->addr_ctrl.init_tag_value;
-        r_cnt = cache_hdr->read_ctrl.read_addr_cnt;
-
-        for (i = 0; i < loop_count; i++) {
-                qla82xx_md_rw_32(ha, t_r_addr, t_value, 1);
-                qla82xx_md_rw_32(ha, c_addr, c_value_w, 1);
-                addr = r_addr;
-                for (k = 0; k < r_cnt; k++) {
-                        r_value = qla82xx_md_rw_32(ha, addr, 0, 0);
-                        *data_ptr++ = cpu_to_le32(r_value);
-                        addr += cache_hdr->read_ctrl.read_addr_stride;
-                }
-                t_value += cache_hdr->addr_ctrl.tag_value_stride;
-        }
-        *d_ptr = data_ptr;
-}
-
-static void
-qla82xx_minidump_process_queue(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t s_addr, r_addr;
-        uint32_t r_stride, r_value, r_cnt, qid = 0;
-        uint32_t i, k, loop_cnt;
-        struct qla82xx_md_entry_queue *q_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        q_hdr = (struct qla82xx_md_entry_queue *)entry_hdr;
-        s_addr = q_hdr->select_addr;
-        r_cnt = q_hdr->rd_strd.read_addr_cnt;
-        r_stride = q_hdr->rd_strd.read_addr_stride;
-        loop_cnt = q_hdr->op_count;
-
-        for (i = 0; i < loop_cnt; i++) {
-                qla82xx_md_rw_32(ha, s_addr, qid, 1);
-                r_addr = q_hdr->read_addr;
-                for (k = 0; k < r_cnt; k++) {
-                        r_value = qla82xx_md_rw_32(ha, r_addr, 0, 0);
-                        *data_ptr++ = cpu_to_le32(r_value);
-                        r_addr += r_stride;
-                }
-                qid += q_hdr->q_strd.queue_id_stride;
-        }
-        *d_ptr = data_ptr;
-}
-
-static void
-qla82xx_minidump_process_rdrom(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t r_addr, r_value;
-        uint32_t i, loop_cnt;
-        struct qla82xx_md_entry_rdrom *rom_hdr;
-        uint32_t *data_ptr = *d_ptr;
-
-        rom_hdr = (struct qla82xx_md_entry_rdrom *)entry_hdr;
-        r_addr = rom_hdr->read_addr;
-        loop_cnt = rom_hdr->read_data_size/sizeof(uint32_t);
-
-        for (i = 0; i < loop_cnt; i++) {
-                qla82xx_md_rw_32(ha, MD_DIRECT_ROM_WINDOW,
-                    (r_addr & 0xFFFF0000), 1);
-                r_value = qla82xx_md_rw_32(ha,
-                    MD_DIRECT_ROM_READ_BASE +
-                    (r_addr & 0x0000FFFF), 0, 0);
-                *data_ptr++ = cpu_to_le32(r_value);
-                r_addr += sizeof(uint32_t);
-        }
-        *d_ptr = data_ptr;
-}
-
-static int
-qla82xx_minidump_process_rdmem(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, uint32_t **d_ptr)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t r_addr, r_value, r_data;
-        uint32_t i, j, loop_cnt;
-        struct qla82xx_md_entry_rdmem *m_hdr;
-        unsigned long flags;
-        int rval = QLA_FUNCTION_FAILED;
-        uint32_t *data_ptr = *d_ptr;
-
-        m_hdr = (struct qla82xx_md_entry_rdmem *)entry_hdr;
-        r_addr = m_hdr->read_addr;
-        loop_cnt = m_hdr->read_data_size/16;
-
-        if (r_addr & 0xf) {
-                ql_log(ql_log_warn, vha, 0xb033,
-                    "Read addr 0x%x not 16 bytes aligned\n", r_addr);
-                return rval;
-        }
-
-        if (m_hdr->read_data_size % 16) {
-                ql_log(ql_log_warn, vha, 0xb034,
-                    "Read data[0x%x] not multiple of 16 bytes\n",
-                    m_hdr->read_data_size);
-                return rval;
-        }
-
-        ql_dbg(ql_dbg_p3p, vha, 0xb035,
-            "[%s]: rdmem_addr: 0x%x, read_data_size: 0x%x, loop_cnt: 0x%x\n",
-            __func__, r_addr, m_hdr->read_data_size, loop_cnt);
-
-        write_lock_irqsave(&ha->hw_lock, flags);
-        for (i = 0; i < loop_cnt; i++) {
-                qla82xx_md_rw_32(ha, MD_MIU_TEST_AGT_ADDR_LO, r_addr, 1);
-                r_value = 0;
-                qla82xx_md_rw_32(ha, MD_MIU_TEST_AGT_ADDR_HI, r_value, 1);
-                r_value = MIU_TA_CTL_ENABLE;
-                qla82xx_md_rw_32(ha, MD_MIU_TEST_AGT_CTRL, r_value, 1);
-                r_value = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE;
-                qla82xx_md_rw_32(ha, MD_MIU_TEST_AGT_CTRL, r_value, 1);
-
-                for (j = 0; j < MAX_CTL_CHECK; j++) {
-                        r_value = qla82xx_md_rw_32(ha,
-                            MD_MIU_TEST_AGT_CTRL, 0, 0);
-                        if ((r_value & MIU_TA_CTL_BUSY) == 0)
-                                break;
-                }
-
-                if (j >= MAX_CTL_CHECK) {
-                        printk_ratelimited(KERN_ERR
-                            "failed to read through agent\n");
-                        write_unlock_irqrestore(&ha->hw_lock, flags);
-                        return rval;
-                }
-
-                for (j = 0; j < 4; j++) {
-                        r_data = qla82xx_md_rw_32(ha,
-                            MD_MIU_TEST_AGT_RDDATA[j], 0, 0);
-                        *data_ptr++ = cpu_to_le32(r_data);
-                }
-                r_addr += 16;
-        }
-        write_unlock_irqrestore(&ha->hw_lock, flags);
-        *d_ptr = data_ptr;
-        return QLA_SUCCESS;
-}
-
-static int
-qla82xx_validate_template_chksum(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint64_t chksum = 0;
-        uint32_t *d_ptr = (uint32_t *)ha->md_tmplt_hdr;
-        int count = ha->md_template_size/sizeof(uint32_t);
-
-        while (count-- > 0)
-                chksum += *d_ptr++;
-        while (chksum >> 32)
-                chksum = (chksum & 0xFFFFFFFF) + (chksum >> 32);
-        return ~chksum;
-}
-
-static void
-qla82xx_mark_entry_skipped(scsi_qla_host_t *vha,
-        qla82xx_md_entry_hdr_t *entry_hdr, int index)
-{
-        entry_hdr->d_ctrl.driver_flags |= QLA82XX_DBG_SKIPPED_FLAG;
-        ql_dbg(ql_dbg_p3p, vha, 0xb036,
-            "Skipping entry[%d]: "
-            "ETYPE[0x%x]-ELEVEL[0x%x]\n",
-            index, entry_hdr->entry_type,
-            entry_hdr->d_ctrl.entry_capture_mask);
-}
-
-int
-qla82xx_md_collect(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        int no_entry_hdr = 0;
-        qla82xx_md_entry_hdr_t *entry_hdr;
-        struct qla82xx_md_template_hdr *tmplt_hdr;
-        uint32_t *data_ptr;
-        uint32_t total_data_size = 0, f_capture_mask, data_collected = 0;
-        int i = 0, rval = QLA_FUNCTION_FAILED;
-
-        tmplt_hdr = (struct qla82xx_md_template_hdr *)ha->md_tmplt_hdr;
-        data_ptr = (uint32_t *)ha->md_dump;
-
-        if (ha->fw_dumped) {
-                ql_log(ql_log_warn, vha, 0xb037,
-                    "Firmware has been previously dumped (%p) "
-                    "-- ignoring request.\n", ha->fw_dump);
-                goto md_failed;
-        }
-
-        ha->fw_dumped = 0;
-
-        if (!ha->md_tmplt_hdr || !ha->md_dump) {
-                ql_log(ql_log_warn, vha, 0xb038,
-                    "Memory not allocated for minidump capture\n");
-                goto md_failed;
-        }
-
-        if (ha->flags.isp82xx_no_md_cap) {
-                ql_log(ql_log_warn, vha, 0xb054,
-                    "Forced reset from application, "
-                    "ignore minidump capture\n");
-                ha->flags.isp82xx_no_md_cap = 0;
-                goto md_failed;
-        }
-
-        if (qla82xx_validate_template_chksum(vha)) {
-                ql_log(ql_log_info, vha, 0xb039,
-                    "Template checksum validation error\n");
-                goto md_failed;
-        }
-
-        no_entry_hdr = tmplt_hdr->num_of_entries;
-        ql_dbg(ql_dbg_p3p, vha, 0xb03a,
-            "No of entry headers in Template: 0x%x\n", no_entry_hdr);
-
-        ql_dbg(ql_dbg_p3p, vha, 0xb03b,
-            "Capture Mask obtained: 0x%x\n", tmplt_hdr->capture_debug_level);
-
-        f_capture_mask = tmplt_hdr->capture_debug_level & 0xFF;
-
-        /* Validate whether required debug level is set */
-        if ((f_capture_mask & 0x3) != 0x3) {
-                ql_log(ql_log_warn, vha, 0xb03c,
-                    "Minimum required capture mask[0x%x] level not set\n",
-                    f_capture_mask);
-                goto md_failed;
-        }
-        tmplt_hdr->driver_capture_mask = ql2xmdcapmask;
-
-        tmplt_hdr->driver_info[0] = vha->host_no;
-        tmplt_hdr->driver_info[1] = (QLA_DRIVER_MAJOR_VER << 24) |
-            (QLA_DRIVER_MINOR_VER << 16) | (QLA_DRIVER_PATCH_VER << 8) |
-            QLA_DRIVER_BETA_VER;
-
-        total_data_size = ha->md_dump_size;
-
-        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 */
-        if (tmplt_hdr->entry_type != QLA82XX_TLHDR) {
-                ql_log(ql_log_warn, vha, 0xb04e,
-                    "Bad template header entry type: 0x%x obtained\n",
-                    tmplt_hdr->entry_type);
-                goto md_failed;
-        }
-
-        entry_hdr = (qla82xx_md_entry_hdr_t *) \
-            (((uint8_t *)ha->md_tmplt_hdr) + tmplt_hdr->first_entry_offset);
-
-        /* Walk through the entry headers */
-        for (i = 0; i < no_entry_hdr; i++) {
-
-                if (data_collected > total_data_size) {
-                        ql_log(ql_log_warn, vha, 0xb03e,
-                            "More MiniDump data collected: [0x%x]\n",
-                            data_collected);
-                        goto md_failed;
-                }
-
-                if (!(entry_hdr->d_ctrl.entry_capture_mask &
-                    ql2xmdcapmask)) {
-                        entry_hdr->d_ctrl.driver_flags |=
-                            QLA82XX_DBG_SKIPPED_FLAG;
-                        ql_dbg(ql_dbg_p3p, vha, 0xb03f,
-                            "Skipping entry[%d]: "
-                            "ETYPE[0x%x]-ELEVEL[0x%x]\n",
-                            i, entry_hdr->entry_type,
-                            entry_hdr->d_ctrl.entry_capture_mask);
-                        goto skip_nxt_entry;
-                }
-
-                ql_dbg(ql_dbg_p3p, vha, 0xb040,
-                    "[%s]: data ptr[%d]: %p, entry_hdr: %p\n"
-                    "entry_type: 0x%x, captrue_mask: 0x%x\n",
-                    __func__, i, data_ptr, entry_hdr,
-                    entry_hdr->entry_type,
-                    entry_hdr->d_ctrl.entry_capture_mask);
-
-                ql_dbg(ql_dbg_p3p, vha, 0xb041,
-                    "Data collected: [0x%x], Dump size left:[0x%x]\n",
-                    data_collected, (ha->md_dump_size - data_collected));
-
-                /* Decode the entry type and take
-                 * required action to capture debug data */
-                switch (entry_hdr->entry_type) {
-                case QLA82XX_RDEND:
-                        qla82xx_mark_entry_skipped(vha, entry_hdr, i);
-                        break;
-                case QLA82XX_CNTRL:
-                        rval = qla82xx_minidump_process_control(vha,
-                            entry_hdr, &data_ptr);
-                        if (rval != QLA_SUCCESS) {
-                                qla82xx_mark_entry_skipped(vha, entry_hdr, i);
-                                goto md_failed;
-                        }
-                        break;
-                case QLA82XX_RDCRB:
-                        qla82xx_minidump_process_rdcrb(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_RDMEM:
-                        rval = qla82xx_minidump_process_rdmem(vha,
-                            entry_hdr, &data_ptr);
-                        if (rval != QLA_SUCCESS) {
-                                qla82xx_mark_entry_skipped(vha, entry_hdr, i);
-                                goto md_failed;
-                        }
-                        break;
-                case QLA82XX_BOARD:
-                case QLA82XX_RDROM:
-                        qla82xx_minidump_process_rdrom(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_L2DTG:
-                case QLA82XX_L2ITG:
-                case QLA82XX_L2DAT:
-                case QLA82XX_L2INS:
-                        rval = qla82xx_minidump_process_l2tag(vha,
-                            entry_hdr, &data_ptr);
-                        if (rval != QLA_SUCCESS) {
-                                qla82xx_mark_entry_skipped(vha, entry_hdr, i);
-                                goto md_failed;
-                        }
-                        break;
-                case QLA82XX_L1DAT:
-                case QLA82XX_L1INS:
-                        qla82xx_minidump_process_l1cache(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_RDOCM:
-                        qla82xx_minidump_process_rdocm(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_RDMUX:
-                        qla82xx_minidump_process_rdmux(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_QUEUE:
-                        qla82xx_minidump_process_queue(vha,
-                            entry_hdr, &data_ptr);
-                        break;
-                case QLA82XX_RDNOP:
-                default:
-                        qla82xx_mark_entry_skipped(vha, entry_hdr, i);
-                        break;
-                }
-
-                ql_dbg(ql_dbg_p3p, vha, 0xb042,
-                    "[%s]: data ptr[%d]: %p\n", __func__, i, data_ptr);
-
-                data_collected = (uint8_t *)data_ptr -
-                    (uint8_t *)ha->md_dump;
-skip_nxt_entry:
-                entry_hdr = (qla82xx_md_entry_hdr_t *) \
-                    (((uint8_t *)entry_hdr) + entry_hdr->entry_size);
-        }
-
-        if (data_collected != total_data_size) {
-                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);
-                goto md_failed;
-        }
-
-        ql_log(ql_log_info, vha, 0xb044,
-            "Firmware dump saved to temp buffer (%ld/%p %ld/%p).\n",
-            vha->host_no, ha->md_tmplt_hdr, vha->host_no, ha->md_dump);
-        ha->fw_dumped = 1;
-        qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);
-
-md_failed:
-        return rval;
-}
-
-int
-qla82xx_md_alloc(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        int i, k;
-        struct qla82xx_md_template_hdr *tmplt_hdr;
-
-        tmplt_hdr = (struct qla82xx_md_template_hdr *)ha->md_tmplt_hdr;
-
-        if (ql2xmdcapmask < 0x3 || ql2xmdcapmask > 0x7F) {
-                ql2xmdcapmask = tmplt_hdr->capture_debug_level & 0xFF;
-                ql_log(ql_log_info, vha, 0xb045,
-                    "Forcing driver capture mask to firmware default capture mask: 0x%x.\n",
-                    ql2xmdcapmask);
-        }
-
-        for (i = 0x2, k = 1; (i & QLA82XX_DEFAULT_CAP_MASK); i <<= 1, k++) {
-                if (i & ql2xmdcapmask)
-                        ha->md_dump_size += tmplt_hdr->capture_size_array[k];
-        }
-
-        if (ha->md_dump) {
-                ql_log(ql_log_warn, vha, 0xb046,
-                    "Firmware dump previously allocated.\n");
-                return 1;
-        }
-
-        ha->md_dump = vmalloc(ha->md_dump_size);
-        if (ha->md_dump == NULL) {
-                ql_log(ql_log_warn, vha, 0xb047,
-                    "Unable to allocate memory for Minidump size "
-                    "(0x%x).\n", ha->md_dump_size);
-                return 1;
-        }
-        return 0;
-}
-
-void
-qla82xx_md_free(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        /* Release the template header allocated */
-        if (ha->md_tmplt_hdr) {
-                ql_log(ql_log_info, vha, 0xb048,
-                    "Free MiniDump template: %p, size (%d KB)\n",
-                    ha->md_tmplt_hdr, ha->md_template_size / 1024);
-                dma_free_coherent(&ha->pdev->dev, ha->md_template_size,
-                    ha->md_tmplt_hdr, ha->md_tmplt_hdr_dma);
-                ha->md_tmplt_hdr = NULL;
-        }
-
-        /* Release the template data buffer allocated */
-        if (ha->md_dump) {
-                ql_log(ql_log_info, vha, 0xb049,
-                    "Free MiniDump memory: %p, size (%d KB)\n",
-                    ha->md_dump, ha->md_dump_size / 1024);
-                vfree(ha->md_dump);
-                ha->md_dump_size = 0;
-                ha->md_dump = NULL;
-        }
-}
-
-void
-qla82xx_md_prep(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        int rval;
-
-        /* Get Minidump template size */
-        rval = qla82xx_md_get_template_size(vha);
-        if (rval == QLA_SUCCESS) {
-                ql_log(ql_log_info, vha, 0xb04a,
-                    "MiniDump Template size obtained (%d KB)\n",
-                    ha->md_template_size / 1024);
-
-                /* Get Minidump template */
-                rval = qla82xx_md_get_template(vha);
-                if (rval == QLA_SUCCESS) {
-                        ql_dbg(ql_dbg_p3p, vha, 0xb04b,
-                            "MiniDump Template obtained\n");
-
-                        /* Allocate memory for minidump */
-                        rval = qla82xx_md_alloc(vha);
-                        if (rval == QLA_SUCCESS)
-                                ql_log(ql_log_info, vha, 0xb04c,
-                                    "MiniDump memory allocated (%d KB)\n",
-                                    ha->md_dump_size / 1024);
-                        else {
-                                ql_log(ql_log_info, vha, 0xb04d,
-                                    "Free MiniDump template: %p, size: (%d KB)\n",
-                                    ha->md_tmplt_hdr,
-                                    ha->md_template_size / 1024);
-                                dma_free_coherent(&ha->pdev->dev,
-                                    ha->md_template_size,
-                                    ha->md_tmplt_hdr, ha->md_tmplt_hdr_dma);
-                                ha->md_tmplt_hdr = NULL;
-                        }
-
-                }
-        }
-}
-
-int
-qla82xx_beacon_on(struct scsi_qla_host *vha)
-{
-
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        qla82xx_idc_lock(ha);
-        rval = qla82xx_mbx_beacon_ctl(vha, 1);
-
-        if (rval) {
-                ql_log(ql_log_warn, vha, 0xb050,
-                    "mbx set led config failed in %s\n", __func__);
-                goto exit;
-        }
-        ha->beacon_blink_led = 1;
-exit:
-        qla82xx_idc_unlock(ha);
-        return rval;
-}
-
-int
-qla82xx_beacon_off(struct scsi_qla_host *vha)
-{
-
-        int rval;
-        struct qla_hw_data *ha = vha->hw;
-        qla82xx_idc_lock(ha);
-        rval = qla82xx_mbx_beacon_ctl(vha, 0);
-
-        if (rval) {
-                ql_log(ql_log_warn, vha, 0xb051,
-                    "mbx set led config failed in %s\n", __func__);
-                goto exit;
-        }
-        ha->beacon_blink_led = 0;
-exit:
-        qla82xx_idc_unlock(ha);
-        return rval;
-}
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 6c953e8c08f..8a21832c669 100644
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -26,7 +26,6 @@
 #define CRB_RCVPEG_STATE                QLA82XX_REG(0x13c)
 #define BOOT_LOADER_DIMM_STATUS         QLA82XX_REG(0x54)
 #define CRB_DMA_SHIFT                   QLA82XX_REG(0xcc)
-#define CRB_TEMP_STATE                  QLA82XX_REG(0x1b4)
 #define QLA82XX_DMA_SHIFT_VALUE         0x55555555
 
 #define QLA82XX_HW_H0_CH_HUB_ADR    0x05
@@ -485,6 +484,8 @@
 #define QLA82XX_ADDR_OCM1               (0x0000000200400000ULL)
 #define QLA82XX_ADDR_OCM1_MAX           (0x00000002004fffffULL)
 #define QLA82XX_ADDR_QDR_NET            (0x0000000300000000ULL)
+
+#define QLA82XX_P2_ADDR_QDR_NET_MAX     (0x00000003001fffffULL)
 #define QLA82XX_P3_ADDR_QDR_NET_MAX     (0x0000000303ffffffULL)
 
 #define QLA82XX_PCI_CRBSPACE            (unsigned long)0x06000000
@@ -542,15 +543,14 @@
 #define QLA82XX_CRB_DRV_IDC_VERSION  (QLA82XX_CAM_RAM(0x174))
 
 /* Every driver should use these Device State */
-#define QLA8XXX_DEV_COLD                1
-#define QLA8XXX_DEV_INITIALIZING        2
-#define QLA8XXX_DEV_READY               3
-#define QLA8XXX_DEV_NEED_RESET          4
-#define QLA8XXX_DEV_NEED_QUIESCENT      5
-#define QLA8XXX_DEV_FAILED              6
-#define QLA8XXX_DEV_QUIESCENT           7
+#define QLA82XX_DEV_COLD                1
+#define QLA82XX_DEV_INITIALIZING        2
+#define QLA82XX_DEV_READY               3
+#define QLA82XX_DEV_NEED_RESET          4
+#define QLA82XX_DEV_NEED_QUIESCENT      5
+#define QLA82XX_DEV_FAILED              6
+#define QLA82XX_DEV_QUIESCENT           7
 #define MAX_STATES                      8 /* Increment if new state added */
-#define QLA8XXX_BAD_VALUE               0xbad0bad0
 
 #define QLA82XX_IDC_VERSION                     1
 #define QLA82XX_ROM_DEV_INIT_TIMEOUT            30
@@ -563,6 +563,7 @@
 #define QLA82XX_FW_VERSION_SUB          (QLA82XX_CAM_RAM(0x158))
 #define QLA82XX_PCIE_REG(reg)           (QLA82XX_CRB_PCIE + (reg))
 
+#define PCIE_CHICKEN3                   (0x120c8)
 #define PCIE_SETUP_FUNCTION             (0x12040)
 #define PCIE_SETUP_FUNCTION2            (0x12048)
 
@@ -889,8 +890,6 @@ struct ct6_dsd {
 };
 
 #define MBC_TOGGLE_INTERRUPT    0x10
-#define MBC_SET_LED_CONFIG      0x125   /* FCoE specific LED control */
-#define MBC_GET_LED_CONFIG      0x126   /* FCoE specific LED control */
 
 /* Flash  offset */
 #define FLT_REG_BOOTLOAD_82XX   0x72
@@ -923,272 +922,4 @@ struct ct6_dsd {
 #define M25P_INSTR_DP           0xb9
 #define M25P_INSTR_RES          0xab
 
-/* Minidump related */
-
-/*
- * Version of the template
- * 4 Bytes
- * X.Major.Minor.RELEASE
- */
-#define QLA82XX_MINIDUMP_VERSION         0x10101
-
-/*
- * Entry Type Defines
- */
-#define QLA82XX_RDNOP                   0
-#define QLA82XX_RDCRB                   1
-#define QLA82XX_RDMUX                   2
-#define QLA82XX_QUEUE                   3
-#define QLA82XX_BOARD                   4
-#define QLA82XX_RDSRE                   5
-#define QLA82XX_RDOCM                   6
-#define QLA82XX_CACHE                  10
-#define QLA82XX_L1DAT                  11
-#define QLA82XX_L1INS                  12
-#define QLA82XX_L2DTG                  21
-#define QLA82XX_L2ITG                  22
-#define QLA82XX_L2DAT                  23
-#define QLA82XX_L2INS                  24
-#define QLA82XX_RDROM                  71
-#define QLA82XX_RDMEM                  72
-#define QLA82XX_CNTRL                  98
-#define QLA82XX_TLHDR                  99
-#define QLA82XX_RDEND                  255
-
-/*
- * Opcodes for Control Entries.
- * These Flags are bit fields.
- */
-#define QLA82XX_DBG_OPCODE_WR        0x01
-#define QLA82XX_DBG_OPCODE_RW        0x02
-#define QLA82XX_DBG_OPCODE_AND       0x04
-#define QLA82XX_DBG_OPCODE_OR        0x08
-#define QLA82XX_DBG_OPCODE_POLL      0x10
-#define QLA82XX_DBG_OPCODE_RDSTATE   0x20
-#define QLA82XX_DBG_OPCODE_WRSTATE   0x40
-#define QLA82XX_DBG_OPCODE_MDSTATE   0x80
-
-/*
- * Template Header and Entry Header definitions start here.
- */
-
-/*
- * Template Header
- * Parts of the template header can be modified by the driver.
- * These include the saved_state_array, capture_debug_level, driver_timestamp
- */
-
-#define QLA82XX_DBG_STATE_ARRAY_LEN        16
-#define QLA82XX_DBG_CAP_SIZE_ARRAY_LEN     8
-#define QLA82XX_DBG_RSVD_ARRAY_LEN         8
-
-/*
- * Driver Flags
- */
-#define QLA82XX_DBG_SKIPPED_FLAG        0x80    /* driver skipped this entry */
-#define QLA82XX_DEFAULT_CAP_MASK        0xFF    /* default capture mask */
-
-struct qla82xx_md_template_hdr {
-        uint32_t entry_type;
-        uint32_t first_entry_offset;
-        uint32_t size_of_template;
-        uint32_t capture_debug_level;
-
-        uint32_t num_of_entries;
-        uint32_t version;
-        uint32_t driver_timestamp;
-        uint32_t template_checksum;
-
-        uint32_t driver_capture_mask;
-        uint32_t driver_info[3];
-
-        uint32_t saved_state_array[QLA82XX_DBG_STATE_ARRAY_LEN];
-        uint32_t capture_size_array[QLA82XX_DBG_CAP_SIZE_ARRAY_LEN];
-
-        /*  markers_array used to capture some special locations on board */
-        uint32_t markers_array[QLA82XX_DBG_RSVD_ARRAY_LEN];
-        uint32_t num_of_free_entries;   /* For internal use */
-        uint32_t free_entry_offset;     /* For internal use */
-        uint32_t total_table_size;      /*  For internal use */
-        uint32_t bkup_table_offset;     /*  For internal use */
-} __packed;
-
-/*
- * Entry Header:  Common to All Entry Types
- */
-
-/*
- * Driver Code is for driver to write some info about the entry.
- * Currently not used.
- */
-typedef struct qla82xx_md_entry_hdr {
-        uint32_t entry_type;
-        uint32_t entry_size;
-        uint32_t entry_capture_size;
-        struct {
-                uint8_t entry_capture_mask;
-                uint8_t entry_code;
-                uint8_t driver_code;
-                uint8_t driver_flags;
-        } d_ctrl;
-} __packed qla82xx_md_entry_hdr_t;
-
-/*
- *  Read CRB entry header
- */
-struct qla82xx_md_entry_crb {
-        qla82xx_md_entry_hdr_t h;
-        uint32_t addr;
-        struct {
-                uint8_t addr_stride;
-                uint8_t state_index_a;
-                uint16_t poll_timeout;
-        } crb_strd;
-
-        uint32_t data_size;
-        uint32_t op_count;
-
-        struct {
-                uint8_t opcode;
-                uint8_t state_index_v;
-                uint8_t shl;
-                uint8_t shr;
-        } crb_ctrl;
-
-        uint32_t value_1;
-        uint32_t value_2;
-        uint32_t value_3;
-} __packed;
-
-/*
- * Cache entry header
- */
-struct qla82xx_md_entry_cache {
-        qla82xx_md_entry_hdr_t h;
-
-        uint32_t tag_reg_addr;
-        struct {
-                uint16_t tag_value_stride;
-                uint16_t init_tag_value;
-        } addr_ctrl;
-
-        uint32_t data_size;
-        uint32_t op_count;
-
-        uint32_t control_addr;
-        struct {
-                uint16_t write_value;
-                uint8_t poll_mask;
-                uint8_t poll_wait;
-        } cache_ctrl;
-
-        uint32_t read_addr;
-        struct {
-                uint8_t read_addr_stride;
-                uint8_t read_addr_cnt;
-                uint16_t rsvd_1;
-        } read_ctrl;
-} __packed;
-
-/*
- * Read OCM
- */
-struct qla82xx_md_entry_rdocm {
-        qla82xx_md_entry_hdr_t h;
-
-        uint32_t rsvd_0;
-        uint32_t rsvd_1;
-        uint32_t data_size;
-        uint32_t op_count;
-
-        uint32_t rsvd_2;
-        uint32_t rsvd_3;
-        uint32_t read_addr;
-        uint32_t read_addr_stride;
-        uint32_t read_addr_cntrl;
-} __packed;
-
-/*
- * Read Memory
- */
-struct qla82xx_md_entry_rdmem {
-        qla82xx_md_entry_hdr_t h;
-        uint32_t rsvd[6];
-        uint32_t read_addr;
-        uint32_t read_data_size;
-} __packed;
-
-/*
- * Read ROM
- */
-struct qla82xx_md_entry_rdrom {
-        qla82xx_md_entry_hdr_t h;
-        uint32_t rsvd[6];
-        uint32_t read_addr;
-        uint32_t read_data_size;
-} __packed;
-
-struct qla82xx_md_entry_mux {
-        qla82xx_md_entry_hdr_t h;
-
-        uint32_t select_addr;
-        uint32_t rsvd_0;
-        uint32_t data_size;
-        uint32_t op_count;
-
-        uint32_t select_value;
-        uint32_t select_value_stride;
-        uint32_t read_addr;
-        uint32_t rsvd_1;
-} __packed;
-
-struct qla82xx_md_entry_queue {
-        qla82xx_md_entry_hdr_t h;
-
-        uint32_t select_addr;
-        struct {
-                uint16_t queue_id_stride;
-                uint16_t rsvd_0;
-        } q_strd;
-
-        uint32_t data_size;
-        uint32_t op_count;
-        uint32_t rsvd_1;
-        uint32_t rsvd_2;
-
-        uint32_t read_addr;
-        struct {
-                uint8_t read_addr_stride;
-                uint8_t read_addr_cnt;
-                uint16_t rsvd_3;
-        } rd_strd;
-} __packed;
-
-#define MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE 0x129
-#define RQST_TMPLT_SIZE 0x0
-#define RQST_TMPLT 0x1
-#define MD_DIRECT_ROM_WINDOW    0x42110030
-#define MD_DIRECT_ROM_READ_BASE 0x42150000
-#define MD_MIU_TEST_AGT_CTRL            0x41000090
-#define MD_MIU_TEST_AGT_ADDR_LO         0x41000094
-#define MD_MIU_TEST_AGT_ADDR_HI         0x41000098
-
-static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,
-        0x410000B8, 0x410000BC };
-
-#define CRB_NIU_XG_PAUSE_CTL_P0        0x1
-#define CRB_NIU_XG_PAUSE_CTL_P1        0x8
-
-#define qla82xx_get_temp_val(x)          ((x) >> 16)
-#define qla82xx_get_temp_state(x)        ((x) & 0xffff)
-#define qla82xx_encode_temp(val, state)  (((val) << 16) | (state))
-
-/*
- * Temperature control.
- */
-enum {
-        QLA82XX_TEMP_NORMAL = 0x1, /* Normal operating range */
-        QLA82XX_TEMP_WARN,         /* Sound alert, temperature getting high */
-        QLA82XX_TEMP_PANIC         /* Fatal error, hardware has shut down. */
-};
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 10d23f8b703..1e69527f1e4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -13,13 +13,12 @@
 #include <linux/mutex.h>
 #include <linux/kobject.h>
 #include <linux/slab.h>
+
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsicam.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
 
-#include "qla_target.h"
-
 /*
  * Driver version
  */
@@ -41,12 +40,6 @@ static struct kmem_cache *ctx_cachep;
  */
 int ql_errlev = ql_log_all;
 
-static int ql2xenableclass2;
-module_param(ql2xenableclass2, int, S_IRUGO|S_IRUSR);
-MODULE_PARM_DESC(ql2xenableclass2,
-                "Specify if Class 2 operations are supported from the very "
-                "beginning. Default is 0 - class 2 not supported.");
-
 int ql2xlogintimeout = 20;
 module_param(ql2xlogintimeout, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xlogintimeout,
@@ -89,12 +82,7 @@ MODULE_PARM_DESC(ql2xextended_error_logging,
                 "\t\t0x00200000 - AER/EEH.       0x00100000 - Multi Q.\n"
                 "\t\t0x00080000 - P3P Specific.  0x00040000 - Virtual Port.\n"
                 "\t\t0x00020000 - Buffer Dump.   0x00010000 - Misc.\n"
-                "\t\t0x00008000 - Verbose.       0x00004000 - Target.\n"
-                "\t\t0x00002000 - Target Mgmt.   0x00001000 - Target TMF.\n"
                 "\t\t0x7fffffff - For enabling all logs, can be too many logs.\n"
-                "\t\t0x1e400000 - Preferred value for capturing essential "
-                "debug information (equivalent to old "
-                "ql2xextended_error_logging=1).\n"
                 "\t\tDo LOGICAL OR of the value to enable more than one level");
 
 int ql2xshiftctondsd = 6;
@@ -115,11 +103,11 @@ MODULE_PARM_DESC(ql2xfdmienable,
 static int ql2xmaxqdepth = MAX_Q_DEPTH;
 module_param(ql2xmaxqdepth, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xmaxqdepth,
-                "Maximum queue depth to set for each LUN. "
-                "Default is 32.");
+                "Maximum queue depth to report for target devices.");
 
-int ql2xenabledif = 2;
-module_param(ql2xenabledif, int, S_IRUGO);
+/* Do not change the value of this after module load */
+int ql2xenabledif = 0;
+module_param(ql2xenabledif, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xenabledif,
                 " Enable T10-CRC-DIF "
                 " Default is 0 - No DIF Support. 1 - Enable it"
@@ -155,7 +143,7 @@ MODULE_PARM_DESC(ql2xmultique_tag,
                 "Set it to 1 to turn on the cpu affinity.");
 
 int ql2xfwloadbin;
-module_param(ql2xfwloadbin, int, S_IRUGO|S_IWUSR);
+module_param(ql2xfwloadbin, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xfwloadbin,
                 "Option to specify location from which to load ISP firmware:.\n"
                 " 2 -- load firmware via the request_firmware() (hotplug).\n"
@@ -170,11 +158,11 @@ MODULE_PARM_DESC(ql2xetsenable,
                 "Default is 0 - skip ETS enablement.");
 
 int ql2xdbwr = 1;
-module_param(ql2xdbwr, int, S_IRUGO|S_IWUSR);
+module_param(ql2xdbwr, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xdbwr,
-                "Option to specify scheme for request queue posting.\n"
-                " 0 -- Regular doorbell.\n"
-                " 1 -- CAMRAM doorbell (faster).\n");
+        "Option to specify scheme for request queue posting.\n"
+        " 0 -- Regular doorbell.\n"
+        " 1 -- CAMRAM doorbell (faster).\n");
 
 int ql2xtargetreset = 1;
 module_param(ql2xtargetreset, int, S_IRUGO);
@@ -195,11 +183,11 @@ MODULE_PARM_DESC(ql2xasynctmfenable,
                 "Default is 0 - Issue TM IOCBs via mailbox mechanism.");
 
 int ql2xdontresethba;
-module_param(ql2xdontresethba, int, S_IRUGO|S_IWUSR);
+module_param(ql2xdontresethba, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xdontresethba,
-                "Option to specify reset behaviour.\n"
-                " 0 (Default) -- Reset on failure.\n"
-                " 1 -- Do not reset on failure.\n");
+        "Option to specify reset behaviour.\n"
+        " 0 (Default) -- Reset on failure.\n"
+        " 1 -- Do not reset on failure.\n");
 
 uint ql2xmaxlun = MAX_LUNS;
 module_param(ql2xmaxlun, uint, S_IRUGO);
@@ -207,19 +195,6 @@ MODULE_PARM_DESC(ql2xmaxlun,
                 "Defines the maximum LU number to register with the SCSI "
                 "midlayer. Default is 65535.");
 
-int ql2xmdcapmask = 0x1F;
-module_param(ql2xmdcapmask, int, S_IRUGO);
-MODULE_PARM_DESC(ql2xmdcapmask,
-                "Set the Minidump driver capture mask level. "
-                "Default is 0x1F - Can be set to 0x3, 0x7, 0xF, 0x1F, 0x7F.");
-
-int ql2xmdenable = 1;
-module_param(ql2xmdenable, int, S_IRUGO);
-MODULE_PARM_DESC(ql2xmdenable,
-                "Enable/disable MiniDump. "
-                "0 - MiniDump disabled. "
-                "1 (Default) - MiniDump enabled.");
-
 /*
  * SCSI host template entry points
  */
@@ -264,8 +239,6 @@ struct scsi_host_template qla2xxx_driver_template = {
 
         .max_sectors            = 0xFFFF,
         .shost_attrs            = qla2x00_host_attrs,
-
-        .supported_mode         = MODE_INITIATOR,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -315,10 +288,10 @@ static int qla2x00_mem_alloc(struct qla_hw_data *, uint16_t, uint16_t,
         struct req_que **, struct rsp_que **);
 static void qla2x00_free_fw_dump(struct qla_hw_data *);
 static void qla2x00_mem_free(struct qla_hw_data *);
+static void qla2x00_sp_free_dma(srb_t *);
 
 /* -------------------------------------------------------------------------- */
-static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
-                                struct rsp_que *rsp)
+static int qla2x00_alloc_queues(struct qla_hw_data *ha)
 {
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
         ha->req_q_map = kzalloc(sizeof(struct req_que *) * ha->max_req_queues,
@@ -336,12 +309,6 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
                     "Unable to allocate memory for response queue ptrs.\n");
                 goto fail_rsp_map;
         }
-        /*
-         * Make sure we record at least the request and response queue zero in
-         * case we need to free them if part of the probe fails.
-         */
-        ha->rsp_q_map[0] = rsp;
-        ha->req_q_map[0] = req;
         set_bit(0, ha->rsp_qid_map);
         set_bit(0, ha->req_qid_map);
         return 1;
@@ -443,7 +410,6 @@ fail2:
         qla25xx_delete_queues(vha);
         destroy_workqueue(ha->wq);
         ha->wq = NULL;
-        vha->req = ha->req_q_map[0];
 fail:
         ha->mqenable = 0;
         kfree(ha->req_q_map);
@@ -484,32 +450,24 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, char *str)
         uint32_t pci_bus;
         int pcie_reg;
 
-        pcie_reg = pci_pcie_cap(ha->pdev);
+        pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP);
         if (pcie_reg) {
                 char lwstr[6];
                 uint16_t pcie_lstat, lspeed, lwidth;
 
-                pcie_reg += PCI_EXP_LNKCAP;
+                pcie_reg += 0x12;
                 pci_read_config_word(ha->pdev, pcie_reg, &pcie_lstat);
                 lspeed = pcie_lstat & (BIT_0 | BIT_1 | BIT_2 | BIT_3);
                 lwidth = (pcie_lstat &
                     (BIT_4 | BIT_5 | BIT_6 | BIT_7 | BIT_8 | BIT_9)) >> 4;
 
                 strcpy(str, "PCIe (");
-                switch (lspeed) {
-                case 1:
+                if (lspeed == 1)
                         strcat(str, "2.5GT/s ");
-                        break;
-                case 2:
+                else if (lspeed == 2)
                         strcat(str, "5.0GT/s ");
-                        break;
-                case 3:
-                        strcat(str, "8.0GT/s ");
-                        break;
-                default:
+                else
                         strcat(str, "<unknown> ");
-                        break;
-                }
                 snprintf(lwstr, sizeof(lwstr), "x%d)", lwidth);
                 strcat(str, lwstr);
 
@@ -584,75 +542,28 @@ qla24xx_fw_version_str(struct scsi_qla_host *vha, char *str)
         return str;
 }
 
-void
-qla2x00_sp_free_dma(void *vha, void *ptr)
+static inline srb_t *
+qla2x00_get_new_sp(scsi_qla_host_t *vha, fc_port_t *fcport,
+        struct scsi_cmnd *cmd)
 {
-        srb_t *sp = (srb_t *)ptr;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
-        struct qla_hw_data *ha = sp->fcport->vha->hw;
-        void *ctx = GET_CMD_CTX_SP(sp);
-
-        if (sp->flags & SRB_DMA_VALID) {
-                scsi_dma_unmap(cmd);
-                sp->flags &= ~SRB_DMA_VALID;
-        }
-
-        if (sp->flags & SRB_CRC_PROT_DMA_VALID) {
-                dma_unmap_sg(&ha->pdev->dev, scsi_prot_sglist(cmd),
-                    scsi_prot_sg_count(cmd), cmd->sc_data_direction);
-                sp->flags &= ~SRB_CRC_PROT_DMA_VALID;
-        }
-
-        if (sp->flags & SRB_CRC_CTX_DSD_VALID) {
-                /* List assured to be having elements */
-                qla2x00_clean_dsd_pool(ha, sp);
-                sp->flags &= ~SRB_CRC_CTX_DSD_VALID;
-        }
-
-        if (sp->flags & SRB_CRC_CTX_DMA_VALID) {
-                dma_pool_free(ha->dl_dma_pool, ctx,
-                    ((struct crc_context *)ctx)->crc_ctx_dma);
-                sp->flags &= ~SRB_CRC_CTX_DMA_VALID;
-        }
+        srb_t *sp;
+        struct qla_hw_data *ha = vha->hw;
 
-        if (sp->flags & SRB_FCP_CMND_DMA_VALID) {
-                struct ct6_dsd *ctx1 = (struct ct6_dsd *)ctx;
-
-                dma_pool_free(ha->fcp_cmnd_dma_pool, ctx1->fcp_cmnd,
-                        ctx1->fcp_cmnd_dma);
-                list_splice(&ctx1->dsd_list, &ha->gbl_dsd_list);
-                ha->gbl_dsd_inuse -= ctx1->dsd_use_cnt;
-                ha->gbl_dsd_avail += ctx1->dsd_use_cnt;
-                mempool_free(ctx1, ha->ctx_mempool);
-                ctx1 = NULL;
+        sp = mempool_alloc(ha->srb_mempool, GFP_ATOMIC);
+        if (!sp) {
+                ql_log(ql_log_warn, vha, 0x3006,
+                    "Memory allocation failed for sp.\n");
+                return sp;
         }
 
-        CMD_SP(cmd) = NULL;
-        mempool_free(sp, ha->srb_mempool);
-}
-
-static void
-qla2x00_sp_compl(void *data, void *ptr, int res)
-{
-        struct qla_hw_data *ha = (struct qla_hw_data *)data;
-        srb_t *sp = (srb_t *)ptr;
-        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
-
-        cmd->result = res;
-
-        if (atomic_read(&sp->ref_count) == 0) {
-                ql_dbg(ql_dbg_io, sp->fcport->vha, 0x3015,
-                    "SP reference-count to ZERO -- sp=%p cmd=%p.\n",
-                    sp, GET_CMD_SP(sp));
-                if (ql2xextended_error_logging & ql_dbg_io)
-                        BUG();
-                return;
-        }
-        if (!atomic_dec_and_test(&sp->ref_count))
-                return;
+        atomic_set(&sp->ref_count, 1);
+        sp->fcport = fcport;
+        sp->cmd = cmd;
+        sp->flags = 0;
+        CMD_SP(cmd) = (void *)sp;
+        sp->ctx = NULL;
 
-        qla2x00_sp_free_dma(ha, sp);
-        cmd->scsi_done(cmd);
+        return sp;
 }
 
 static int
@@ -668,12 +579,12 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 
         if (ha->flags.eeh_busy) {
                 if (ha->flags.pci_channel_io_perm_failure) {
-                        ql_dbg(ql_dbg_aer, vha, 0x9010,
+                        ql_dbg(ql_dbg_io, vha, 0x3001,
                             "PCI Channel IO permanent failure, exiting "
                             "cmd=%p.\n", cmd);
                         cmd->result = DID_NO_CONNECT << 16;
                 } else {
-                        ql_dbg(ql_dbg_aer, vha, 0x9011,
+                        ql_dbg(ql_dbg_io, vha, 0x3002,
                             "EEH_Busy, Requeuing the cmd=%p.\n", cmd);
                         cmd->result = DID_REQUEUE << 16;
                 }
@@ -683,7 +594,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         rval = fc_remote_port_chkready(rport);
         if (rval) {
                 cmd->result = rval;
-                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3003,
+                ql_dbg(ql_dbg_io, vha, 0x3003,
                     "fc_remote_port_chkready failed for cmd=%p, rval=0x%x.\n",
                     cmd, rval);
                 goto qc24_fail_command;
@@ -697,12 +608,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
                         cmd->result = DID_NO_CONNECT << 16;
                         goto qc24_fail_command;
         }
-
-        if (!fcport) {
-                cmd->result = DID_NO_CONNECT << 16;
-                goto qc24_fail_command;
-        }
-
         if (atomic_read(&fcport->state) != FCS_ONLINE) {
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
                         atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
@@ -716,20 +621,13 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
                 goto qc24_target_busy;
         }
 
-        sp = qla2x00_get_sp(base_vha, fcport, GFP_ATOMIC);
+        sp = qla2x00_get_new_sp(base_vha, fcport, cmd);
         if (!sp)
                 goto qc24_host_busy;
 
-        sp->u.scmd.cmd = cmd;
-        sp->type = SRB_SCSI_CMD;
-        atomic_set(&sp->ref_count, 1);
-        CMD_SP(cmd) = (void *)sp;
-        sp->free = qla2x00_sp_free_dma;
-        sp->done = qla2x00_sp_compl;
-
         rval = ha->isp_ops->start_scsi(sp);
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3013,
+                ql_dbg(ql_dbg_io, vha, 0x3013,
                     "Start scsi failed rval=%d for cmd=%p.\n", rval, cmd);
                 goto qc24_host_busy_free_sp;
         }
@@ -737,7 +635,8 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         return 0;
 
 qc24_host_busy_free_sp:
-        qla2x00_sp_free_dma(ha, sp);
+        qla2x00_sp_free_dma(sp);
+        mempool_free(sp, ha->srb_mempool);
 
 qc24_host_busy:
         return SCSI_MLQUEUE_HOST_BUSY;
@@ -902,6 +801,49 @@ qla2x00_wait_for_chip_reset(scsi_qla_host_t *vha)
         return return_status;
 }
 
+/*
+ * qla2x00_wait_for_loop_ready
+ *    Wait for MAX_LOOP_TIMEOUT(5 min) value for loop
+ *    to be in LOOP_READY state.
+ * Input:
+ *     ha - pointer to host adapter structure
+ *
+ * Note:
+ *    Does context switching-Release SPIN_LOCK
+ *    (if any) before calling this routine.
+ *
+ *
+ * Return:
+ *    Success (LOOP_READY) : 0
+ *    Failed  (LOOP_NOT_READY) : 1
+ */
+static inline int
+qla2x00_wait_for_loop_ready(scsi_qla_host_t *vha)
+{
+        int      return_status = QLA_SUCCESS;
+        unsigned long loop_timeout ;
+        struct qla_hw_data *ha = vha->hw;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
+
+        /* wait for 5 min at the max for loop to be ready */
+        loop_timeout = jiffies + (MAX_LOOP_TIMEOUT * HZ);
+
+        while ((!atomic_read(&base_vha->loop_down_timer) &&
+            atomic_read(&base_vha->loop_state) == LOOP_DOWN) ||
+            atomic_read(&base_vha->loop_state) != LOOP_READY) {
+                if (atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
+                        return_status = QLA_FUNCTION_FAILED;
+                        break;
+                }
+                msleep(1000);
+                if (time_after_eq(jiffies, loop_timeout)) {
+                        return_status = QLA_FUNCTION_FAILED;
+                        break;
+                }
+        }
+        return (return_status);
+}
+
 static void
 sp_get(struct srb *sp)
 {
@@ -934,10 +876,14 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         int wait = 0;
         struct qla_hw_data *ha = vha->hw;
 
+        ql_dbg(ql_dbg_taskm, vha, 0x8000,
+            "Entered %s for cmd=%p.\n", __func__, cmd);
         if (!CMD_SP(cmd))
                 return SUCCESS;
 
         ret = fc_block_scsi_eh(cmd);
+        ql_dbg(ql_dbg_taskm, vha, 0x8001,
+            "Return value of fc_block_scsi_eh=%d.\n", ret);
         if (ret != 0)
                 return ret;
         ret = SUCCESS;
@@ -953,25 +899,23 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         }
 
         ql_dbg(ql_dbg_taskm, vha, 0x8002,
-            "Aborting from RISC nexus=%ld:%d:%d sp=%p cmd=%p\n",
-            vha->host_no, id, lun, sp, cmd);
+            "Aborting sp=%p cmd=%p from RISC ", sp, cmd);
 
         /* Get a reference to the sp and drop the lock.*/
         sp_get(sp);
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         if (ha->isp_ops->abort_command(sp)) {
-                ret = FAILED;
                 ql_dbg(ql_dbg_taskm, vha, 0x8003,
-                    "Abort command mbx failed cmd=%p.\n", cmd);
+                    "Abort command mbx failed for cmd=%p.\n", cmd);
         } else {
                 ql_dbg(ql_dbg_taskm, vha, 0x8004,
-                    "Abort command mbx success cmd=%p.\n", cmd);
+                    "Abort command mbx success.\n");
                 wait = 1;
         }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        sp->done(ha, sp, 0);
+        qla2x00_sp_compl(ha, sp);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Did the command return during mailbox execution? */
@@ -982,14 +926,13 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         if (wait) {
                 if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {
                         ql_log(ql_log_warn, vha, 0x8006,
-                            "Abort handler timed out cmd=%p.\n", cmd);
+                            "Abort handler timed out for cmd=%p.\n", cmd);
                         ret = FAILED;
                 }
         }
 
         ql_log(ql_log_info, vha, 0x801c,
-            "Abort command issued nexus=%ld:%d:%d --  %d %x.\n",
-            vha->host_no, id, lun, wait, ret);
+            "Abort command issued --  %d %x.\n", wait, ret);
 
         return ret;
 }
@@ -1003,7 +946,6 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *vha, unsigned int t,
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req;
         srb_t *sp;
-        struct scsi_cmnd *cmd;
 
         status = QLA_SUCCESS;
 
@@ -1014,29 +956,28 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *vha, unsigned int t,
                 sp = req->outstanding_cmds[cnt];
                 if (!sp)
                         continue;
-                if (sp->type != SRB_SCSI_CMD)
+                if ((sp->ctx) && !IS_PROT_IO(sp))
                         continue;
                 if (vha->vp_idx != sp->fcport->vha->vp_idx)
                         continue;
                 match = 0;
-                cmd = GET_CMD_SP(sp);
                 switch (type) {
                 case WAIT_HOST:
                         match = 1;
                         break;
                 case WAIT_TARGET:
-                        match = cmd->device->id == t;
+                        match = sp->cmd->device->id == t;
                         break;
                 case WAIT_LUN:
-                        match = (cmd->device->id == t &&
-                                cmd->device->lun == l);
+                        match = (sp->cmd->device->id == t &&
+                                sp->cmd->device->lun == l);
                         break;
                 }
                 if (!match)
                         continue;
 
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                status = qla2x00_eh_wait_on_command(cmd);
+                status = qla2x00_eh_wait_on_command(sp->cmd);
                 spin_lock_irqsave(&ha->hardware_lock, flags);
         }
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -1060,15 +1001,19 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
         int err;
 
         if (!fcport) {
+                ql_log(ql_log_warn, vha, 0x8007,
+                    "fcport is NULL.\n");
                 return FAILED;
         }
 
         err = fc_block_scsi_eh(cmd);
+        ql_dbg(ql_dbg_taskm, vha, 0x8008,
+            "fc_block_scsi_eh ret=%d.\n", err);
         if (err != 0)
                 return err;
 
         ql_log(ql_log_info, vha, 0x8009,
-            "%s RESET ISSUED nexus=%ld:%d:%d cmd=%p.\n", name, vha->host_no,
+            "%s RESET ISSUED for id %d lun %d cmd=%p.\n", name,
             cmd->device->id, cmd->device->lun, cmd);
 
         err = 0;
@@ -1077,6 +1022,12 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
                     "Wait for hba online failed for cmd=%p.\n", cmd);
                 goto eh_reset_failed;
         }
+        err = 1;
+        if (qla2x00_wait_for_loop_ready(vha) != QLA_SUCCESS) {
+                ql_log(ql_log_warn, vha, 0x800b,
+                    "Wait for loop ready failed for cmd=%p.\n", cmd);
+                goto eh_reset_failed;
+        }
         err = 2;
         if (do_reset(fcport, cmd->device->lun, cmd->request->cpu + 1)
                 != QLA_SUCCESS) {
@@ -1088,21 +1039,20 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
         if (qla2x00_eh_wait_for_pending_commands(vha, cmd->device->id,
             cmd->device->lun, type) != QLA_SUCCESS) {
                 ql_log(ql_log_warn, vha, 0x800d,
-                    "wait for pending cmds failed for cmd=%p.\n", cmd);
+                    "wait for peding cmds failed for cmd=%p.\n", cmd);
                 goto eh_reset_failed;
         }
 
         ql_log(ql_log_info, vha, 0x800e,
-            "%s RESET SUCCEEDED nexus:%ld:%d:%d cmd=%p.\n", name,
-            vha->host_no, cmd->device->id, cmd->device->lun, cmd);
+            "%s RESET SUCCEEDED for id %d lun %d cmd=%p.\n", name,
+            cmd->device->id, cmd->device->lun, cmd);
 
         return SUCCESS;
 
 eh_reset_failed:
         ql_log(ql_log_info, vha, 0x800f,
-            "%s RESET FAILED: %s nexus=%ld:%d:%d cmd=%p.\n", name,
-            reset_errors[err], vha->host_no, cmd->device->id, cmd->device->lun,
-            cmd);
+            "%s RESET FAILED: %s for id %d lun %d cmd=%p.\n", name,
+            reset_errors[err], cmd->device->id, cmd->device->lun);
         return FAILED;
 }
 
@@ -1153,16 +1103,20 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
         lun = cmd->device->lun;
 
         if (!fcport) {
+                ql_log(ql_log_warn, vha, 0x8010,
+                    "fcport is NULL.\n");
                 return ret;
         }
 
         ret = fc_block_scsi_eh(cmd);
+        ql_dbg(ql_dbg_taskm, vha, 0x8011,
+            "fc_block_scsi_eh ret=%d.\n", ret);
         if (ret != 0)
                 return ret;
         ret = FAILED;
 
         ql_log(ql_log_info, vha, 0x8012,
-            "BUS RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
+            "BUS RESET ISSUED for id %d lun %d.\n", id, lun);
 
         if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
                 ql_log(ql_log_fatal, vha, 0x8013,
@@ -1170,9 +1124,10 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
                 goto eh_bus_reset_done;
         }
 
-        if (qla2x00_loop_reset(vha) == QLA_SUCCESS)
-                ret = SUCCESS;
-
+        if (qla2x00_wait_for_loop_ready(vha) == QLA_SUCCESS) {
+                if (qla2x00_loop_reset(vha) == QLA_SUCCESS)
+                        ret = SUCCESS;
+        }
         if (ret == FAILED)
                 goto eh_bus_reset_done;
 
@@ -1186,8 +1141,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
 
 eh_bus_reset_done:
         ql_log(ql_log_warn, vha, 0x802b,
-            "BUS RESET %s nexus=%ld:%d:%d.\n",
-            (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
+            "BUS RESET %s.\n", (ret == FAILED) ? "FAILED" : "SUCCEDED");
 
         return ret;
 }
@@ -1211,6 +1165,7 @@ static int
 qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 {
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
+        fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
         struct qla_hw_data *ha = vha->hw;
         int ret = FAILED;
         unsigned int id, lun;
@@ -1219,12 +1174,34 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
         id = cmd->device->id;
         lun = cmd->device->lun;
 
+        if (!fcport) {
+                ql_log(ql_log_warn, vha, 0x8016,
+                    "fcport is NULL.\n");
+                return ret;
+        }
+
+        ret = fc_block_scsi_eh(cmd);
+        ql_dbg(ql_dbg_taskm, vha, 0x8017,
+            "fc_block_scsi_eh ret=%d.\n", ret);
+        if (ret != 0)
+                return ret;
+        ret = FAILED;
+
         ql_log(ql_log_info, vha, 0x8018,
-            "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
+            "ADAPTER RESET ISSUED for id %d lun %d.\n", id, lun);
 
         if (qla2x00_wait_for_reset_ready(vha) != QLA_SUCCESS)
                 goto eh_host_reset_lock;
 
+        /*
+         * Fixme-may be dpc thread is active and processing
+         * loop_resync,so wait a while for it to
+         * be completed and then issue big hammer.Otherwise
+         * it may cause I/O failure as big hammer marks the
+         * devices as lost kicking of the port_down_timer
+         * while dpc is stuck for the mailbox to complete.
+         */
+        qla2x00_wait_for_loop_ready(vha);
         if (vha != base_vha) {
                 if (qla2x00_vp_abort_isp(vha))
                         goto eh_host_reset_lock;
@@ -1261,9 +1238,8 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
                 ret = SUCCESS;
 
 eh_host_reset_lock:
-        ql_log(ql_log_info, vha, 0x8017,
-            "ADAPTER RESET %s nexus=%ld:%d:%d.\n",
-            (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
+        qla_printk(KERN_INFO, ha, "%s: reset %s.\n", __func__,
+            (ret == FAILED) ? "failed" : "succeeded");
 
         return ret;
 }
@@ -1299,7 +1275,7 @@ qla2x00_loop_reset(scsi_qla_host_t *vha)
                 }
         }
 
-        if (ha->flags.enable_lip_full_login && !IS_CNA_CAPABLE(ha)) {
+        if (ha->flags.enable_lip_full_login && !IS_QLA8XXX_TYPE(ha)) {
                 ret = qla2x00_full_login_lip(vha);
                 if (ret != QLA_SUCCESS) {
                         ql_dbg(ql_dbg_taskm, vha, 0x802d,
@@ -1308,13 +1284,16 @@ qla2x00_loop_reset(scsi_qla_host_t *vha)
                 atomic_set(&vha->loop_state, LOOP_DOWN);
                 atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
                 qla2x00_mark_all_devices_lost(vha, 0);
+                qla2x00_wait_for_loop_ready(vha);
         }
 
         if (ha->flags.enable_lip_reset) {
                 ret = qla2x00_lip_reset(vha);
-                if (ret != QLA_SUCCESS)
+                if (ret != QLA_SUCCESS) {
                         ql_dbg(ql_dbg_taskm, vha, 0x802e,
                             "lip_reset failed (%d).\n", ret);
+                } else
+                        qla2x00_wait_for_loop_ready(vha);
         }
 
         /* Issue marker command only when we are going to start the I/O */
@@ -1329,6 +1308,7 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
         int que, cnt;
         unsigned long flags;
         srb_t *sp;
+        struct srb_ctx *ctx;
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req;
 
@@ -1341,7 +1321,31 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
                         sp = req->outstanding_cmds[cnt];
                         if (sp) {
                                 req->outstanding_cmds[cnt] = NULL;
-                                sp->done(vha, sp, res);
+                                if (!sp->ctx ||
+                                        (sp->flags & SRB_FCP_CMND_DMA_VALID) ||
+                                        IS_PROT_IO(sp)) {
+                                        sp->cmd->result = res;
+                                        qla2x00_sp_compl(ha, sp);
+                                } else {
+                                        ctx = sp->ctx;
+                                        if (ctx->type == SRB_ELS_CMD_RPT ||
+                                            ctx->type == SRB_ELS_CMD_HST ||
+                                            ctx->type == SRB_CT_CMD) {
+                                                struct fc_bsg_job *bsg_job =
+                                                    ctx->u.bsg_job;
+                                                if (bsg_job->request->msgcode
+                                                    == FC_BSG_HST_CT)
+                                                        kfree(sp->fcport);
+                                                bsg_job->req->errors = 0;
+                                                bsg_job->reply->result = res;
+                                                bsg_job->job_done(bsg_job);
+                                                kfree(sp->ctx);
+                                                mempool_free(sp,
+                                                        ha->srb_mempool);
+                                        } else {
+                                                ctx->u.iocb_cmd->free(sp);
+                                        }
+                                }
                         }
                 }
         }
@@ -1367,9 +1371,6 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
         scsi_qla_host_t *vha = shost_priv(sdev->host);
         struct req_que *req = vha->req;
 
-        if (IS_T10_PI_CAPABLE(vha->hw))
-                blk_queue_update_dma_alignment(sdev->request_queue, 0x7);
-
         if (sdev->tagged_supported)
                 scsi_activate_tcq(sdev, req->max_q_depth);
         else
@@ -1391,8 +1392,10 @@ static void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth)
                 return;
 
         ql_dbg(ql_dbg_io, fcport->vha, 0x3029,
-            "Queue depth adjusted-down to %d for nexus=%ld:%d:%d.\n",
-            sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
+            "Queue depth adjusted-down "
+            "to %d for scsi(%ld:%d:%d:%d).\n",
+            sdev->queue_depth, fcport->vha->host_no,
+            sdev->channel, sdev->id, sdev->lun);
 }
 
 static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)
@@ -1414,8 +1417,10 @@ static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)
                 scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, qdepth);
 
         ql_dbg(ql_dbg_io, vha, 0x302a,
-            "Queue depth adjusted-up to %d for nexus=%ld:%d:%d.\n",
-            sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
+            "Queue depth adjusted-up to %d for "
+            "scsi(%ld:%d:%d:%d).\n",
+            sdev->queue_depth, fcport->vha->host_no,
+            sdev->channel, sdev->id, sdev->lun);
 }
 
 static int
@@ -1539,205 +1544,6 @@ qla24xx_disable_intrs(struct qla_hw_data *ha)
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
-static int
-qla2x00_iospace_config(struct qla_hw_data *ha)
-{
-        resource_size_t pio;
-        uint16_t msix;
-        int cpus;
-
-        if (pci_request_selected_regions(ha->pdev, ha->bars,
-            QLA2XXX_DRIVER_NAME)) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x0011,
-                    "Failed to reserve PIO/MMIO regions (%s), aborting.\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-        if (!(ha->bars & 1))
-                goto skip_pio;
-
-        /* We only need PIO for Flash operations on ISP2312 v2 chips. */
-        pio = pci_resource_start(ha->pdev, 0);
-        if (pci_resource_flags(ha->pdev, 0) & IORESOURCE_IO) {
-                if (pci_resource_len(ha->pdev, 0) < MIN_IOBASE_LEN) {
-                        ql_log_pci(ql_log_warn, ha->pdev, 0x0012,
-                            "Invalid pci I/O region size (%s).\n",
-                            pci_name(ha->pdev));
-                        pio = 0;
-                }
-        } else {
-                ql_log_pci(ql_log_warn, ha->pdev, 0x0013,
-                    "Region #0 no a PIO resource (%s).\n",
-                    pci_name(ha->pdev));
-                pio = 0;
-        }
-        ha->pio_address = pio;
-        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0014,
-            "PIO address=%llu.\n",
-            (unsigned long long)ha->pio_address);
-
-skip_pio:
-        /* Use MMIO operations for all accesses. */
-        if (!(pci_resource_flags(ha->pdev, 1) & IORESOURCE_MEM)) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x0015,
-                    "Region #1 not an MMIO resource (%s), aborting.\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-        if (pci_resource_len(ha->pdev, 1) < MIN_IOBASE_LEN) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x0016,
-                    "Invalid PCI mem region size (%s), aborting.\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-
-        ha->iobase = ioremap(pci_resource_start(ha->pdev, 1), MIN_IOBASE_LEN);
-        if (!ha->iobase) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x0017,
-                    "Cannot remap MMIO (%s), aborting.\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-
-        /* Determine queue resources */
-        ha->max_req_queues = ha->max_rsp_queues = 1;
-        if ((ql2xmaxqueues <= 1 && !ql2xmultique_tag) ||
-                (ql2xmaxqueues > 1 && ql2xmultique_tag) ||
-                (!IS_QLA25XX(ha) && !IS_QLA81XX(ha)))
-                goto mqiobase_exit;
-
-        ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3),
-                        pci_resource_len(ha->pdev, 3));
-        if (ha->mqiobase) {
-                ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0018,
-                    "MQIO Base=%p.\n", ha->mqiobase);
-                /* Read MSIX vector size of the board */
-                pci_read_config_word(ha->pdev, QLA_PCI_MSIX_CONTROL, &msix);
-                ha->msix_count = msix;
-                /* Max queues are bounded by available msix vectors */
-                /* queue 0 uses two msix vectors */
-                if (ql2xmultique_tag) {
-                        cpus = num_online_cpus();
-                        ha->max_rsp_queues = (ha->msix_count - 1 > cpus) ?
-                                (cpus + 1) : (ha->msix_count - 1);
-                        ha->max_req_queues = 2;
-                } else if (ql2xmaxqueues > 1) {
-                        ha->max_req_queues = ql2xmaxqueues > QLA_MQ_SIZE ?
-                            QLA_MQ_SIZE : ql2xmaxqueues;
-                        ql_dbg_pci(ql_dbg_multiq, ha->pdev, 0xc008,
-                            "QoS mode set, max no of request queues:%d.\n",
-                            ha->max_req_queues);
-                        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0019,
-                            "QoS mode set, max no of request queues:%d.\n",
-                            ha->max_req_queues);
-                }
-                ql_log_pci(ql_log_info, ha->pdev, 0x001a,
-                    "MSI-X vector count: %d.\n", msix);
-        } else
-                ql_log_pci(ql_log_info, ha->pdev, 0x001b,
-                    "BAR 3 not enabled.\n");
-
-mqiobase_exit:
-        ha->msix_count = ha->max_rsp_queues + 1;
-        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x001c,
-            "MSIX Count:%d.\n", ha->msix_count);
-        return (0);
-
-iospace_error_exit:
-        return (-ENOMEM);
-}
-
-
-static int
-qla83xx_iospace_config(struct qla_hw_data *ha)
-{
-        uint16_t msix;
-        int cpus;
-
-        if (pci_request_selected_regions(ha->pdev, ha->bars,
-            QLA2XXX_DRIVER_NAME)) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x0117,
-                    "Failed to reserve PIO/MMIO regions (%s), aborting.\n",
-                    pci_name(ha->pdev));
-
-                goto iospace_error_exit;
-        }
-
-        /* Use MMIO operations for all accesses. */
-        if (!(pci_resource_flags(ha->pdev, 0) & IORESOURCE_MEM)) {
-                ql_log_pci(ql_log_warn, ha->pdev, 0x0118,
-                    "Invalid pci I/O region size (%s).\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-        if (pci_resource_len(ha->pdev, 0) < MIN_IOBASE_LEN) {
-                ql_log_pci(ql_log_warn, ha->pdev, 0x0119,
-                    "Invalid PCI mem region size (%s), aborting\n",
-                        pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-
-        ha->iobase = ioremap(pci_resource_start(ha->pdev, 0), MIN_IOBASE_LEN);
-        if (!ha->iobase) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x011a,
-                    "Cannot remap MMIO (%s), aborting.\n",
-                    pci_name(ha->pdev));
-                goto iospace_error_exit;
-        }
-
-        /* 64bit PCI BAR - BAR2 will correspoond to region 4 */
-        /* 83XX 26XX always use MQ type access for queues
-         * - mbar 2, a.k.a region 4 */
-        ha->max_req_queues = ha->max_rsp_queues = 1;
-        ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 4),
-                        pci_resource_len(ha->pdev, 4));
-
-        if (!ha->mqiobase) {
-                ql_log_pci(ql_log_fatal, ha->pdev, 0x011d,
-                    "BAR2/region4 not enabled\n");
-                goto mqiobase_exit;
-        }
-
-        ha->msixbase = ioremap(pci_resource_start(ha->pdev, 2),
-                        pci_resource_len(ha->pdev, 2));
-        if (ha->msixbase) {
-                /* Read MSIX vector size of the board */
-                pci_read_config_word(ha->pdev,
-                    QLA_83XX_PCI_MSIX_CONTROL, &msix);
-                ha->msix_count = msix;
-                /* Max queues are bounded by available msix vectors */
-                /* queue 0 uses two msix vectors */
-                if (ql2xmultique_tag) {
-                        cpus = num_online_cpus();
-                        ha->max_rsp_queues = (ha->msix_count - 1 > cpus) ?
-                                (cpus + 1) : (ha->msix_count - 1);
-                        ha->max_req_queues = 2;
-                } else if (ql2xmaxqueues > 1) {
-                        ha->max_req_queues = ql2xmaxqueues > QLA_MQ_SIZE ?
-                                                QLA_MQ_SIZE : ql2xmaxqueues;
-                        ql_dbg_pci(ql_dbg_multiq, ha->pdev, 0xc00c,
-                            "QoS mode set, max no of request queues:%d.\n",
-                            ha->max_req_queues);
-                        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x011b,
-                            "QoS mode set, max no of request queues:%d.\n",
-                            ha->max_req_queues);
-                }
-                ql_log_pci(ql_log_info, ha->pdev, 0x011c,
-                    "MSI-X vector count: %d.\n", msix);
-        } else
-                ql_log_pci(ql_log_info, ha->pdev, 0x011e,
-                    "BAR 1 not enabled.\n");
-
-mqiobase_exit:
-        ha->msix_count = ha->max_rsp_queues + 1;
-        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x011f,
-            "MSIX Count:%d.\n", ha->msix_count);
-        return 0;
-
-iospace_error_exit:
-        return -ENOMEM;
-}
-
 static struct isp_operations qla2100_isp_ops = {
         .pci_config             = qla2100_pci_config,
         .reset_chip             = qla2x00_reset_chip,
@@ -1772,7 +1578,6 @@ static struct isp_operations qla2100_isp_ops = {
         .get_flash_version      = qla2x00_get_flash_version,
         .start_scsi             = qla2x00_start_scsi,
         .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla2x00_iospace_config,
 };
 
 static struct isp_operations qla2300_isp_ops = {
@@ -1809,7 +1614,6 @@ static struct isp_operations qla2300_isp_ops = {
         .get_flash_version      = qla2x00_get_flash_version,
         .start_scsi             = qla2x00_start_scsi,
         .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla2x00_iospace_config,
 };
 
 static struct isp_operations qla24xx_isp_ops = {
@@ -1846,7 +1650,6 @@ static struct isp_operations qla24xx_isp_ops = {
         .get_flash_version      = qla24xx_get_flash_version,
         .start_scsi             = qla24xx_start_scsi,
         .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla2x00_iospace_config,
 };
 
 static struct isp_operations qla25xx_isp_ops = {
@@ -1883,7 +1686,6 @@ static struct isp_operations qla25xx_isp_ops = {
         .get_flash_version      = qla24xx_get_flash_version,
         .start_scsi             = qla24xx_dif_start_scsi,
         .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla2x00_iospace_config,
 };
 
 static struct isp_operations qla81xx_isp_ops = {
@@ -1914,13 +1716,12 @@ static struct isp_operations qla81xx_isp_ops = {
         .fw_dump                = qla81xx_fw_dump,
         .beacon_on              = qla24xx_beacon_on,
         .beacon_off             = qla24xx_beacon_off,
-        .beacon_blink           = qla83xx_beacon_blink,
+        .beacon_blink           = qla24xx_beacon_blink,
         .read_optrom            = qla25xx_read_optrom_data,
         .write_optrom           = qla24xx_write_optrom_data,
         .get_flash_version      = qla24xx_get_flash_version,
         .start_scsi             = qla24xx_dif_start_scsi,
         .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla2x00_iospace_config,
 };
 
 static struct isp_operations qla82xx_isp_ops = {
@@ -1932,7 +1733,7 @@ static struct isp_operations qla82xx_isp_ops = {
         .nvram_config           = qla81xx_nvram_config,
         .update_fw_options      = qla24xx_update_fw_options,
         .load_risc              = qla82xx_load_risc,
-        .pci_info_str           = qla24xx_pci_info_str,
+        .pci_info_str           = qla82xx_pci_info_str,
         .fw_version_str         = qla24xx_fw_version_str,
         .intr_handler           = qla82xx_intr_handler,
         .enable_intrs           = qla82xx_enable_intrs,
@@ -1949,52 +1750,14 @@ static struct isp_operations qla82xx_isp_ops = {
         .read_nvram             = qla24xx_read_nvram_data,
         .write_nvram            = qla24xx_write_nvram_data,
         .fw_dump                = qla24xx_fw_dump,
-        .beacon_on              = qla82xx_beacon_on,
-        .beacon_off             = qla82xx_beacon_off,
-        .beacon_blink           = NULL,
+        .beacon_on              = qla24xx_beacon_on,
+        .beacon_off             = qla24xx_beacon_off,
+        .beacon_blink           = qla24xx_beacon_blink,
         .read_optrom            = qla82xx_read_optrom_data,
         .write_optrom           = qla82xx_write_optrom_data,
         .get_flash_version      = qla24xx_get_flash_version,
         .start_scsi             = qla82xx_start_scsi,
         .abort_isp              = qla82xx_abort_isp,
-        .iospace_config         = qla82xx_iospace_config,
-};
-
-static struct isp_operations qla83xx_isp_ops = {
-        .pci_config             = qla25xx_pci_config,
-        .reset_chip             = qla24xx_reset_chip,
-        .chip_diag              = qla24xx_chip_diag,
-        .config_rings           = qla24xx_config_rings,
-        .reset_adapter          = qla24xx_reset_adapter,
-        .nvram_config           = qla81xx_nvram_config,
-        .update_fw_options      = qla81xx_update_fw_options,
-        .load_risc              = qla81xx_load_risc,
-        .pci_info_str           = qla24xx_pci_info_str,
-        .fw_version_str         = qla24xx_fw_version_str,
-        .intr_handler           = qla24xx_intr_handler,
-        .enable_intrs           = qla24xx_enable_intrs,
-        .disable_intrs          = qla24xx_disable_intrs,
-        .abort_command          = qla24xx_abort_command,
-        .target_reset           = qla24xx_abort_target,
-        .lun_reset              = qla24xx_lun_reset,
-        .fabric_login           = qla24xx_login_fabric,
-        .fabric_logout          = qla24xx_fabric_logout,
-        .calc_req_entries       = NULL,
-        .build_iocbs            = NULL,
-        .prep_ms_iocb           = qla24xx_prep_ms_iocb,
-        .prep_ms_fdmi_iocb      = qla24xx_prep_ms_fdmi_iocb,
-        .read_nvram             = NULL,
-        .write_nvram            = NULL,
-        .fw_dump                = qla83xx_fw_dump,
-        .beacon_on              = qla24xx_beacon_on,
-        .beacon_off             = qla24xx_beacon_off,
-        .beacon_blink           = qla83xx_beacon_blink,
-        .read_optrom            = qla25xx_read_optrom_data,
-        .write_optrom           = qla24xx_write_optrom_data,
-        .get_flash_version      = qla24xx_get_flash_version,
-        .start_scsi             = qla24xx_dif_start_scsi,
-        .abort_isp              = qla2x00_abort_isp,
-        .iospace_config         = qla83xx_iospace_config,
 };
 
 static inline void
@@ -2091,22 +1854,6 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
                 /* Initialize 82XX ISP flags */
                 qla82xx_init_flags(ha);
                 break;
-        case PCI_DEVICE_ID_QLOGIC_ISP2031:
-                ha->device_type |= DT_ISP2031;
-                ha->device_type |= DT_ZIO_SUPPORTED;
-                ha->device_type |= DT_FWI2;
-                ha->device_type |= DT_IIDMA;
-                ha->device_type |= DT_T10_PI;
-                ha->fw_srisc_address = RISC_START_ADDRESS_2400;
-                break;
-        case PCI_DEVICE_ID_QLOGIC_ISP8031:
-                ha->device_type |= DT_ISP8031;
-                ha->device_type |= DT_ZIO_SUPPORTED;
-                ha->device_type |= DT_FWI2;
-                ha->device_type |= DT_IIDMA;
-                ha->device_type |= DT_T10_PI;
-                ha->fw_srisc_address = RISC_START_ADDRESS_2400;
-                break;
         }
 
         if (IS_QLA82XX(ha))
@@ -2120,10 +1867,121 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
         else
                 ha->flags.port0 = 0;
         ql_dbg_pci(ql_dbg_init, ha->pdev, 0x000b,
-            "device_type=0x%x port=%d fw_srisc_address=0x%x.\n",
+            "device_type=0x%x port=%d fw_srisc_address=%p.\n",
             ha->device_type, ha->flags.port0, ha->fw_srisc_address);
 }
 
+static int
+qla2x00_iospace_config(struct qla_hw_data *ha)
+{
+        resource_size_t pio;
+        uint16_t msix;
+        int cpus;
+
+        if (IS_QLA82XX(ha))
+                return qla82xx_iospace_config(ha);
+
+        if (pci_request_selected_regions(ha->pdev, ha->bars,
+            QLA2XXX_DRIVER_NAME)) {
+                ql_log_pci(ql_log_fatal, ha->pdev, 0x0011,
+                    "Failed to reserve PIO/MMIO regions (%s), aborting.\n",
+                    pci_name(ha->pdev));
+                goto iospace_error_exit;
+        }
+        if (!(ha->bars & 1))
+                goto skip_pio;
+
+        /* We only need PIO for Flash operations on ISP2312 v2 chips. */
+        pio = pci_resource_start(ha->pdev, 0);
+        if (pci_resource_flags(ha->pdev, 0) & IORESOURCE_IO) {
+                if (pci_resource_len(ha->pdev, 0) < MIN_IOBASE_LEN) {
+                        ql_log_pci(ql_log_warn, ha->pdev, 0x0012,
+                            "Invalid pci I/O region size (%s).\n",
+                            pci_name(ha->pdev));
+                        pio = 0;
+                }
+        } else {
+                ql_log_pci(ql_log_warn, ha->pdev, 0x0013,
+                    "Region #0 no a PIO resource (%s).\n",
+                    pci_name(ha->pdev));
+                pio = 0;
+        }
+        ha->pio_address = pio;
+        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0014,
+            "PIO address=%p.\n",
+            ha->pio_address);
+
+skip_pio:
+        /* Use MMIO operations for all accesses. */
+        if (!(pci_resource_flags(ha->pdev, 1) & IORESOURCE_MEM)) {
+                ql_log_pci(ql_log_fatal, ha->pdev, 0x0015,
+                    "Region #1 not an MMIO resource (%s), aborting.\n",
+                    pci_name(ha->pdev));
+                goto iospace_error_exit;
+        }
+        if (pci_resource_len(ha->pdev, 1) < MIN_IOBASE_LEN) {
+                ql_log_pci(ql_log_fatal, ha->pdev, 0x0016,
+                    "Invalid PCI mem region size (%s), aborting.\n",
+                    pci_name(ha->pdev));
+                goto iospace_error_exit;
+        }
+
+        ha->iobase = ioremap(pci_resource_start(ha->pdev, 1), MIN_IOBASE_LEN);
+        if (!ha->iobase) {
+                ql_log_pci(ql_log_fatal, ha->pdev, 0x0017,
+                    "Cannot remap MMIO (%s), aborting.\n",
+                    pci_name(ha->pdev));
+                goto iospace_error_exit;
+        }
+
+        /* Determine queue resources */
+        ha->max_req_queues = ha->max_rsp_queues = 1;
+        if ((ql2xmaxqueues <= 1 && !ql2xmultique_tag) ||
+                (ql2xmaxqueues > 1 && ql2xmultique_tag) ||
+                (!IS_QLA25XX(ha) && !IS_QLA81XX(ha)))
+                goto mqiobase_exit;
+
+        ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3),
+                        pci_resource_len(ha->pdev, 3));
+        if (ha->mqiobase) {
+                ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0018,
+                    "MQIO Base=%p.\n", ha->mqiobase);
+                /* Read MSIX vector size of the board */
+                pci_read_config_word(ha->pdev, QLA_PCI_MSIX_CONTROL, &msix);
+                ha->msix_count = msix;
+                /* Max queues are bounded by available msix vectors */
+                /* queue 0 uses two msix vectors */
+                if (ql2xmultique_tag) {
+                        cpus = num_online_cpus();
+                        ha->max_rsp_queues = (ha->msix_count - 1 > cpus) ?
+                                (cpus + 1) : (ha->msix_count - 1);
+                        ha->max_req_queues = 2;
+                } else if (ql2xmaxqueues > 1) {
+                        ha->max_req_queues = ql2xmaxqueues > QLA_MQ_SIZE ?
+                            QLA_MQ_SIZE : ql2xmaxqueues;
+                        ql_dbg_pci(ql_dbg_multiq, ha->pdev, 0xc008,
+                            "QoS mode set, max no of request queues:%d.\n",
+                            ha->max_req_queues);
+                        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0019,
+                            "QoS mode set, max no of request queues:%d.\n",
+                            ha->max_req_queues);
+                }
+                ql_log_pci(ql_log_info, ha->pdev, 0x001a,
+                    "MSI-X vector count: %d.\n", msix);
+        } else
+                ql_log_pci(ql_log_info, ha->pdev, 0x001b,
+                    "BAR 3 not enabled.\n");
+
+mqiobase_exit:
+        ha->msix_count = ha->max_rsp_queues + 1;
+        ql_dbg_pci(ql_dbg_init, ha->pdev, 0x001c,
+            "MSIX Count:%d.\n", ha->msix_count);
+        return (0);
+
+iospace_error_exit:
+        return (-ENOMEM);
+}
+
 static void
 qla2xxx_scan_start(struct Scsi_Host *shost)
 {
@@ -2154,7 +2012,7 @@ qla2xxx_scan_finished(struct Scsi_Host *shost, unsigned long time)
 /*
  * PCI driver interface
  */
-static int
+static int __devinit
 qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         int     ret = -ENODEV;
@@ -2162,9 +2020,9 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         scsi_qla_host_t *base_vha = NULL;
         struct qla_hw_data *ha;
         char pci_info[30];
-        char fw_str[30], wq_name[30];
+        char fw_str[30];
         struct scsi_host_template *sht;
-        int bars, mem_only = 0;
+        int bars, max_id, mem_only = 0;
         uint16_t req_length = 0, rsp_length = 0;
         struct req_que *req = NULL;
         struct rsp_que *rsp = NULL;
@@ -2178,9 +2036,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432 ||
             pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
             pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8001 ||
-            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8021 ||
-            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2031 ||
-            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8031) {
+            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8021) {
                 bars = pci_select_bars(pdev, IORESOURCE_MEM);
                 mem_only = 1;
                 ql_dbg_pci(ql_dbg_init, pdev, 0x0007,
@@ -2209,31 +2065,38 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ql_dbg_pci(ql_dbg_init, pdev, 0x000a,
             "Memory allocated for ha=%p.\n", ha);
         ha->pdev = pdev;
-        ha->tgt.enable_class_2 = ql2xenableclass2;
 
         /* Clear our data area */
         ha->bars = bars;
         ha->mem_only = mem_only;
         spin_lock_init(&ha->hardware_lock);
         spin_lock_init(&ha->vport_slock);
-        mutex_init(&ha->selflogin_lock);
 
         /* Set ISP-type information. */
         qla2x00_set_isp_flags(ha);
 
         /* Set EEH reset type to fundamental if required by hba */
-        if (IS_QLA24XX(ha) || IS_QLA25XX(ha) || IS_QLA81XX(ha) ||
-            IS_QLA83XX(ha))
+        if ( IS_QLA24XX(ha) || IS_QLA25XX(ha) || IS_QLA81XX(ha)) {
                 pdev->needs_freset = 1;
+        }
 
+        /* Configure PCI I/O space */
+        ret = qla2x00_iospace_config(ha);
+        if (ret)
+                goto probe_hw_failed;
+
+        ql_log_pci(ql_log_info, pdev, 0x001d,
+            "Found an ISP%04X irq %d iobase 0x%p.\n",
+            pdev->device, pdev->irq, ha->iobase);
         ha->prev_topology = 0;
         ha->init_cb_size = sizeof(init_cb_t);
         ha->link_data_rate = PORT_SPEED_UNKNOWN;
         ha->optrom_size = OPTROM_SIZE_2300;
 
         /* Assign ISP specific operations. */
+        max_id = MAX_TARGETS_2200;
         if (IS_QLA2100(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2100;
+                max_id = MAX_TARGETS_2100;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT_2100;
                 req_length = REQUEST_ENTRY_CNT_2100;
                 rsp_length = RESPONSE_ENTRY_CNT_2100;
@@ -2245,8 +2108,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_data_off = ~0;
                 ha->isp_ops = &qla2100_isp_ops;
         } else if (IS_QLA2200(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2100;
-                ha->mbx_count = MAILBOX_REGISTER_COUNT_2200;
+                ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_2200;
                 rsp_length = RESPONSE_ENTRY_CNT_2100;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2100;
@@ -2257,7 +2119,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_data_off = ~0;
                 ha->isp_ops = &qla2100_isp_ops;
         } else if (IS_QLA23XX(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2100;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_2200;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
@@ -2271,11 +2132,9 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_data_off = ~0;
                 ha->isp_ops = &qla2300_isp_ops;
         } else if (IS_QLA24XX_TYPE(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2400;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_24XX;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
-                ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct mid_init_cb_24xx);
                 ha->gid_list_info_size = 8;
@@ -2287,11 +2146,9 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_conf_off = FARX_ACCESS_NVRAM_CONF;
                 ha->nvram_data_off = FARX_ACCESS_NVRAM_DATA;
         } else if (IS_QLA25XX(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2400;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_24XX;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
-                ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct mid_init_cb_24xx);
                 ha->gid_list_info_size = 8;
@@ -2303,7 +2160,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_conf_off = FARX_ACCESS_NVRAM_CONF;
                 ha->nvram_data_off = FARX_ACCESS_NVRAM_DATA;
         } else if (IS_QLA81XX(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2400;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_24XX;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
@@ -2318,7 +2174,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_conf_off = ~0;
                 ha->nvram_data_off = ~0;
         } else if (IS_QLA82XX(ha)) {
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2400;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_82XX;
                 rsp_length = RESPONSE_ENTRY_CNT_82XX;
@@ -2332,46 +2187,19 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->flash_data_off = FARX_ACCESS_FLASH_DATA;
                 ha->nvram_conf_off = FARX_ACCESS_NVRAM_CONF;
                 ha->nvram_data_off = FARX_ACCESS_NVRAM_DATA;
-        } else if (IS_QLA83XX(ha)) {
-                ha->portnum = PCI_FUNC(ha->pdev->devfn);
-                ha->max_fibre_devices = MAX_FIBRE_DEVICES_2400;
-                ha->mbx_count = MAILBOX_REGISTER_COUNT;
-                req_length = REQUEST_ENTRY_CNT_24XX;
-                rsp_length = RESPONSE_ENTRY_CNT_2300;
-                ha->max_loop_id = SNS_LAST_LOOP_ID_2300;
-                ha->init_cb_size = sizeof(struct mid_init_cb_81xx);
-                ha->gid_list_info_size = 8;
-                ha->optrom_size = OPTROM_SIZE_83XX;
-                ha->nvram_npiv_size = QLA_MAX_VPORTS_QLA25XX;
-                ha->isp_ops = &qla83xx_isp_ops;
-                ha->flash_conf_off = FARX_ACCESS_FLASH_CONF_81XX;
-                ha->flash_data_off = FARX_ACCESS_FLASH_DATA_81XX;
-                ha->nvram_conf_off = ~0;
-                ha->nvram_data_off = ~0;
         }
-
         ql_dbg_pci(ql_dbg_init, pdev, 0x001e,
             "mbx_count=%d, req_length=%d, "
             "rsp_length=%d, max_loop_id=%d, init_cb_size=%d, "
-            "gid_list_info_size=%d, optrom_size=%d, nvram_npiv_size=%d, "
-            "max_fibre_devices=%d.\n",
+            "gid_list_info_size=%d, optrom_size=%d, nvram_npiv_size=%d, .\n",
             ha->mbx_count, req_length, rsp_length, ha->max_loop_id,
             ha->init_cb_size, ha->gid_list_info_size, ha->optrom_size,
-            ha->nvram_npiv_size, ha->max_fibre_devices);
+            ha->nvram_npiv_size);
         ql_dbg_pci(ql_dbg_init, pdev, 0x001f,
             "isp_ops=%p, flash_conf_off=%d, "
             "flash_data_off=%d, nvram_conf_off=%d, nvram_data_off=%d.\n",
             ha->isp_ops, ha->flash_conf_off, ha->flash_data_off,
             ha->nvram_conf_off, ha->nvram_data_off);
-
-        /* Configure PCI I/O space */
-        ret = ha->isp_ops->iospace_config(ha);
-        if (ret)
-                goto iospace_config_failed;
-
-        ql_log_pci(ql_log_info, pdev, 0x001d,
-            "Found an ISP%04X irq %d iobase 0x%p.\n",
-            pdev->device, pdev->irq, ha->iobase);
         mutex_init(&ha->vport_lock);
         init_completion(&ha->mbx_cmd_comp);
         complete(&ha->mbx_cmd_comp);
@@ -2431,7 +2259,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             "mgmt_svr_loop_id=%d, sg_tablesize=%d.\n",
             host->can_queue, base_vha->req,
             base_vha->mgmt_svr_loop_id, host->sg_tablesize);
-        host->max_id = ha->max_fibre_devices;
+        host->max_id = max_id;
+        host->this_id = 255;
         host->cmd_per_lun = 3;
         host->unique_id = host->host_no;
         if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif)
@@ -2446,22 +2275,11 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ql_dbg(ql_dbg_init, base_vha, 0x0033,
             "max_id=%d this_id=%d "
             "cmd_per_len=%d unique_id=%d max_cmd_len=%d max_channel=%d "
-            "max_lun=%d transportt=%p, vendor_id=%llu.\n", host->max_id,
+            "max_lun=%d transportt=%p, vendor_id=%d.\n", host->max_id,
             host->this_id, host->cmd_per_lun, host->unique_id,
             host->max_cmd_len, host->max_channel, host->max_lun,
             host->transportt, sht->vendor_id);
 
-que_init:
-        /* Alloc arrays of request and response ring ptrs */
-        if (!qla2x00_alloc_queues(ha, req, rsp)) {
-                ql_log(ql_log_fatal, base_vha, 0x003d,
-                    "Failed to allocate memory for queue pointers..."
-                    "aborting.\n");
-                goto probe_init_failed;
-        }
-
-        qlt_probe_one_stage1(base_vha, ha);
-
         /* Set up the irqs */
         ret = qla2x00_request_irqs(ha, rsp);
         if (ret)
@@ -2469,16 +2287,26 @@ que_init:
 
         pci_save_state(pdev);
 
-        /* Assign back pointers */
+        /* Alloc arrays of request and response ring ptrs */
+que_init:
+        if (!qla2x00_alloc_queues(ha)) {
+                ql_log(ql_log_fatal, base_vha, 0x003d,
+                    "Failed to allocate memory for queue pointers.. aborting.\n");
+                goto probe_init_failed;
+        }
+
+        ha->rsp_q_map[0] = rsp;
+        ha->req_q_map[0] = req;
         rsp->req = req;
         req->rsp = rsp;
-
+        set_bit(0, ha->req_qid_map);
+        set_bit(0, ha->rsp_qid_map);
         /* FWI2-capable only. */
         req->req_q_in = &ha->iobase->isp24.req_q_in;
         req->req_q_out = &ha->iobase->isp24.req_q_out;
         rsp->rsp_q_in = &ha->iobase->isp24.rsp_q_in;
         rsp->rsp_q_out = &ha->iobase->isp24.rsp_q_out;
-        if (ha->mqenable || IS_QLA83XX(ha)) {
+        if (ha->mqenable) {
                 req->req_q_in = &ha->mqiobase->isp25mq.req_q_in;
                 req->req_q_out = &ha->mqiobase->isp25mq.req_q_out;
                 rsp->rsp_q_in = &ha->mqiobase->isp25mq.rsp_q_in;
@@ -2514,7 +2342,7 @@ que_init:
                 if (IS_QLA82XX(ha)) {
                         qla82xx_idc_lock(ha);
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                                QLA8XXX_DEV_FAILED);
+                                QLA82XX_DEV_FAILED);
                         qla82xx_idc_unlock(ha);
                         ql_log(ql_log_fatal, base_vha, 0x00d7,
                             "HW State: FAILED.\n");
@@ -2549,28 +2377,6 @@ que_init:
         ql_dbg(ql_dbg_init, base_vha, 0x00ee,
             "DPC thread started successfully.\n");
 
-        /*
-         * If we're not coming up in initiator mode, we might sit for
-         * a while without waking up the dpc thread, which leads to a
-         * stuck process warning.  So just kick the dpc once here and
-         * let the kthread start (and go back to sleep in qla2x00_do_dpc).
-         */
-        qla2xxx_wake_dpc(base_vha);
-
-        if (IS_QLA8031(ha) || IS_MCTP_CAPABLE(ha)) {
-                sprintf(wq_name, "qla2xxx_%lu_dpc_lp_wq", base_vha->host_no);
-                ha->dpc_lp_wq = create_singlethread_workqueue(wq_name);
-                INIT_WORK(&ha->idc_aen, qla83xx_service_idc_aen);
-
-                sprintf(wq_name, "qla2xxx_%lu_dpc_hp_wq", base_vha->host_no);
-                ha->dpc_hp_wq = create_singlethread_workqueue(wq_name);
-                INIT_WORK(&ha->nic_core_reset, qla83xx_nic_core_reset_work);
-                INIT_WORK(&ha->idc_state_handler,
-                    qla83xx_idc_state_handler_work);
-                INIT_WORK(&ha->nic_core_unrecoverable,
-                    qla83xx_nic_core_unrecoverable_work);
-        }
-
 skip_dpc:
         list_add_tail(&base_vha->list, &ha->vp_list);
         base_vha->host->irq = ha->pdev->irq;
@@ -2586,7 +2392,7 @@ skip_dpc:
 
         if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
                 if (ha->fw_attributes & BIT_4) {
-                        int prot = 0, guard;
+                        int prot = 0;
                         base_vha->flags.difdix_supported = 1;
                         ql_dbg(ql_dbg_init, base_vha, 0x00f1,
                             "Registering for DIF/DIX type 1 and 3 protection.\n");
@@ -2599,14 +2405,7 @@ skip_dpc:
                             | SHOST_DIX_TYPE1_PROTECTION
                             | SHOST_DIX_TYPE2_PROTECTION
                             | SHOST_DIX_TYPE3_PROTECTION);
-
-                        guard = SHOST_DIX_GUARD_CRC;
-
-                        if (IS_PI_IPGUARD_CAPABLE(ha) &&
-                            (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha)))
-                                guard |= SHOST_DIX_GUARD_IP;
-
-                        scsi_host_set_guard(host, guard);
+                        scsi_host_set_guard(host, SHOST_DIX_GUARD_CRC);
                 } else
                         base_vha->flags.difdix_supported = 0;
         }
@@ -2623,11 +2422,7 @@ skip_dpc:
         ql_dbg(ql_dbg_init, base_vha, 0x00f2,
             "Init done and hba is online.\n");
 
-        if (qla_ini_mode_enabled(base_vha))
-                scsi_scan_host(host);
-        else
-                ql_dbg(ql_dbg_init, base_vha, 0x0122,
-                        "skipping scsi_scan_host() for non-initiator port\n");
+        scsi_scan_host(host);
 
         qla2x00_alloc_sysfs_attr(base_vha);
 
@@ -2635,6 +2430,9 @@ skip_dpc:
 
         qla2x00_dfs_setup(base_vha);
 
+        ql_log(ql_log_info, base_vha, 0x00fa,
+            "QLogic Fibre Channed HBA Driver: %s.\n",
+            qla2x00_version_str);
         ql_log(ql_log_info, base_vha, 0x00fb,
             "QLogic %s - %s.\n",
             ha->model_number, ha->model_desc ? ha->model_desc : "");
@@ -2645,17 +2443,11 @@ skip_dpc:
             base_vha->host_no,
             ha->isp_ops->fw_version_str(base_vha, fw_str));
 
-        qlt_add_target(ha, base_vha);
-
         return 0;
 
 probe_init_failed:
         qla2x00_free_req_que(ha, req);
-        ha->req_q_map[0] = NULL;
-        clear_bit(0, ha->req_qid_map);
         qla2x00_free_rsp_que(ha, rsp);
-        ha->rsp_q_map[0] = NULL;
-        clear_bit(0, ha->rsp_qid_map);
         ha->max_req_queues = ha->max_rsp_queues = 0;
 
 probe_failed:
@@ -2678,11 +2470,7 @@ probe_hw_failed:
                 qla82xx_idc_lock(ha);
                 qla82xx_clear_drv_active(ha);
                 qla82xx_idc_unlock(ha);
-        }
-iospace_config_failed:
-        if (IS_QLA82XX(ha)) {
-                if (!ha->nx_pcibase)
-                        iounmap((device_reg_t __iomem *)ha->nx_pcibase);
+                iounmap((device_reg_t __iomem *)ha->nx_pcibase);
                 if (!ql2xdbwr)
                         iounmap((device_reg_t __iomem *)ha->nxdb_wr_ptr);
         } else {
@@ -2699,22 +2487,6 @@ probe_out:
 }
 
 static void
-qla2x00_stop_dpc_thread(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct task_struct *t = ha->dpc_thread;
-
-        if (ha->dpc_thread == NULL)
-                return;
-        /*
-         * qla2xxx_wake_dpc checks for ->dpc_thread
-         * so we need to zero it out.
-         */
-        ha->dpc_thread = NULL;
-        kthread_stop(t);
-}
-
-static void
 qla2x00_shutdown(struct pci_dev *pdev)
 {
         scsi_qla_host_t *vha;
@@ -2757,19 +2529,9 @@ qla2x00_remove_one(struct pci_dev *pdev)
         struct qla_hw_data  *ha;
         unsigned long flags;
 
-        /*
-         * If the PCI device is disabled that means that probe failed and any
-         * resources should be have cleaned up on probe exit.
-         */
-        if (!atomic_read(&pdev->enable_cnt))
-                return;
-
         base_vha = pci_get_drvdata(pdev);
         ha = base_vha->hw;
 
-        ha->flags.host_shutting_down = 1;
-
-        set_bit(UNLOADING, &base_vha->dpc_flags);
         mutex_lock(&ha->vport_lock);
         while (ha->cur_vport_count) {
                 struct Scsi_Host *scsi_host;
@@ -2791,13 +2553,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
         }
         mutex_unlock(&ha->vport_lock);
 
-        if (IS_QLA8031(ha)) {
-                ql_dbg(ql_dbg_p3p, base_vha, 0xb07e,
-                    "Clearing fcoe driver presence.\n");
-                if (qla83xx_clear_drv_presence(base_vha) != QLA_SUCCESS)
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb079,
-                            "Error while clearing DRV-Presence.\n");
-        }
+        set_bit(UNLOADING, &base_vha->dpc_flags);
 
         qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT << 16);
 
@@ -2818,21 +2574,6 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 ha->wq = NULL;
         }
 
-        /* Cancel all work and destroy DPC workqueues */
-        if (ha->dpc_lp_wq) {
-                cancel_work_sync(&ha->idc_aen);
-                destroy_workqueue(ha->dpc_lp_wq);
-                ha->dpc_lp_wq = NULL;
-        }
-
-        if (ha->dpc_hp_wq) {
-                cancel_work_sync(&ha->nic_core_reset);
-                cancel_work_sync(&ha->idc_state_handler);
-                cancel_work_sync(&ha->nic_core_unrecoverable);
-                destroy_workqueue(ha->dpc_hp_wq);
-                ha->dpc_hp_wq = NULL;
-        }
-
         /* Kill the kernel thread for this host */
         if (ha->dpc_thread) {
                 struct task_struct *t = ha->dpc_thread;
@@ -2844,7 +2585,6 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 ha->dpc_thread = NULL;
                 kthread_stop(t);
         }
-        qlt_remove_target(ha, base_vha);
 
         qla2x00_free_sysfs_attr(base_vha);
 
@@ -2870,9 +2610,6 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
                 if (ha->mqiobase)
                         iounmap(ha->mqiobase);
-
-                if (IS_QLA83XX(ha) && ha->msixbase)
-                        iounmap(ha->msixbase);
         }
 
         pci_release_selected_regions(ha->pdev, ha->bars);
@@ -2896,9 +2633,20 @@ qla2x00_free_device(scsi_qla_host_t *vha)
         if (vha->timer_active)
                 qla2x00_stop_timer(vha);
 
-        qla2x00_stop_dpc_thread(vha);
+        /* Kill the kernel thread for this host */
+        if (ha->dpc_thread) {
+                struct task_struct *t = ha->dpc_thread;
+
+                /*
+                 * qla2xxx_wake_dpc checks for ->dpc_thread
+                 * so we need to zero it out.
+                 */
+                ha->dpc_thread = NULL;
+                kthread_stop(t);
+        }
 
         qla25xx_delete_queues(vha);
+
         if (ha->flags.fce_enabled)
                 qla2x00_disable_fce_trace(vha, NULL, NULL);
 
@@ -2922,8 +2670,6 @@ qla2x00_free_device(scsi_qla_host_t *vha)
 
         qla2x00_mem_free(ha);
 
-        qla82xx_md_free(vha);
-
         qla2x00_free_queues(ha);
 }
 
@@ -2933,7 +2679,6 @@ void qla2x00_free_fcports(struct scsi_qla_host *vha)
 
         list_for_each_entry_safe(fcport, tfcport, &vha->vp_fcports, list) {
                 list_del(&fcport->list);
-                qla2x00_clear_loop_id(fcport);
                 kfree(fcport);
                 fcport = NULL;
         }
@@ -2958,10 +2703,8 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
                 spin_unlock_irqrestore(vha->host->host_lock, flags);
                 set_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
                 qla2xxx_wake_dpc(base_vha);
-        } else {
+        } else
                 fc_remote_port_delete(rport);
-                qlt_fc_port_deleted(vha, fcport);
-        }
 }
 
 /*
@@ -2977,7 +2720,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport,
     int do_login, int defer)
 {
         if (atomic_read(&fcport->state) == FCS_ONLINE &&
-            vha->vp_idx == fcport->vha->vp_idx) {
+            vha->vp_idx == fcport->vp_idx) {
                 qla2x00_set_fcport_state(fcport, FCS_DEVICE_LOST);
                 qla2x00_schedule_rport_del(vha, fcport, defer);
         }
@@ -3026,7 +2769,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
         fc_port_t *fcport;
 
         list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx)
+                if (vha->vp_idx != 0 && vha->vp_idx != fcport->vp_idx)
                         continue;
 
                 /*
@@ -3039,7 +2782,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
                         qla2x00_set_fcport_state(fcport, FCS_DEVICE_LOST);
                         if (defer)
                                 qla2x00_schedule_rport_del(vha, fcport, defer);
-                        else if (vha->vp_idx == fcport->vha->vp_idx)
+                        else if (vha->vp_idx == fcport->vp_idx)
                                 qla2x00_schedule_rport_del(vha, fcport, defer);
                 }
         }
@@ -3064,13 +2807,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
         if (!ha->init_cb)
                 goto fail;
 
-        if (qlt_mem_alloc(ha) < 0)
-                goto fail_free_init_cb;
-
-        ha->gid_list = dma_alloc_coherent(&ha->pdev->dev,
-                qla2x00_gid_list_size(ha), &ha->gid_list_dma, GFP_KERNEL);
+        ha->gid_list = dma_alloc_coherent(&ha->pdev->dev, GID_LIST_SIZE,
+                &ha->gid_list_dma, GFP_KERNEL);
         if (!ha->gid_list)
-                goto fail_free_tgt_mem;
+                goto fail_free_init_cb;
 
         ha->srb_mempool = mempool_create_slab_pool(SRB_MIN_REQ, srb_cachep);
         if (!ha->srb_mempool)
@@ -3139,7 +2879,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
                 if (!ha->sns_cmd)
                         goto fail_dma_pool;
                 ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0026,
-                    "sns_cmd: %p.\n", ha->sns_cmd);
+                    "sns_cmd.\n", ha->sns_cmd);
         } else {
         /* Get consistent memory allocated for MS IOCB */
                 ha->ms_iocb = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
@@ -3209,7 +2949,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
                 ha->npiv_info = NULL;
 
         /* Get consistent memory allocated for EX-INIT-CB. */
-        if (IS_CNA_CAPABLE(ha) || IS_QLA2031(ha)) {
+        if (IS_QLA8XXX_TYPE(ha)) {
                 ha->ex_init_cb = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
                     &ha->ex_init_cb_dma);
                 if (!ha->ex_init_cb)
@@ -3231,18 +2971,6 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
         }
 
         INIT_LIST_HEAD(&ha->vp_list);
-
-        /* Allocate memory for our loop_id bitmap */
-        ha->loop_id_map = kzalloc(BITS_TO_LONGS(LOOPID_MAP_SIZE) * sizeof(long),
-            GFP_KERNEL);
-        if (!ha->loop_id_map)
-                goto fail_async_pd;
-        else {
-                qla2x00_set_reserved_loop_ids(ha);
-                ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0123,
-                    "loop_id_map=%p. \n", ha->loop_id_map);
-        }
-
         return 1;
 
 fail_async_pd:
@@ -3295,13 +3023,10 @@ fail_free_srb_mempool:
         mempool_destroy(ha->srb_mempool);
         ha->srb_mempool = NULL;
 fail_free_gid_list:
-        dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
-        ha->gid_list,
+        dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list,
         ha->gid_list_dma);
         ha->gid_list = NULL;
         ha->gid_list_dma = 0;
-fail_free_tgt_mem:
-        qlt_mem_free(ha);
 fail_free_init_cb:
         dma_free_coherent(&ha->pdev->dev, ha->init_cb_size, ha->init_cb,
         ha->init_cb_dma);
@@ -3354,10 +3079,6 @@ qla2x00_mem_free(struct qla_hw_data *ha)
 {
         qla2x00_free_fw_dump(ha);
 
-        if (ha->mctp_dump)
-                dma_free_coherent(&ha->pdev->dev, MCTP_DUMP_SIZE, ha->mctp_dump,
-                    ha->mctp_dump_dma);
-
         if (ha->srb_mempool)
                 mempool_destroy(ha->srb_mempool);
 
@@ -3380,6 +3101,9 @@ qla2x00_mem_free(struct qla_hw_data *ha)
         if (ha->sfp_data)
                 dma_pool_free(ha->s_dma_pool, ha->sfp_data, ha->sfp_data_dma);
 
+        if (ha->edc_data)
+                dma_pool_free(ha->s_dma_pool, ha->edc_data, ha->edc_data_dma);
+
         if (ha->ms_iocb)
                 dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma);
 
@@ -3394,8 +3118,8 @@ qla2x00_mem_free(struct qla_hw_data *ha)
                 dma_pool_destroy(ha->s_dma_pool);
 
         if (ha->gid_list)
-                dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
-                ha->gid_list, ha->gid_list_dma);
+                dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list,
+                ha->gid_list_dma);
 
         if (IS_QLA82XX(ha)) {
                 if (!list_empty(&ha->gbl_dsd_list)) {
@@ -3421,16 +3145,12 @@ qla2x00_mem_free(struct qla_hw_data *ha)
         if (ha->ctx_mempool)
                 mempool_destroy(ha->ctx_mempool);
 
-        qlt_mem_free(ha);
-
         if (ha->init_cb)
                 dma_free_coherent(&ha->pdev->dev, ha->init_cb_size,
                         ha->init_cb, ha->init_cb_dma);
         vfree(ha->optrom_buffer);
         kfree(ha->nvram);
         kfree(ha->npiv_info);
-        kfree(ha->swl);
-        kfree(ha->loop_id_map);
 
         ha->srb_mempool = NULL;
         ha->ctx_mempool = NULL;
@@ -3453,10 +3173,6 @@ qla2x00_mem_free(struct qla_hw_data *ha)
 
         ha->gid_list = NULL;
         ha->gid_list_dma = 0;
-
-        ha->tgt.atio_ring = NULL;
-        ha->tgt.atio_dma = 0;
-        ha->tgt.tgt_vp_map = NULL;
 }
 
 struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
@@ -3723,24 +3439,9 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                                                 continue;
                                         /* Attempt a retry. */
                                         status = 1;
-                                } else {
+                                } else
                                         status = qla2x00_fabric_login(vha,
                                             fcport, &next_loopid);
-                                        if (status ==  QLA_SUCCESS) {
-                                                int status2;
-                                                uint8_t opts;
-
-                                                opts = 0;
-                                                if (fcport->flags &
-                                                    FCF_FCP2_DEVICE)
-                                                        opts |= BIT_1;
-                                                status2 =
-                                                    qla2x00_get_port_database(
-                                                        vha, fcport, opts);
-                                                if (status2 != QLA_SUCCESS)
-                                                        status = 1;
-                                        }
-                                }
                         } else
                                 status = qla2x00_local_device_login(vha,
                                                                 fcport);
@@ -3765,651 +3466,13 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                         }
 
                         if (fcport->login_retry == 0 && status != QLA_SUCCESS)
-                                qla2x00_clear_loop_id(fcport);
+                                fcport->loop_id = FC_NO_LOOP_ID;
                 }
                 if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
                         break;
         }
 }
 
-/* Schedule work on any of the dpc-workqueues */
-void
-qla83xx_schedule_work(scsi_qla_host_t *base_vha, int work_code)
-{
-        struct qla_hw_data *ha = base_vha->hw;
-
-        switch (work_code) {
-        case MBA_IDC_AEN: /* 0x8200 */
-                if (ha->dpc_lp_wq)
-                        queue_work(ha->dpc_lp_wq, &ha->idc_aen);
-                break;
-
-        case QLA83XX_NIC_CORE_RESET: /* 0x1 */
-                if (!ha->flags.nic_core_reset_hdlr_active) {
-                        if (ha->dpc_hp_wq)
-                                queue_work(ha->dpc_hp_wq, &ha->nic_core_reset);
-                } else
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb05e,
-                            "NIC Core reset is already active. Skip "
-                            "scheduling it again.\n");
-                break;
-        case QLA83XX_IDC_STATE_HANDLER: /* 0x2 */
-                if (ha->dpc_hp_wq)
-                        queue_work(ha->dpc_hp_wq, &ha->idc_state_handler);
-                break;
-        case QLA83XX_NIC_CORE_UNRECOVERABLE: /* 0x3 */
-                if (ha->dpc_hp_wq)
-                        queue_work(ha->dpc_hp_wq, &ha->nic_core_unrecoverable);
-                break;
-        default:
-                ql_log(ql_log_warn, base_vha, 0xb05f,
-                    "Unknow work-code=0x%x.\n", work_code);
-        }
-
-        return;
-}
-
-/* Work: Perform NIC Core Unrecoverable state handling */
-void
-qla83xx_nic_core_unrecoverable_work(struct work_struct *work)
-{
-        struct qla_hw_data *ha =
-                container_of(work, struct qla_hw_data, nic_core_unrecoverable);
-        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
-        uint32_t dev_state = 0;
-
-        qla83xx_idc_lock(base_vha, 0);
-        qla83xx_rd_reg(base_vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-        qla83xx_reset_ownership(base_vha);
-        if (ha->flags.nic_core_reset_owner) {
-                ha->flags.nic_core_reset_owner = 0;
-                qla83xx_wr_reg(base_vha, QLA83XX_IDC_DEV_STATE,
-                    QLA8XXX_DEV_FAILED);
-                ql_log(ql_log_info, base_vha, 0xb060, "HW State: FAILED.\n");
-                qla83xx_schedule_work(base_vha, QLA83XX_IDC_STATE_HANDLER);
-        }
-        qla83xx_idc_unlock(base_vha, 0);
-}
-
-/* Work: Execute IDC state handler */
-void
-qla83xx_idc_state_handler_work(struct work_struct *work)
-{
-        struct qla_hw_data *ha =
-                container_of(work, struct qla_hw_data, idc_state_handler);
-        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
-        uint32_t dev_state = 0;
-
-        qla83xx_idc_lock(base_vha, 0);
-        qla83xx_rd_reg(base_vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-        if (dev_state == QLA8XXX_DEV_FAILED ||
-                        dev_state == QLA8XXX_DEV_NEED_QUIESCENT)
-                qla83xx_idc_state_handler(base_vha);
-        qla83xx_idc_unlock(base_vha, 0);
-}
-
-static int
-qla83xx_check_nic_core_fw_alive(scsi_qla_host_t *base_vha)
-{
-        int rval = QLA_SUCCESS;
-        unsigned long heart_beat_wait = jiffies + (1 * HZ);
-        uint32_t heart_beat_counter1, heart_beat_counter2;
-
-        do {
-                if (time_after(jiffies, heart_beat_wait)) {
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb07c,
-                            "Nic Core f/w is not alive.\n");
-                        rval = QLA_FUNCTION_FAILED;
-                        break;
-                }
-
-                qla83xx_idc_lock(base_vha, 0);
-                qla83xx_rd_reg(base_vha, QLA83XX_FW_HEARTBEAT,
-                    &heart_beat_counter1);
-                qla83xx_idc_unlock(base_vha, 0);
-                msleep(100);
-                qla83xx_idc_lock(base_vha, 0);
-                qla83xx_rd_reg(base_vha, QLA83XX_FW_HEARTBEAT,
-                    &heart_beat_counter2);
-                qla83xx_idc_unlock(base_vha, 0);
-        } while (heart_beat_counter1 == heart_beat_counter2);
-
-        return rval;
-}
-
-/* Work: Perform NIC Core Reset handling */
-void
-qla83xx_nic_core_reset_work(struct work_struct *work)
-{
-        struct qla_hw_data *ha =
-                container_of(work, struct qla_hw_data, nic_core_reset);
-        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
-        uint32_t dev_state = 0;
-
-        if (IS_QLA2031(ha)) {
-                if (qla2xxx_mctp_dump(base_vha) != QLA_SUCCESS)
-                        ql_log(ql_log_warn, base_vha, 0xb081,
-                            "Failed to dump mctp\n");
-                return;
-        }
-
-        if (!ha->flags.nic_core_reset_hdlr_active) {
-                if (qla83xx_check_nic_core_fw_alive(base_vha) == QLA_SUCCESS) {
-                        qla83xx_idc_lock(base_vha, 0);
-                        qla83xx_rd_reg(base_vha, QLA83XX_IDC_DEV_STATE,
-                            &dev_state);
-                        qla83xx_idc_unlock(base_vha, 0);
-                        if (dev_state != QLA8XXX_DEV_NEED_RESET) {
-                                ql_dbg(ql_dbg_p3p, base_vha, 0xb07a,
-                                    "Nic Core f/w is alive.\n");
-                                return;
-                        }
-                }
-
-                ha->flags.nic_core_reset_hdlr_active = 1;
-                if (qla83xx_nic_core_reset(base_vha)) {
-                        /* NIC Core reset failed. */
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb061,
-                            "NIC Core reset failed.\n");
-                }
-                ha->flags.nic_core_reset_hdlr_active = 0;
-        }
-}
-
-/* Work: Handle 8200 IDC aens */
-void
-qla83xx_service_idc_aen(struct work_struct *work)
-{
-        struct qla_hw_data *ha =
-                container_of(work, struct qla_hw_data, idc_aen);
-        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
-        uint32_t dev_state, idc_control;
-
-        qla83xx_idc_lock(base_vha, 0);
-        qla83xx_rd_reg(base_vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-        qla83xx_rd_reg(base_vha, QLA83XX_IDC_CONTROL, &idc_control);
-        qla83xx_idc_unlock(base_vha, 0);
-        if (dev_state == QLA8XXX_DEV_NEED_RESET) {
-                if (idc_control & QLA83XX_IDC_GRACEFUL_RESET) {
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb062,
-                            "Application requested NIC Core Reset.\n");
-                        qla83xx_schedule_work(base_vha, QLA83XX_NIC_CORE_RESET);
-                } else if (qla83xx_check_nic_core_fw_alive(base_vha) ==
-                    QLA_SUCCESS) {
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb07b,
-                            "Other protocol driver requested NIC Core Reset.\n");
-                        qla83xx_schedule_work(base_vha, QLA83XX_NIC_CORE_RESET);
-                }
-        } else if (dev_state == QLA8XXX_DEV_FAILED ||
-                        dev_state == QLA8XXX_DEV_NEED_QUIESCENT) {
-                qla83xx_schedule_work(base_vha, QLA83XX_IDC_STATE_HANDLER);
-        }
-}
-
-static void
-qla83xx_wait_logic(void)
-{
-        int i;
-
-        /* Yield CPU */
-        if (!in_interrupt()) {
-                /*
-                 * Wait about 200ms before retrying again.
-                 * This controls the number of retries for single
-                 * lock operation.
-                 */
-                msleep(100);
-                schedule();
-        } else {
-                for (i = 0; i < 20; i++)
-                        cpu_relax(); /* This a nop instr on i386 */
-        }
-}
-
-static int
-qla83xx_force_lock_recovery(scsi_qla_host_t *base_vha)
-{
-        int rval;
-        uint32_t data;
-        uint32_t idc_lck_rcvry_stage_mask = 0x3;
-        uint32_t idc_lck_rcvry_owner_mask = 0x3c;
-        struct qla_hw_data *ha = base_vha->hw;
-
-        rval = qla83xx_rd_reg(base_vha, QLA83XX_IDC_LOCK_RECOVERY, &data);
-        if (rval)
-                return rval;
-
-        if ((data & idc_lck_rcvry_stage_mask) > 0) {
-                return QLA_SUCCESS;
-        } else {
-                data = (IDC_LOCK_RECOVERY_STAGE1) | (ha->portnum << 2);
-                rval = qla83xx_wr_reg(base_vha, QLA83XX_IDC_LOCK_RECOVERY,
-                    data);
-                if (rval)
-                        return rval;
-
-                msleep(200);
-
-                rval = qla83xx_rd_reg(base_vha, QLA83XX_IDC_LOCK_RECOVERY,
-                    &data);
-                if (rval)
-                        return rval;
-
-                if (((data & idc_lck_rcvry_owner_mask) >> 2) == ha->portnum) {
-                        data &= (IDC_LOCK_RECOVERY_STAGE2 |
-                                        ~(idc_lck_rcvry_stage_mask));
-                        rval = qla83xx_wr_reg(base_vha,
-                            QLA83XX_IDC_LOCK_RECOVERY, data);
-                        if (rval)
-                                return rval;
-
-                        /* Forcefully perform IDC UnLock */
-                        rval = qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_UNLOCK,
-                            &data);
-                        if (rval)
-                                return rval;
-                        /* Clear lock-id by setting 0xff */
-                        rval = qla83xx_wr_reg(base_vha, QLA83XX_DRIVER_LOCKID,
-                            0xff);
-                        if (rval)
-                                return rval;
-                        /* Clear lock-recovery by setting 0x0 */
-                        rval = qla83xx_wr_reg(base_vha,
-                            QLA83XX_IDC_LOCK_RECOVERY, 0x0);
-                        if (rval)
-                                return rval;
-                } else
-                        return QLA_SUCCESS;
-        }
-
-        return rval;
-}
-
-static int
-qla83xx_idc_lock_recovery(scsi_qla_host_t *base_vha)
-{
-        int rval = QLA_SUCCESS;
-        uint32_t o_drv_lockid, n_drv_lockid;
-        unsigned long lock_recovery_timeout;
-
-        lock_recovery_timeout = jiffies + QLA83XX_MAX_LOCK_RECOVERY_WAIT;
-retry_lockid:
-        rval = qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_LOCKID, &o_drv_lockid);
-        if (rval)
-                goto exit;
-
-        /* MAX wait time before forcing IDC Lock recovery = 2 secs */
-        if (time_after_eq(jiffies, lock_recovery_timeout)) {
-                if (qla83xx_force_lock_recovery(base_vha) == QLA_SUCCESS)
-                        return QLA_SUCCESS;
-                else
-                        return QLA_FUNCTION_FAILED;
-        }
-
-        rval = qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_LOCKID, &n_drv_lockid);
-        if (rval)
-                goto exit;
-
-        if (o_drv_lockid == n_drv_lockid) {
-                qla83xx_wait_logic();
-                goto retry_lockid;
-        } else
-                return QLA_SUCCESS;
-
-exit:
-        return rval;
-}
-
-void
-qla83xx_idc_lock(scsi_qla_host_t *base_vha, uint16_t requester_id)
-{
-        uint16_t options = (requester_id << 15) | BIT_6;
-        uint32_t data;
-        struct qla_hw_data *ha = base_vha->hw;
-
-        /* IDC-lock implementation using driver-lock/lock-id remote registers */
-retry_lock:
-        if (qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_LOCK, &data)
-            == QLA_SUCCESS) {
-                if (data) {
-                        /* Setting lock-id to our function-number */
-                        qla83xx_wr_reg(base_vha, QLA83XX_DRIVER_LOCKID,
-                            ha->portnum);
-                } else {
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb063,
-                            "Failed to acquire IDC lock. retrying...\n");
-
-                        /* Retry/Perform IDC-Lock recovery */
-                        if (qla83xx_idc_lock_recovery(base_vha)
-                            == QLA_SUCCESS) {
-                                qla83xx_wait_logic();
-                                goto retry_lock;
-                        } else
-                                ql_log(ql_log_warn, base_vha, 0xb075,
-                                    "IDC Lock recovery FAILED.\n");
-                }
-
-        }
-
-        return;
-
-        /* XXX: IDC-lock implementation using access-control mbx */
-retry_lock2:
-        if (qla83xx_access_control(base_vha, options, 0, 0, NULL)) {
-                ql_dbg(ql_dbg_p3p, base_vha, 0xb072,
-                    "Failed to acquire IDC lock. retrying...\n");
-                /* Retry/Perform IDC-Lock recovery */
-                if (qla83xx_idc_lock_recovery(base_vha) == QLA_SUCCESS) {
-                        qla83xx_wait_logic();
-                        goto retry_lock2;
-                } else
-                        ql_log(ql_log_warn, base_vha, 0xb076,
-                            "IDC Lock recovery FAILED.\n");
-        }
-
-        return;
-}
-
-void
-qla83xx_idc_unlock(scsi_qla_host_t *base_vha, uint16_t requester_id)
-{
-        uint16_t options = (requester_id << 15) | BIT_7, retry;
-        uint32_t data;
-        struct qla_hw_data *ha = base_vha->hw;
-
-        /* IDC-unlock implementation using driver-unlock/lock-id
-         * remote registers
-         */
-        retry = 0;
-retry_unlock:
-        if (qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_LOCKID, &data)
-            == QLA_SUCCESS) {
-                if (data == ha->portnum) {
-                        qla83xx_rd_reg(base_vha, QLA83XX_DRIVER_UNLOCK, &data);
-                        /* Clearing lock-id by setting 0xff */
-                        qla83xx_wr_reg(base_vha, QLA83XX_DRIVER_LOCKID, 0xff);
-                } else if (retry < 10) {
-                        /* SV: XXX: IDC unlock retrying needed here? */
-
-                        /* Retry for IDC-unlock */
-                        qla83xx_wait_logic();
-                        retry++;
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb064,
-                            "Failed to release IDC lock, retyring=%d\n", retry);
-                        goto retry_unlock;
-                }
-        } else if (retry < 10) {
-                /* Retry for IDC-unlock */
-                qla83xx_wait_logic();
-                retry++;
-                ql_dbg(ql_dbg_p3p, base_vha, 0xb065,
-                    "Failed to read drv-lockid, retyring=%d\n", retry);
-                goto retry_unlock;
-        }
-
-        return;
-
-        /* XXX: IDC-unlock implementation using access-control mbx */
-        retry = 0;
-retry_unlock2:
-        if (qla83xx_access_control(base_vha, options, 0, 0, NULL)) {
-                if (retry < 10) {
-                        /* Retry for IDC-unlock */
-                        qla83xx_wait_logic();
-                        retry++;
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb066,
-                            "Failed to release IDC lock, retyring=%d\n", retry);
-                        goto retry_unlock2;
-                }
-        }
-
-        return;
-}
-
-int
-__qla83xx_set_drv_presence(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_presence;
-
-        rval = qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
-        if (rval == QLA_SUCCESS) {
-                drv_presence |= (1 << ha->portnum);
-                rval = qla83xx_wr_reg(vha, QLA83XX_IDC_DRV_PRESENCE,
-                    drv_presence);
-        }
-
-        return rval;
-}
-
-int
-qla83xx_set_drv_presence(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-
-        qla83xx_idc_lock(vha, 0);
-        rval = __qla83xx_set_drv_presence(vha);
-        qla83xx_idc_unlock(vha, 0);
-
-        return rval;
-}
-
-int
-__qla83xx_clear_drv_presence(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_presence;
-
-        rval = qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
-        if (rval == QLA_SUCCESS) {
-                drv_presence &= ~(1 << ha->portnum);
-                rval = qla83xx_wr_reg(vha, QLA83XX_IDC_DRV_PRESENCE,
-                    drv_presence);
-        }
-
-        return rval;
-}
-
-int
-qla83xx_clear_drv_presence(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-
-        qla83xx_idc_lock(vha, 0);
-        rval = __qla83xx_clear_drv_presence(vha);
-        qla83xx_idc_unlock(vha, 0);
-
-        return rval;
-}
-
-static void
-qla83xx_need_reset_handler(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t drv_ack, drv_presence;
-        unsigned long ack_timeout;
-
-        /* Wait for IDC ACK from all functions (DRV-ACK == DRV-PRESENCE) */
-        ack_timeout = jiffies + (ha->fcoe_reset_timeout * HZ);
-        while (1) {
-                qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack);
-                qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
-                if ((drv_ack & drv_presence) == drv_presence)
-                        break;
-
-                if (time_after_eq(jiffies, ack_timeout)) {
-                        ql_log(ql_log_warn, vha, 0xb067,
-                            "RESET ACK TIMEOUT! drv_presence=0x%x "
-                            "drv_ack=0x%x\n", drv_presence, drv_ack);
-                        /*
-                         * The function(s) which did not ack in time are forced
-                         * to withdraw any further participation in the IDC
-                         * reset.
-                         */
-                        if (drv_ack != drv_presence)
-                                qla83xx_wr_reg(vha, QLA83XX_IDC_DRV_PRESENCE,
-                                    drv_ack);
-                        break;
-                }
-
-                qla83xx_idc_unlock(vha, 0);
-                msleep(1000);
-                qla83xx_idc_lock(vha, 0);
-        }
-
-        qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE, QLA8XXX_DEV_COLD);
-        ql_log(ql_log_info, vha, 0xb068, "HW State: COLD/RE-INIT.\n");
-}
-
-static int
-qla83xx_device_bootstrap(scsi_qla_host_t *vha)
-{
-        int rval = QLA_SUCCESS;
-        uint32_t idc_control;
-
-        qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE, QLA8XXX_DEV_INITIALIZING);
-        ql_log(ql_log_info, vha, 0xb069, "HW State: INITIALIZING.\n");
-
-        /* Clearing IDC-Control Graceful-Reset Bit before resetting f/w */
-        __qla83xx_get_idc_control(vha, &idc_control);
-        idc_control &= ~QLA83XX_IDC_GRACEFUL_RESET;
-        __qla83xx_set_idc_control(vha, 0);
-
-        qla83xx_idc_unlock(vha, 0);
-        rval = qla83xx_restart_nic_firmware(vha);
-        qla83xx_idc_lock(vha, 0);
-
-        if (rval != QLA_SUCCESS) {
-                ql_log(ql_log_fatal, vha, 0xb06a,
-                    "Failed to restart NIC f/w.\n");
-                qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE, QLA8XXX_DEV_FAILED);
-                ql_log(ql_log_info, vha, 0xb06b, "HW State: FAILED.\n");
-        } else {
-                ql_dbg(ql_dbg_p3p, vha, 0xb06c,
-                    "Success in restarting nic f/w.\n");
-                qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE, QLA8XXX_DEV_READY);
-                ql_log(ql_log_info, vha, 0xb06d, "HW State: READY.\n");
-        }
-
-        return rval;
-}
-
-/* Assumes idc_lock always held on entry */
-int
-qla83xx_idc_state_handler(scsi_qla_host_t *base_vha)
-{
-        struct qla_hw_data *ha = base_vha->hw;
-        int rval = QLA_SUCCESS;
-        unsigned long dev_init_timeout;
-        uint32_t dev_state;
-
-        /* Wait for MAX-INIT-TIMEOUT for the device to go ready */
-        dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout * HZ);
-
-        while (1) {
-
-                if (time_after_eq(jiffies, dev_init_timeout)) {
-                        ql_log(ql_log_warn, base_vha, 0xb06e,
-                            "Initialization TIMEOUT!\n");
-                        /* Init timeout. Disable further NIC Core
-                         * communication.
-                         */
-                        qla83xx_wr_reg(base_vha, QLA83XX_IDC_DEV_STATE,
-                                QLA8XXX_DEV_FAILED);
-                        ql_log(ql_log_info, base_vha, 0xb06f,
-                            "HW State: FAILED.\n");
-                }
-
-                qla83xx_rd_reg(base_vha, QLA83XX_IDC_DEV_STATE, &dev_state);
-                switch (dev_state) {
-                case QLA8XXX_DEV_READY:
-                        if (ha->flags.nic_core_reset_owner)
-                                qla83xx_idc_audit(base_vha,
-                                    IDC_AUDIT_COMPLETION);
-                        ha->flags.nic_core_reset_owner = 0;
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb070,
-                            "Reset_owner reset by 0x%x.\n",
-                            ha->portnum);
-                        goto exit;
-                case QLA8XXX_DEV_COLD:
-                        if (ha->flags.nic_core_reset_owner)
-                                rval = qla83xx_device_bootstrap(base_vha);
-                        else {
-                        /* Wait for AEN to change device-state */
-                                qla83xx_idc_unlock(base_vha, 0);
-                                msleep(1000);
-                                qla83xx_idc_lock(base_vha, 0);
-                        }
-                        break;
-                case QLA8XXX_DEV_INITIALIZING:
-                        /* Wait for AEN to change device-state */
-                        qla83xx_idc_unlock(base_vha, 0);
-                        msleep(1000);
-                        qla83xx_idc_lock(base_vha, 0);
-                        break;
-                case QLA8XXX_DEV_NEED_RESET:
-                        if (!ql2xdontresethba && ha->flags.nic_core_reset_owner)
-                                qla83xx_need_reset_handler(base_vha);
-                        else {
-                                /* Wait for AEN to change device-state */
-                                qla83xx_idc_unlock(base_vha, 0);
-                                msleep(1000);
-                                qla83xx_idc_lock(base_vha, 0);
-                        }
-                        /* reset timeout value after need reset handler */
-                        dev_init_timeout = jiffies +
-                            (ha->fcoe_dev_init_timeout * HZ);
-                        break;
-                case QLA8XXX_DEV_NEED_QUIESCENT:
-                        /* XXX: DEBUG for now */
-                        qla83xx_idc_unlock(base_vha, 0);
-                        msleep(1000);
-                        qla83xx_idc_lock(base_vha, 0);
-                        break;
-                case QLA8XXX_DEV_QUIESCENT:
-                        /* XXX: DEBUG for now */
-                        if (ha->flags.quiesce_owner)
-                                goto exit;
-
-                        qla83xx_idc_unlock(base_vha, 0);
-                        msleep(1000);
-                        qla83xx_idc_lock(base_vha, 0);
-                        dev_init_timeout = jiffies +
-                            (ha->fcoe_dev_init_timeout * HZ);
-                        break;
-                case QLA8XXX_DEV_FAILED:
-                        if (ha->flags.nic_core_reset_owner)
-                                qla83xx_idc_audit(base_vha,
-                                    IDC_AUDIT_COMPLETION);
-                        ha->flags.nic_core_reset_owner = 0;
-                        __qla83xx_clear_drv_presence(base_vha);
-                        qla83xx_idc_unlock(base_vha, 0);
-                        qla8xxx_dev_failed_handler(base_vha);
-                        rval = QLA_FUNCTION_FAILED;
-                        qla83xx_idc_lock(base_vha, 0);
-                        goto exit;
-                case QLA8XXX_BAD_VALUE:
-                        qla83xx_idc_unlock(base_vha, 0);
-                        msleep(1000);
-                        qla83xx_idc_lock(base_vha, 0);
-                        break;
-                default:
-                        ql_log(ql_log_warn, base_vha, 0xb071,
-                            "Unknow Device State: %x.\n", dev_state);
-                        qla83xx_idc_unlock(base_vha, 0);
-                        qla8xxx_dev_failed_handler(base_vha);
-                        rval = QLA_FUNCTION_FAILED;
-                        qla83xx_idc_lock(base_vha, 0);
-                        goto exit;
-                }
-        }
-
-exit:
-        return rval;
-}
-
 /**************************************************************************
 * qla2x00_do_dpc
 *   This kernel thread is a task that is schedule by the interrupt handler
@@ -4443,20 +3506,27 @@ qla2x00_do_dpc(void *data)
                 schedule();
                 __set_current_state(TASK_RUNNING);
 
-                if (!base_vha->flags.init_done || ha->flags.mbox_busy)
-                        goto end_loop;
+                ql_dbg(ql_dbg_dpc, base_vha, 0x4001,
+                    "DPC handler waking up.\n");
+                ql_dbg(ql_dbg_dpc, base_vha, 0x4002,
+                    "dpc_flags=0x%lx.\n", base_vha->dpc_flags);
+
+                /* Initialization not yet finished. Don't do anything yet. */
+                if (!base_vha->flags.init_done)
+                        continue;
 
                 if (ha->flags.eeh_busy) {
                         ql_dbg(ql_dbg_dpc, base_vha, 0x4003,
                             "eeh_busy=%d.\n", ha->flags.eeh_busy);
-                        goto end_loop;
+                        continue;
                 }
 
                 ha->dpc_active = 1;
 
-                ql_dbg(ql_dbg_dpc + ql_dbg_verbose, base_vha, 0x4001,
-                    "DPC handler waking up, dpc_flags=0x%lx.\n",
-                    base_vha->dpc_flags);
+                if (ha->flags.mbox_busy) {
+                        ha->dpc_active = 0;
+                        continue;
+                }
 
                 qla2x00_do_work(base_vha);
 
@@ -4465,7 +3535,7 @@ qla2x00_do_dpc(void *data)
                                 &base_vha->dpc_flags)) {
                                 qla82xx_idc_lock(ha);
                                 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                                        QLA8XXX_DEV_FAILED);
+                                        QLA82XX_DEV_FAILED);
                                 qla82xx_idc_unlock(ha);
                                 ql_log(ql_log_info, base_vha, 0x4004,
                                     "HW State: FAILED.\n");
@@ -4517,39 +3587,22 @@ qla2x00_do_dpc(void *data)
                             "ISP abort end.\n");
                 }
 
-                if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,
-                    &base_vha->dpc_flags)) {
+                if (test_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags)) {
                         qla2x00_update_fcports(base_vha);
-                }
-
-                if (test_bit(SCR_PENDING, &base_vha->dpc_flags)) {
-                        int ret;
-                        ret = qla2x00_send_change_request(base_vha, 0x3, 0);
-                        if (ret != QLA_SUCCESS)
-                                ql_log(ql_log_warn, base_vha, 0x121,
-                                    "Failed to enable receiving of RSCN "
-                                    "requests: 0x%x.\n", ret);
-                        clear_bit(SCR_PENDING, &base_vha->dpc_flags);
+                        clear_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
                 }
 
                 if (test_bit(ISP_QUIESCE_NEEDED, &base_vha->dpc_flags)) {
                         ql_dbg(ql_dbg_dpc, base_vha, 0x4009,
                             "Quiescence mode scheduled.\n");
-                        if (IS_QLA82XX(ha)) {
-                                qla82xx_device_state_handler(base_vha);
-                                clear_bit(ISP_QUIESCE_NEEDED,
-                                    &base_vha->dpc_flags);
-                                if (!ha->flags.quiesce_owner) {
-                                        qla2x00_perform_loop_resync(base_vha);
-
-                                        qla82xx_idc_lock(ha);
-                                        qla82xx_clear_qsnt_ready(base_vha);
-                                        qla82xx_idc_unlock(ha);
-                                }
-                        } else {
-                                clear_bit(ISP_QUIESCE_NEEDED,
-                                    &base_vha->dpc_flags);
-                                qla2x00_quiesce_io(base_vha);
+                        qla82xx_device_state_handler(base_vha);
+                        clear_bit(ISP_QUIESCE_NEEDED, &base_vha->dpc_flags);
+                        if (!ha->flags.quiesce_owner) {
+                                qla2x00_perform_loop_resync(base_vha);
+
+                                qla82xx_idc_lock(ha);
+                                qla82xx_clear_qsnt_ready(base_vha);
+                                qla82xx_idc_unlock(ha);
                         }
                         ql_dbg(ql_dbg_dpc, base_vha, 0x400a,
                             "Quiescence mode end.\n");
@@ -4615,7 +3668,6 @@ qla2x00_do_dpc(void *data)
                 qla2x00_do_dpc_all_vps(base_vha);
 
                 ha->dpc_active = 0;
-end_loop:
                 set_current_state(TASK_INTERRUPTIBLE);
         } /* End of while(1) */
         __set_current_state(TASK_RUNNING);
@@ -4670,6 +3722,76 @@ qla2x00_rst_aen(scsi_qla_host_t *vha)
         }
 }
 
+static void
+qla2x00_sp_free_dma(srb_t *sp)
+{
+        struct scsi_cmnd *cmd = sp->cmd;
+        struct qla_hw_data *ha = sp->fcport->vha->hw;
+
+        if (sp->flags & SRB_DMA_VALID) {
+                scsi_dma_unmap(cmd);
+                sp->flags &= ~SRB_DMA_VALID;
+        }
+
+        if (sp->flags & SRB_CRC_PROT_DMA_VALID) {
+                dma_unmap_sg(&ha->pdev->dev, scsi_prot_sglist(cmd),
+                    scsi_prot_sg_count(cmd), cmd->sc_data_direction);
+                sp->flags &= ~SRB_CRC_PROT_DMA_VALID;
+        }
+
+        if (sp->flags & SRB_CRC_CTX_DSD_VALID) {
+                /* List assured to be having elements */
+                qla2x00_clean_dsd_pool(ha, sp);
+                sp->flags &= ~SRB_CRC_CTX_DSD_VALID;
+        }
+
+        if (sp->flags & SRB_CRC_CTX_DMA_VALID) {
+                dma_pool_free(ha->dl_dma_pool, sp->ctx,
+                    ((struct crc_context *)sp->ctx)->crc_ctx_dma);
+                sp->flags &= ~SRB_CRC_CTX_DMA_VALID;
+        }
+
+        CMD_SP(cmd) = NULL;
+}
+
+static void
+qla2x00_sp_final_compl(struct qla_hw_data *ha, srb_t *sp)
+{
+        struct scsi_cmnd *cmd = sp->cmd;
+
+        qla2x00_sp_free_dma(sp);
+
+        if (sp->flags & SRB_FCP_CMND_DMA_VALID) {
+                struct ct6_dsd *ctx = sp->ctx;
+                dma_pool_free(ha->fcp_cmnd_dma_pool, ctx->fcp_cmnd,
+                        ctx->fcp_cmnd_dma);
+                list_splice(&ctx->dsd_list, &ha->gbl_dsd_list);
+                ha->gbl_dsd_inuse -= ctx->dsd_use_cnt;
+                ha->gbl_dsd_avail += ctx->dsd_use_cnt;
+                mempool_free(sp->ctx, ha->ctx_mempool);
+                sp->ctx = NULL;
+        }
+
+        mempool_free(sp, ha->srb_mempool);
+        cmd->scsi_done(cmd);
+}
+
+void
+qla2x00_sp_compl(struct qla_hw_data *ha, srb_t *sp)
+{
+        if (atomic_read(&sp->ref_count) == 0) {
+                ql_dbg(ql_dbg_io, sp->fcport->vha, 0x3015,
+                    "SP reference-count to ZERO -- sp=%p cmd=%p.\n",
+                    sp, sp->cmd);
+                if (ql2xextended_error_logging & ql_dbg_io)
+                        BUG();
+                return;
+        }
+        if (!atomic_dec_and_test(&sp->ref_count))
+                return;
+        qla2x00_sp_final_compl(ha, sp);
+}
+
 /**************************************************************************
 *   qla2x00_timer
 *
@@ -4740,7 +3862,7 @@ qla2x00_timer(scsi_qla_host_t *vha)
                                         sp = req->outstanding_cmds[index];
                                         if (!sp)
                                                 continue;
-                                        if (sp->type != SRB_SCSI_CMD)
+                                        if (sp->ctx && !IS_PROT_IO(sp))
                                                 continue;
                                         sfcp = sp->fcport;
                                         if (!(sfcp->flags & FCF_FCP2_DEVICE))
@@ -4781,11 +3903,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
 
         /* Check if beacon LED needs to be blinked for physical host only */
         if (!vha->vp_idx && (ha->beacon_blink_led == 1)) {
-                /* There is no beacon_blink function for ISP82xx */
-                if (!IS_QLA82XX(ha)) {
-                        set_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags);
-                        start_dpc++;
-                }
+                set_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags);
+                start_dpc++;
         }
 
         /* Process any deferred work. */
@@ -4829,7 +3948,7 @@ qla2x00_timer(scsi_qla_host_t *vha)
 
 /* Firmware interface routines. */
 
-#define FW_BLOBS        10
+#define FW_BLOBS        8
 #define FW_ISP21XX      0
 #define FW_ISP22XX      1
 #define FW_ISP2300      2
@@ -4838,8 +3957,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
 #define FW_ISP25XX      5
 #define FW_ISP81XX      6
 #define FW_ISP82XX      7
-#define FW_ISP2031      8
-#define FW_ISP8031      9
 
 #define FW_FILE_ISP21XX "ql2100_fw.bin"
 #define FW_FILE_ISP22XX "ql2200_fw.bin"
@@ -4849,8 +3966,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
 #define FW_FILE_ISP25XX "ql2500_fw.bin"
 #define FW_FILE_ISP81XX "ql8100_fw.bin"
 #define FW_FILE_ISP82XX "ql8200_fw.bin"
-#define FW_FILE_ISP2031 "ql2600_fw.bin"
-#define FW_FILE_ISP8031 "ql8300_fw.bin"
 
 static DEFINE_MUTEX(qla_fw_lock);
 
@@ -4863,8 +3978,6 @@ static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
         { .name = FW_FILE_ISP25XX, },
         { .name = FW_FILE_ISP81XX, },
         { .name = FW_FILE_ISP82XX, },
-        { .name = FW_FILE_ISP2031, },
-        { .name = FW_FILE_ISP8031, },
 };
 
 struct fw_blob *
@@ -4873,6 +3986,7 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct fw_blob *blob;
 
+        blob = NULL;
         if (IS_QLA2100(ha)) {
                 blob = &qla_fw_blobs[FW_ISP21XX];
         } else if (IS_QLA2200(ha)) {
@@ -4889,12 +4003,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
                 blob = &qla_fw_blobs[FW_ISP81XX];
         } else if (IS_QLA82XX(ha)) {
                 blob = &qla_fw_blobs[FW_ISP82XX];
-        } else if (IS_QLA2031(ha)) {
-                blob = &qla_fw_blobs[FW_ISP2031];
-        } else if (IS_QLA8031(ha)) {
-                blob = &qla_fw_blobs[FW_ISP8031];
-        } else {
-                return NULL;
         }
 
         mutex_lock(&qla_fw_lock);
@@ -4921,7 +4029,8 @@ qla2x00_release_firmware(void)
 
         mutex_lock(&qla_fw_lock);
         for (idx = 0; idx < FW_BLOBS; idx++)
-                release_firmware(qla_fw_blobs[idx].fw);
+                if (qla_fw_blobs[idx].fw)
+                        release_firmware(qla_fw_blobs[idx].fw);
         mutex_unlock(&qla_fw_lock);
 }
 
@@ -4943,8 +4052,13 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
                 /* For ISP82XX complete any pending mailbox cmd */
                 if (IS_QLA82XX(ha)) {
                         ha->flags.isp82xx_fw_hung = 1;
-                        ql_dbg(ql_dbg_aer, vha, 0x9001, "Pci channel io frozen\n");
-                        qla82xx_clear_pending_mbx(vha);
+                        if (ha->flags.mbox_busy) {
+                                ha->flags.mbox_int = 1;
+                                ql_dbg(ql_dbg_aer, vha, 0x9001,
+                                    "Due to pci channel io frozen, doing premature "
+                                    "completion of mbx command.\n");
+                                complete(&ha->mbx_intr_comp);
+                        }
                 }
                 qla2x00_free_irqs(vha);
                 pci_disable_device(pdev);
@@ -4999,8 +4113,7 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev)
                 return PCI_ERS_RESULT_RECOVERED;
 }
 
-static uint32_t
-qla82xx_error_recovery(scsi_qla_host_t *base_vha)
+uint32_t qla82xx_error_recovery(scsi_qla_host_t *base_vha)
 {
         uint32_t rval = QLA_FUNCTION_FAILED;
         uint32_t drv_active = 0;
@@ -5050,7 +4163,7 @@ qla82xx_error_recovery(scsi_qla_host_t *base_vha)
                 qla82xx_idc_lock(ha);
 
                 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                    QLA8XXX_DEV_INITIALIZING);
+                    QLA82XX_DEV_INITIALIZING);
 
                 qla82xx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION,
                     QLA82XX_IDC_VERSION);
@@ -5074,12 +4187,12 @@ qla82xx_error_recovery(scsi_qla_host_t *base_vha)
                             "HW State: FAILED.\n");
                         qla82xx_clear_drv_active(ha);
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                            QLA8XXX_DEV_FAILED);
+                            QLA82XX_DEV_FAILED);
                 } else {
                         ql_log(ql_log_info, base_vha, 0x900c,
                             "HW State: READY.\n");
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
-                            QLA8XXX_DEV_READY);
+                            QLA82XX_DEV_READY);
                         qla82xx_idc_unlock(ha);
                         ha->flags.isp82xx_fw_hung = 0;
                         rval = qla82xx_restart_isp(base_vha);
@@ -5094,7 +4207,7 @@ qla82xx_error_recovery(scsi_qla_host_t *base_vha)
                     "This devfn is not reset owner = 0x%x.\n",
                     ha->pdev->devfn);
                 if ((qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE) ==
-                    QLA8XXX_DEV_READY)) {
+                    QLA82XX_DEV_READY)) {
                         ha->flags.isp82xx_fw_hung = 0;
                         rval = qla82xx_restart_isp(base_vha);
                         qla82xx_idc_lock(ha);
@@ -5195,7 +4308,7 @@ qla2xxx_pci_resume(struct pci_dev *pdev)
         ha->flags.eeh_busy = 0;
 }
 
-static const struct pci_error_handlers qla2xxx_err_handler = {
+static struct pci_error_handlers qla2xxx_err_handler = {
         .error_detected = qla2xxx_pci_error_detected,
         .mmio_enabled = qla2xxx_pci_mmio_enabled,
         .slot_reset = qla2xxx_pci_slot_reset,
@@ -5216,10 +4329,8 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
         { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
         { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
-        { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
         { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
         { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
-        { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
         { 0 },
 };
 MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl);
@@ -5258,21 +4369,6 @@ qla2x00_module_init(void)
                 return -ENOMEM;
         }
 
-        /* Initialize target kmem_cache and mem_pools */
-        ret = qlt_init();
-        if (ret < 0) {
-                kmem_cache_destroy(srb_cachep);
-                return ret;
-        } else if (ret > 0) {
-                /*
-                 * If initiator mode is explictly disabled by qlt_init(),
-                 * prevent scsi_transport_fc.c:fc_scsi_scan_rport() from
-                 * performing scsi_scan_target() during LOOP UP event.
-                 */
-                qla2xxx_transport_functions.disable_target_scan = 1;
-                qla2xxx_transport_vport_functions.disable_target_scan = 1;
-        }
-
         /* Derive version string. */
         strcpy(qla2x00_version_str, QLA2XXX_VERSION);
         if (ql2xextended_error_logging)
@@ -5284,7 +4380,6 @@ qla2x00_module_init(void)
                 kmem_cache_destroy(srb_cachep);
                 ql_log(ql_log_fatal, NULL, 0x0002,
                     "fc_attach_transport failed...Failing load!.\n");
-                qlt_exit();
                 return -ENODEV;
         }
 
@@ -5298,7 +4393,6 @@ qla2x00_module_init(void)
             fc_attach_transport(&qla2xxx_transport_vport_functions);
         if (!qla2xxx_transport_vport_template) {
                 kmem_cache_destroy(srb_cachep);
-                qlt_exit();
                 fc_release_transport(qla2xxx_transport_template);
                 ql_log(ql_log_fatal, NULL, 0x0004,
                     "fc_attach_transport vport failed...Failing load!.\n");
@@ -5310,7 +4404,6 @@ qla2x00_module_init(void)
         ret = pci_register_driver(&qla2xxx_pci_driver);
         if (ret) {
                 kmem_cache_destroy(srb_cachep);
-                qlt_exit();
                 fc_release_transport(qla2xxx_transport_template);
                 fc_release_transport(qla2xxx_transport_vport_template);
                 ql_log(ql_log_fatal, NULL, 0x0006,
@@ -5330,7 +4423,6 @@ qla2x00_module_exit(void)
         pci_unregister_driver(&qla2xxx_pci_driver);
         qla2x00_release_firmware();
         kmem_cache_destroy(srb_cachep);
-        qlt_exit();
         if (ctx_cachep)
                 kmem_cache_destroy(ctx_cachep);
         fc_release_transport(qla2xxx_transport_template);
diff --git a/drivers/scsi/qla2xxx/qla_settings.h b/drivers/scsi/qla2xxx/qla_settings.h
index 892a81e457b..d70f0300898 100644
--- a/drivers/scsi/qla2xxx/qla_settings.h
+++ b/drivers/scsi/qla2xxx/qla_settings.h
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 32fdc2a66dd..eff13563c82 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -568,9 +568,6 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)
         else if (IS_QLA82XX(ha)) {
                 *start = FA_FLASH_LAYOUT_ADDR_82;
                 goto end;
-        } else if (IS_QLA83XX(ha)) {
-                *start = FA_FLASH_LAYOUT_ADDR_83;
-                goto end;
         }
         /* Begin with first PCI expansion ROM header. */
         buf = (uint8_t *)req->ring;
@@ -724,22 +721,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                     le32_to_cpu(region->size));
 
                 switch (le32_to_cpu(region->code) & 0xff) {
-                case FLT_REG_FCOE_FW:
-                        if (!IS_QLA8031(ha))
-                                break;
-                        ha->flt_region_fw = start;
-                        break;
                 case FLT_REG_FW:
-                        if (IS_QLA8031(ha))
-                                break;
                         ha->flt_region_fw = start;
                         break;
                 case FLT_REG_BOOT_CODE:
                         ha->flt_region_boot = start;
                         break;
                 case FLT_REG_VPD_0:
-                        if (IS_QLA8031(ha))
-                                break;
                         ha->flt_region_vpd_nvram = start;
                         if (IS_QLA82XX(ha))
                                 break;
@@ -747,20 +735,16 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                                 ha->flt_region_vpd = start;
                         break;
                 case FLT_REG_VPD_1:
-                        if (IS_QLA82XX(ha) || IS_QLA8031(ha))
+                        if (IS_QLA82XX(ha))
                                 break;
                         if (!ha->flags.port0)
                                 ha->flt_region_vpd = start;
                         break;
                 case FLT_REG_NVRAM_0:
-                        if (IS_QLA8031(ha))
-                                break;
                         if (ha->flags.port0)
                                 ha->flt_region_nvram = start;
                         break;
                 case FLT_REG_NVRAM_1:
-                        if (IS_QLA8031(ha))
-                                break;
                         if (!ha->flags.port0)
                                 ha->flt_region_nvram = start;
                         break;
@@ -801,31 +785,6 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                 case FLT_REG_VPD_82XX:
                         ha->flt_region_vpd = start;
                         break;
-                case FLT_REG_FCOE_VPD_0:
-                        if (!IS_QLA8031(ha))
-                                break;
-                        ha->flt_region_vpd_nvram = start;
-                        if (ha->flags.port0)
-                                ha->flt_region_vpd = start;
-                        break;
-                case FLT_REG_FCOE_VPD_1:
-                        if (!IS_QLA8031(ha))
-                                break;
-                        if (!ha->flags.port0)
-                                ha->flt_region_vpd = start;
-                        break;
-                case FLT_REG_FCOE_NVRAM_0:
-                        if (!IS_QLA8031(ha))
-                                break;
-                        if (ha->flags.port0)
-                                ha->flt_region_nvram = start;
-                        break;
-                case FLT_REG_FCOE_NVRAM_1:
-                        if (!IS_QLA8031(ha))
-                                break;
-                        if (!ha->flags.port0)
-                                ha->flt_region_nvram = start;
-                        break;
                 }
         }
         goto done;
@@ -845,12 +804,15 @@ no_flash_data:
             def_npiv_conf0[def] : def_npiv_conf1[def];
 done:
         ql_dbg(ql_dbg_init, vha, 0x004a,
-            "FLT[%s]: boot=0x%x fw=0x%x vpd_nvram=0x%x vpd=0x%x nvram=0x%x "
-            "fdt=0x%x flt=0x%x npiv=0x%x fcp_prif_cfg=0x%x.\n",
-            loc, ha->flt_region_boot, ha->flt_region_fw,
-            ha->flt_region_vpd_nvram, ha->flt_region_vpd, ha->flt_region_nvram,
-            ha->flt_region_fdt, ha->flt_region_flt, ha->flt_region_npiv_conf,
-            ha->flt_region_fcp_prio);
+            "FLT[%s]: boot=0x%x fw=0x%x vpd_nvram=0x%x vpd=0x%x.\n",
+            loc, ha->flt_region_boot,
+            ha->flt_region_fw, ha->flt_region_vpd_nvram,
+            ha->flt_region_vpd);
+        ql_dbg(ql_dbg_init, vha, 0x004b,
+            "nvram=0x%x fdt=0x%x flt=0x%x npiv=0x%x fcp_prif_cfg=0x%x.\n",
+            ha->flt_region_nvram,
+            ha->flt_region_fdt, ha->flt_region_flt,
+            ha->flt_region_npiv_conf, ha->flt_region_fcp_prio);
 }
 
 static void
@@ -942,9 +904,8 @@ no_flash_data:
         }
 done:
         ql_dbg(ql_dbg_init, vha, 0x004d,
-            "FDT[%s]: (0x%x/0x%x) erase=0x%x "
-            "pr=%x wrtd=0x%x blk=0x%x.\n",
-            loc, mid, fid,
+            "FDT[%x]: (0x%x/0x%x) erase=0x%x "
+            "pr=%x upro=%x wrtd=0x%x blk=0x%x.\n", loc, mid, fid,
             ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd,
             ha->fdt_wrt_disable, ha->fdt_block_size);
 
@@ -966,16 +927,16 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)
                 QLA82XX_IDC_PARAM_ADDR , 8);
 
         if (*wptr == __constant_cpu_to_le32(0xffffffff)) {
-                ha->fcoe_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;
-                ha->fcoe_reset_timeout = QLA82XX_ROM_DRV_RESET_ACK_TIMEOUT;
+                ha->nx_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;
+                ha->nx_reset_timeout = QLA82XX_ROM_DRV_RESET_ACK_TIMEOUT;
         } else {
-                ha->fcoe_dev_init_timeout = le32_to_cpu(*wptr++);
-                ha->fcoe_reset_timeout = le32_to_cpu(*wptr);
+                ha->nx_dev_init_timeout = le32_to_cpu(*wptr++);
+                ha->nx_reset_timeout = le32_to_cpu(*wptr);
         }
         ql_dbg(ql_dbg_init, vha, 0x004e,
-            "fcoe_dev_init_timeout=%d "
-            "fcoe_reset_timeout=%d.\n", ha->fcoe_dev_init_timeout,
-            ha->fcoe_reset_timeout);
+            "nx_dev_init_timeout=%d "
+            "nx_reset_timeout=%d.\n", ha->nx_dev_init_timeout,
+            ha->nx_reset_timeout);
         return;
 }
 
@@ -986,8 +947,7 @@ qla2xxx_get_flash_info(scsi_qla_host_t *vha)
         uint32_t flt_addr;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) &&
-            !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA8XXX_TYPE(ha))
                 return QLA_SUCCESS;
 
         ret = qla2xxx_find_flt_start(vha, &flt_addr);
@@ -1013,11 +973,7 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
         struct qla_npiv_entry *entry;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) &&
-            !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
-                return;
-
-        if (ha->flags.nic_core_reset_hdlr_active)
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA8XXX_TYPE(ha))
                 return;
 
         ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,
@@ -1187,8 +1143,8 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,
         struct qla_hw_data *ha = vha->hw;
 
         /* Prepare burst-capable write on supported ISPs. */
-        if ((IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha)) &&
-            !(faddr & 0xfff) && dwords > OPTROM_BURST_DWORDS) {
+        if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && !(faddr & 0xfff) &&
+            dwords > OPTROM_BURST_DWORDS) {
                 optrom = dma_alloc_coherent(&ha->pdev->dev, OPTROM_BURST_SIZE,
                     &optrom_dma, GFP_KERNEL);
                 if (!optrom) {
@@ -1662,100 +1618,6 @@ qla24xx_beacon_blink(struct scsi_qla_host *vha)
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
-static uint32_t
-qla83xx_select_led_port(struct qla_hw_data *ha)
-{
-        uint32_t led_select_value = 0;
-
-        if (!IS_QLA83XX(ha))
-                goto out;
-
-        if (ha->flags.port0)
-                led_select_value = QLA83XX_LED_PORT0;
-        else
-                led_select_value = QLA83XX_LED_PORT1;
-
-out:
-        return led_select_value;
-}
-
-void
-qla83xx_beacon_blink(struct scsi_qla_host *vha)
-{
-        uint32_t led_select_value;
-        struct qla_hw_data *ha = vha->hw;
-        uint16_t led_cfg[6];
-        uint16_t orig_led_cfg[6];
-        uint32_t led_10_value, led_43_value;
-
-        if (!IS_QLA83XX(ha) && !IS_QLA81XX(ha))
-                return;
-
-        if (!ha->beacon_blink_led)
-                return;
-
-        if (IS_QLA2031(ha)) {
-                led_select_value = qla83xx_select_led_port(ha);
-
-                qla83xx_wr_reg(vha, led_select_value, 0x40002000);
-                qla83xx_wr_reg(vha, led_select_value + 4, 0x40002000);
-                msleep(1000);
-                qla83xx_wr_reg(vha, led_select_value, 0x40004000);
-                qla83xx_wr_reg(vha, led_select_value + 4, 0x40004000);
-        } else if (IS_QLA8031(ha)) {
-                led_select_value = qla83xx_select_led_port(ha);
-
-                qla83xx_rd_reg(vha, led_select_value, &led_10_value);
-                qla83xx_rd_reg(vha, led_select_value + 0x10, &led_43_value);
-                qla83xx_wr_reg(vha, led_select_value, 0x01f44000);
-                msleep(500);
-                qla83xx_wr_reg(vha, led_select_value, 0x400001f4);
-                msleep(1000);
-                qla83xx_wr_reg(vha, led_select_value, led_10_value);
-                qla83xx_wr_reg(vha, led_select_value + 0x10, led_43_value);
-        } else if (IS_QLA81XX(ha)) {
-                int rval;
-
-                /* Save Current */
-                rval = qla81xx_get_led_config(vha, orig_led_cfg);
-                /* Do the blink */
-                if (rval == QLA_SUCCESS) {
-                        if (IS_QLA81XX(ha)) {
-                                led_cfg[0] = 0x4000;
-                                led_cfg[1] = 0x2000;
-                                led_cfg[2] = 0;
-                                led_cfg[3] = 0;
-                                led_cfg[4] = 0;
-                                led_cfg[5] = 0;
-                        } else {
-                                led_cfg[0] = 0x4000;
-                                led_cfg[1] = 0x4000;
-                                led_cfg[2] = 0x4000;
-                                led_cfg[3] = 0x2000;
-                                led_cfg[4] = 0;
-                                led_cfg[5] = 0x2000;
-                        }
-                        rval = qla81xx_set_led_config(vha, led_cfg);
-                        msleep(1000);
-                        if (IS_QLA81XX(ha)) {
-                                led_cfg[0] = 0x4000;
-                                led_cfg[1] = 0x2000;
-                                led_cfg[2] = 0;
-                        } else {
-                                led_cfg[0] = 0x4000;
-                                led_cfg[1] = 0x2000;
-                                led_cfg[2] = 0x4000;
-                                led_cfg[3] = 0x4000;
-                                led_cfg[4] = 0;
-                                led_cfg[5] = 0x2000;
-                        }
-                        rval = qla81xx_set_led_config(vha, led_cfg);
-                }
-                /* On exit, restore original (presumes no status change) */
-                qla81xx_set_led_config(vha, orig_led_cfg);
-        }
-}
-
 int
 qla24xx_beacon_on(struct scsi_qla_host *vha)
 {
@@ -1767,9 +1629,6 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)
         if (IS_QLA82XX(ha))
                 return QLA_SUCCESS;
 
-        if (IS_QLA8031(ha) || IS_QLA81XX(ha))
-                goto skip_gpio; /* let blink handle it */
-
         if (ha->beacon_blink_led == 0) {
                 /* Enable firmware for update */
                 ha->fw_options[1] |= ADD_FO1_DISABLE_GPIO_LED_CTRL;
@@ -1784,9 +1643,6 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)
                         return QLA_FUNCTION_FAILED;
                 }
 
-                if (IS_QLA2031(ha))
-                        goto skip_gpio;
-
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 gpio_data = RD_REG_DWORD(&reg->gpiod);
 
@@ -1801,7 +1657,6 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)
         /* So all colors blink together. */
         ha->beacon_color_state = 0;
 
-skip_gpio:
         /* Let the per HBA timer kick off the blinking process. */
         ha->beacon_blink_led = 1;
 
@@ -1820,13 +1675,6 @@ qla24xx_beacon_off(struct scsi_qla_host *vha)
                 return QLA_SUCCESS;
 
         ha->beacon_blink_led = 0;
-
-        if (IS_QLA2031(ha))
-                goto set_fw_options;
-
-        if (IS_QLA8031(ha) || IS_QLA81XX(ha))
-                return QLA_SUCCESS;
-
         ha->beacon_color_state = QLA_LED_ALL_ON;
 
         ha->isp_ops->beacon_blink(vha); /* Will flip to all off. */
@@ -1841,7 +1689,6 @@ qla24xx_beacon_off(struct scsi_qla_host *vha)
         RD_REG_DWORD(&reg->gpiod);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-set_fw_options:
         ha->fw_options[1] &= ~ADD_FO1_DISABLE_GPIO_LED_CTRL;
 
         if (qla2x00_set_fw_options(vha, ha->fw_options) != QLA_SUCCESS) {
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
deleted file mode 100644
index 80f4b849e2b..00000000000
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ /dev/null
@@ -1,4979 +0,0 @@
-/*
- *  qla_target.c SCSI LLD infrastructure for QLogic 22xx/23xx/24xx/25xx
- *
- *  based on qla2x00t.c code:
- *
- *  Copyright (C) 2004 - 2010 Vladislav Bolkhovitin <vst@vlnb.net>
- *  Copyright (C) 2004 - 2005 Leonid Stoljar
- *  Copyright (C) 2006 Nathaniel Clark <nate@misrule.us>
- *  Copyright (C) 2006 - 2010 ID7 Ltd.
- *
- *  Forward port and refactoring to modern qla2xxx and target/configfs
- *
- *  Copyright (C) 2010-2011 Nicholas A. Bellinger <nab@kernel.org>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation, version 2
- *  of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/blkdev.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/list.h>
-#include <linux/workqueue.h>
-#include <asm/unaligned.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-#include <scsi/scsi_tcq.h>
-#include <target/target_core_base.h>
-#include <target/target_core_fabric.h>
-
-#include "qla_def.h"
-#include "qla_target.h"
-
-static char *qlini_mode = QLA2XXX_INI_MODE_STR_ENABLED;
-module_param(qlini_mode, charp, S_IRUGO);
-MODULE_PARM_DESC(qlini_mode,
-        "Determines when initiator mode will be enabled. Possible values: "
-        "\"exclusive\" - initiator mode will be enabled on load, "
-        "disabled on enabling target mode and then on disabling target mode "
-        "enabled back; "
-        "\"disabled\" - initiator mode will never be enabled; "
-        "\"enabled\" (default) - initiator mode will always stay enabled.");
-
-static int ql2x_ini_mode = QLA2XXX_INI_MODE_EXCLUSIVE;
-
-/*
- * From scsi/fc/fc_fcp.h
- */
-enum fcp_resp_rsp_codes {
-        FCP_TMF_CMPL = 0,
-        FCP_DATA_LEN_INVALID = 1,
-        FCP_CMND_FIELDS_INVALID = 2,
-        FCP_DATA_PARAM_MISMATCH = 3,
-        FCP_TMF_REJECTED = 4,
-        FCP_TMF_FAILED = 5,
-        FCP_TMF_INVALID_LUN = 9,
-};
-
-/*
- * fc_pri_ta from scsi/fc/fc_fcp.h
- */
-#define FCP_PTA_SIMPLE      0   /* simple task attribute */
-#define FCP_PTA_HEADQ       1   /* head of queue task attribute */
-#define FCP_PTA_ORDERED     2   /* ordered task attribute */
-#define FCP_PTA_ACA         4   /* auto. contingent allegiance */
-#define FCP_PTA_MASK        7   /* mask for task attribute field */
-#define FCP_PRI_SHIFT       3   /* priority field starts in bit 3 */
-#define FCP_PRI_RESVD_MASK  0x80        /* reserved bits in priority field */
-
-/*
- * This driver calls qla2x00_alloc_iocbs() and qla2x00_issue_marker(), which
- * must be called under HW lock and could unlock/lock it inside.
- * It isn't an issue, since in the current implementation on the time when
- * those functions are called:
- *
- *   - Either context is IRQ and only IRQ handler can modify HW data,
- *     including rings related fields,
- *
- *   - Or access to target mode variables from struct qla_tgt doesn't
- *     cross those functions boundaries, except tgt_stop, which
- *     additionally protected by irq_cmd_count.
- */
-/* Predefs for callbacks handed to qla2xxx LLD */
-static void qlt_24xx_atio_pkt(struct scsi_qla_host *ha,
-        struct atio_from_isp *pkt);
-static void qlt_response_pkt(struct scsi_qla_host *ha, response_t *pkt);
-static int qlt_issue_task_mgmt(struct qla_tgt_sess *sess, uint32_t lun,
-        int fn, void *iocb, int flags);
-static void qlt_send_term_exchange(struct scsi_qla_host *ha, struct qla_tgt_cmd
-        *cmd, struct atio_from_isp *atio, int ha_locked);
-static void qlt_reject_free_srr_imm(struct scsi_qla_host *ha,
-        struct qla_tgt_srr_imm *imm, int ha_lock);
-/*
- * Global Variables
- */
-static struct kmem_cache *qla_tgt_cmd_cachep;
-static struct kmem_cache *qla_tgt_mgmt_cmd_cachep;
-static mempool_t *qla_tgt_mgmt_cmd_mempool;
-static struct workqueue_struct *qla_tgt_wq;
-static DEFINE_MUTEX(qla_tgt_mutex);
-static LIST_HEAD(qla_tgt_glist);
-
-/* ha->hardware_lock supposed to be held on entry (to protect tgt->sess_list) */
-static struct qla_tgt_sess *qlt_find_sess_by_port_name(
-        struct qla_tgt *tgt,
-        const uint8_t *port_name)
-{
-        struct qla_tgt_sess *sess;
-
-        list_for_each_entry(sess, &tgt->sess_list, sess_list_entry) {
-                if (!memcmp(sess->port_name, port_name, WWN_SIZE))
-                        return sess;
-        }
-
-        return NULL;
-}
-
-/* Might release hw lock, then reaquire!! */
-static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked)
-{
-        /* Send marker if required */
-        if (unlikely(vha->marker_needed != 0)) {
-                int rc = qla2x00_issue_marker(vha, vha_locked);
-                if (rc != QLA_SUCCESS) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe03d,
-                            "qla_target(%d): issue_marker() failed\n",
-                            vha->vp_idx);
-                }
-                return rc;
-        }
-        return QLA_SUCCESS;
-}
-
-static inline
-struct scsi_qla_host *qlt_find_host_by_d_id(struct scsi_qla_host *vha,
-        uint8_t *d_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint8_t vp_idx;
-
-        if ((vha->d_id.b.area != d_id[1]) || (vha->d_id.b.domain != d_id[0]))
-                return NULL;
-
-        if (vha->d_id.b.al_pa == d_id[2])
-                return vha;
-
-        BUG_ON(ha->tgt.tgt_vp_map == NULL);
-        vp_idx = ha->tgt.tgt_vp_map[d_id[2]].idx;
-        if (likely(test_bit(vp_idx, ha->vp_idx_map)))
-                return ha->tgt.tgt_vp_map[vp_idx].vha;
-
-        return NULL;
-}
-
-static inline
-struct scsi_qla_host *qlt_find_host_by_vp_idx(struct scsi_qla_host *vha,
-        uint16_t vp_idx)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        if (vha->vp_idx == vp_idx)
-                return vha;
-
-        BUG_ON(ha->tgt.tgt_vp_map == NULL);
-        if (likely(test_bit(vp_idx, ha->vp_idx_map)))
-                return ha->tgt.tgt_vp_map[vp_idx].vha;
-
-        return NULL;
-}
-
-void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
-        struct atio_from_isp *atio)
-{
-        switch (atio->u.raw.entry_type) {
-        case ATIO_TYPE7:
-        {
-                struct scsi_qla_host *host = qlt_find_host_by_d_id(vha,
-                    atio->u.isp24.fcp_hdr.d_id);
-                if (unlikely(NULL == host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe03e,
-                            "qla_target(%d): Received ATIO_TYPE7 "
-                            "with unknown d_id %x:%x:%x\n", vha->vp_idx,
-                            atio->u.isp24.fcp_hdr.d_id[0],
-                            atio->u.isp24.fcp_hdr.d_id[1],
-                            atio->u.isp24.fcp_hdr.d_id[2]);
-                        break;
-                }
-                qlt_24xx_atio_pkt(host, atio);
-                break;
-        }
-
-        case IMMED_NOTIFY_TYPE:
-        {
-                struct scsi_qla_host *host = vha;
-                struct imm_ntfy_from_isp *entry =
-                    (struct imm_ntfy_from_isp *)atio;
-
-                if ((entry->u.isp24.vp_index != 0xFF) &&
-                    (entry->u.isp24.nport_handle != 0xFFFF)) {
-                        host = qlt_find_host_by_vp_idx(vha,
-                            entry->u.isp24.vp_index);
-                        if (unlikely(!host)) {
-                                ql_dbg(ql_dbg_tgt, vha, 0xe03f,
-                                    "qla_target(%d): Received "
-                                    "ATIO (IMMED_NOTIFY_TYPE) "
-                                    "with unknown vp_index %d\n",
-                                    vha->vp_idx, entry->u.isp24.vp_index);
-                                break;
-                        }
-                }
-                qlt_24xx_atio_pkt(host, atio);
-                break;
-        }
-
-        default:
-                ql_dbg(ql_dbg_tgt, vha, 0xe040,
-                    "qla_target(%d): Received unknown ATIO atio "
-                    "type %x\n", vha->vp_idx, atio->u.raw.entry_type);
-                break;
-        }
-
-        return;
-}
-
-void qlt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
-{
-        switch (pkt->entry_type) {
-        case CTIO_TYPE7:
-        {
-                struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;
-                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
-                    entry->vp_index);
-                if (unlikely(!host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe041,
-                            "qla_target(%d): Response pkt (CTIO_TYPE7) "
-                            "received, with unknown vp_index %d\n",
-                            vha->vp_idx, entry->vp_index);
-                        break;
-                }
-                qlt_response_pkt(host, pkt);
-                break;
-        }
-
-        case IMMED_NOTIFY_TYPE:
-        {
-                struct scsi_qla_host *host = vha;
-                struct imm_ntfy_from_isp *entry =
-                    (struct imm_ntfy_from_isp *)pkt;
-
-                host = qlt_find_host_by_vp_idx(vha, entry->u.isp24.vp_index);
-                if (unlikely(!host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe042,
-                            "qla_target(%d): Response pkt (IMMED_NOTIFY_TYPE) "
-                            "received, with unknown vp_index %d\n",
-                            vha->vp_idx, entry->u.isp24.vp_index);
-                        break;
-                }
-                qlt_response_pkt(host, pkt);
-                break;
-        }
-
-        case NOTIFY_ACK_TYPE:
-        {
-                struct scsi_qla_host *host = vha;
-                struct nack_to_isp *entry = (struct nack_to_isp *)pkt;
-
-                if (0xFF != entry->u.isp24.vp_index) {
-                        host = qlt_find_host_by_vp_idx(vha,
-                            entry->u.isp24.vp_index);
-                        if (unlikely(!host)) {
-                                ql_dbg(ql_dbg_tgt, vha, 0xe043,
-                                    "qla_target(%d): Response "
-                                    "pkt (NOTIFY_ACK_TYPE) "
-                                    "received, with unknown "
-                                    "vp_index %d\n", vha->vp_idx,
-                                    entry->u.isp24.vp_index);
-                                break;
-                        }
-                }
-                qlt_response_pkt(host, pkt);
-                break;
-        }
-
-        case ABTS_RECV_24XX:
-        {
-                struct abts_recv_from_24xx *entry =
-                    (struct abts_recv_from_24xx *)pkt;
-                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
-                    entry->vp_index);
-                if (unlikely(!host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe044,
-                            "qla_target(%d): Response pkt "
-                            "(ABTS_RECV_24XX) received, with unknown "
-                            "vp_index %d\n", vha->vp_idx, entry->vp_index);
-                        break;
-                }
-                qlt_response_pkt(host, pkt);
-                break;
-        }
-
-        case ABTS_RESP_24XX:
-        {
-                struct abts_resp_to_24xx *entry =
-                    (struct abts_resp_to_24xx *)pkt;
-                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
-                    entry->vp_index);
-                if (unlikely(!host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe045,
-                            "qla_target(%d): Response pkt "
-                            "(ABTS_RECV_24XX) received, with unknown "
-                            "vp_index %d\n", vha->vp_idx, entry->vp_index);
-                        break;
-                }
-                qlt_response_pkt(host, pkt);
-                break;
-        }
-
-        default:
-                qlt_response_pkt(vha, pkt);
-                break;
-        }
-
-}
-
-static void qlt_free_session_done(struct work_struct *work)
-{
-        struct qla_tgt_sess *sess = container_of(work, struct qla_tgt_sess,
-            free_work);
-        struct qla_tgt *tgt = sess->tgt;
-        struct scsi_qla_host *vha = sess->vha;
-        struct qla_hw_data *ha = vha->hw;
-
-        BUG_ON(!tgt);
-        /*
-         * Release the target session for FC Nexus from fabric module code.
-         */
-        if (sess->se_sess != NULL)
-                ha->tgt.tgt_ops->free_session(sess);
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,
-            "Unregistration of sess %p finished\n", sess);
-
-        kfree(sess);
-        /*
-         * We need to protect against race, when tgt is freed before or
-         * inside wake_up()
-         */
-        tgt->sess_count--;
-        if (tgt->sess_count == 0)
-                wake_up_all(&tgt->waitQ);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-void qlt_unreg_sess(struct qla_tgt_sess *sess)
-{
-        struct scsi_qla_host *vha = sess->vha;
-
-        vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map(sess);
-
-        list_del(&sess->sess_list_entry);
-        if (sess->deleted)
-                list_del(&sess->del_list_entry);
-
-        INIT_WORK(&sess->free_work, qlt_free_session_done);
-        schedule_work(&sess->free_work);
-}
-EXPORT_SYMBOL(qlt_unreg_sess);
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess = NULL;
-        uint32_t unpacked_lun, lun = 0;
-        uint16_t loop_id;
-        int res = 0;
-        struct imm_ntfy_from_isp *n = (struct imm_ntfy_from_isp *)iocb;
-        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
-
-        loop_id = le16_to_cpu(n->u.isp24.nport_handle);
-        if (loop_id == 0xFFFF) {
-#if 0 /* FIXME: Re-enable Global event handling.. */
-                /* Global event */
-                atomic_inc(&ha->tgt.qla_tgt->tgt_global_resets_count);
-                qlt_clear_tgt_db(ha->tgt.qla_tgt, 1);
-                if (!list_empty(&ha->tgt.qla_tgt->sess_list)) {
-                        sess = list_entry(ha->tgt.qla_tgt->sess_list.next,
-                            typeof(*sess), sess_list_entry);
-                        switch (mcmd) {
-                        case QLA_TGT_NEXUS_LOSS_SESS:
-                                mcmd = QLA_TGT_NEXUS_LOSS;
-                                break;
-                        case QLA_TGT_ABORT_ALL_SESS:
-                                mcmd = QLA_TGT_ABORT_ALL;
-                                break;
-                        case QLA_TGT_NEXUS_LOSS:
-                        case QLA_TGT_ABORT_ALL:
-                                break;
-                        default:
-                                ql_dbg(ql_dbg_tgt, vha, 0xe046,
-                                    "qla_target(%d): Not allowed "
-                                    "command %x in %s", vha->vp_idx,
-                                    mcmd, __func__);
-                                sess = NULL;
-                                break;
-                        }
-                } else
-                        sess = NULL;
-#endif
-        } else {
-                sess = ha->tgt.tgt_ops->find_sess_by_loop_id(vha, loop_id);
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe000,
-            "Using sess for qla_tgt_reset: %p\n", sess);
-        if (!sess) {
-                res = -ESRCH;
-                return res;
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe047,
-            "scsi(%ld): resetting (session %p from port "
-            "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x, "
-            "mcmd %x, loop_id %d)\n", vha->host_no, sess,
-            sess->port_name[0], sess->port_name[1],
-            sess->port_name[2], sess->port_name[3],
-            sess->port_name[4], sess->port_name[5],
-            sess->port_name[6], sess->port_name[7],
-            mcmd, loop_id);
-
-        lun = a->u.isp24.fcp_cmnd.lun;
-        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        return qlt_issue_task_mgmt(sess, unpacked_lun, mcmd,
-            iocb, QLA24XX_MGMT_SEND_NACK);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess,
-        bool immediate)
-{
-        struct qla_tgt *tgt = sess->tgt;
-        uint32_t dev_loss_tmo = tgt->ha->port_down_retry_count + 5;
-
-        if (sess->deleted)
-                return;
-
-        ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
-            "Scheduling sess %p for deletion\n", sess);
-        list_add_tail(&sess->del_list_entry, &tgt->del_sess_list);
-        sess->deleted = 1;
-
-        if (immediate)
-                dev_loss_tmo = 0;
-
-        sess->expires = jiffies + dev_loss_tmo * HZ;
-
-        ql_dbg(ql_dbg_tgt, sess->vha, 0xe048,
-            "qla_target(%d): session for port %02x:%02x:%02x:"
-            "%02x:%02x:%02x:%02x:%02x (loop ID %d) scheduled for "
-            "deletion in %u secs (expires: %lu) immed: %d\n",
-            sess->vha->vp_idx,
-            sess->port_name[0], sess->port_name[1],
-            sess->port_name[2], sess->port_name[3],
-            sess->port_name[4], sess->port_name[5],
-            sess->port_name[6], sess->port_name[7],
-            sess->loop_id, dev_loss_tmo, sess->expires, immediate);
-
-        if (immediate)
-                schedule_delayed_work(&tgt->sess_del_work, 0);
-        else
-                schedule_delayed_work(&tgt->sess_del_work,
-                    jiffies - sess->expires);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static void qlt_clear_tgt_db(struct qla_tgt *tgt, bool local_only)
-{
-        struct qla_tgt_sess *sess;
-
-        list_for_each_entry(sess, &tgt->sess_list, sess_list_entry)
-                qlt_schedule_sess_for_deletion(sess, true);
-
-        /* At this point tgt could be already dead */
-}
-
-static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,
-        uint16_t *loop_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        dma_addr_t gid_list_dma;
-        struct gid_list_info *gid_list;
-        char *id_iter;
-        int res, rc, i;
-        uint16_t entries;
-
-        gid_list = dma_alloc_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
-            &gid_list_dma, GFP_KERNEL);
-        if (!gid_list) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf044,
-                    "qla_target(%d): DMA Alloc failed of %u\n",
-                    vha->vp_idx, qla2x00_gid_list_size(ha));
-                return -ENOMEM;
-        }
-
-        /* Get list of logged in devices */
-        rc = qla2x00_get_id_list(vha, gid_list, gid_list_dma, &entries);
-        if (rc != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf045,
-                    "qla_target(%d): get_id_list() failed: %x\n",
-                    vha->vp_idx, rc);
-                res = -1;
-                goto out_free_id_list;
-        }
-
-        id_iter = (char *)gid_list;
-        res = -1;
-        for (i = 0; i < entries; i++) {
-                struct gid_list_info *gid = (struct gid_list_info *)id_iter;
-                if ((gid->al_pa == s_id[2]) &&
-                    (gid->area == s_id[1]) &&
-                    (gid->domain == s_id[0])) {
-                        *loop_id = le16_to_cpu(gid->loop_id);
-                        res = 0;
-                        break;
-                }
-                id_iter += ha->gid_list_info_size;
-        }
-
-out_free_id_list:
-        dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
-            gid_list, gid_list_dma);
-        return res;
-}
-
-static bool qlt_check_fcport_exist(struct scsi_qla_host *vha,
-        struct qla_tgt_sess *sess)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_port_24xx_data *pmap24;
-        bool res, found = false;
-        int rc, i;
-        uint16_t loop_id = 0xFFFF; /* to eliminate compiler's warning */
-        uint16_t entries;
-        void *pmap;
-        int pmap_len;
-        fc_port_t *fcport;
-        int global_resets;
-        unsigned long flags;
-
-retry:
-        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
-
-        rc = qla2x00_get_node_name_list(vha, &pmap, &pmap_len);
-        if (rc != QLA_SUCCESS) {
-                res = false;
-                goto out;
-        }
-
-        pmap24 = pmap;
-        entries = pmap_len/sizeof(*pmap24);
-
-        for (i = 0; i < entries; ++i) {
-                if (!memcmp(sess->port_name, pmap24[i].port_name, WWN_SIZE)) {
-                        loop_id = le16_to_cpu(pmap24[i].loop_id);
-                        found = true;
-                        break;
-                }
-        }
-
-        kfree(pmap);
-
-        if (!found) {
-                res = false;
-                goto out;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf046,
-            "qlt_check_fcport_exist(): loop_id %d", loop_id);
-
-        fcport = kzalloc(sizeof(*fcport), GFP_KERNEL);
-        if (fcport == NULL) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf047,
-                    "qla_target(%d): Allocation of tmp FC port failed",
-                    vha->vp_idx);
-                res = false;
-                goto out;
-        }
-
-        fcport->loop_id = loop_id;
-
-        rc = qla2x00_get_port_database(vha, fcport, 0);
-        if (rc != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf048,
-                    "qla_target(%d): Failed to retrieve fcport "
-                    "information -- get_port_database() returned %x "
-                    "(loop_id=0x%04x)", vha->vp_idx, rc, loop_id);
-                res = false;
-                goto out_free_fcport;
-        }
-
-        if (global_resets !=
-            atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf002,
-                    "qla_target(%d): global reset during session discovery"
-                    " (counter was %d, new %d), retrying",
-                    vha->vp_idx, global_resets,
-                    atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count));
-                goto retry;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf003,
-            "Updating sess %p s_id %x:%x:%x, loop_id %d) to d_id %x:%x:%x, "
-            "loop_id %d", sess, sess->s_id.b.domain, sess->s_id.b.al_pa,
-            sess->s_id.b.area, sess->loop_id, fcport->d_id.b.domain,
-            fcport->d_id.b.al_pa, fcport->d_id.b.area, fcport->loop_id);
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
-                                (fcport->flags & FCF_CONF_COMP_SUPPORTED));
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        res = true;
-
-out_free_fcport:
-        kfree(fcport);
-
-out:
-        return res;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static void qlt_undelete_sess(struct qla_tgt_sess *sess)
-{
-        BUG_ON(!sess->deleted);
-
-        list_del(&sess->del_list_entry);
-        sess->deleted = 0;
-}
-
-static void qlt_del_sess_work_fn(struct delayed_work *work)
-{
-        struct qla_tgt *tgt = container_of(work, struct qla_tgt,
-            sess_del_work);
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        while (!list_empty(&tgt->del_sess_list)) {
-                sess = list_entry(tgt->del_sess_list.next, typeof(*sess),
-                    del_list_entry);
-                if (time_after_eq(jiffies, sess->expires)) {
-                        bool cancel;
-
-                        qlt_undelete_sess(sess);
-
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                        cancel = qlt_check_fcport_exist(vha, sess);
-
-                        if (cancel) {
-                                if (sess->deleted) {
-                                        /*
-                                         * sess was again deleted while we were
-                                         * discovering it
-                                         */
-                                        spin_lock_irqsave(&ha->hardware_lock,
-                                            flags);
-                                        continue;
-                                }
-
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf049,
-                                    "qla_target(%d): cancel deletion of "
-                                    "session for port %02x:%02x:%02x:%02x:%02x:"
-                                    "%02x:%02x:%02x (loop ID %d), because "
-                                    " it isn't deleted by firmware",
-                                    vha->vp_idx, sess->port_name[0],
-                                    sess->port_name[1], sess->port_name[2],
-                                    sess->port_name[3], sess->port_name[4],
-                                    sess->port_name[5], sess->port_name[6],
-                                    sess->port_name[7], sess->loop_id);
-                        } else {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
-                                    "Timeout: sess %p about to be deleted\n",
-                                    sess);
-                                ha->tgt.tgt_ops->shutdown_sess(sess);
-                                ha->tgt.tgt_ops->put_sess(sess);
-                        }
-
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                } else {
-                        schedule_delayed_work(&tgt->sess_del_work,
-                            jiffies - sess->expires);
-                        break;
-                }
-        }
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
-/*
- * Adds an extra ref to allow to drop hw lock after adding sess to the list.
- * Caller must put it.
- */
-static struct qla_tgt_sess *qlt_create_sess(
-        struct scsi_qla_host *vha,
-        fc_port_t *fcport,
-        bool local)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess;
-        unsigned long flags;
-        unsigned char be_sid[3];
-
-        /* Check to avoid double sessions */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        list_for_each_entry(sess, &ha->tgt.qla_tgt->sess_list,
-                                sess_list_entry) {
-                if (!memcmp(sess->port_name, fcport->port_name, WWN_SIZE)) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
-                            "Double sess %p found (s_id %x:%x:%x, "
-                            "loop_id %d), updating to d_id %x:%x:%x, "
-                            "loop_id %d", sess, sess->s_id.b.domain,
-                            sess->s_id.b.al_pa, sess->s_id.b.area,
-                            sess->loop_id, fcport->d_id.b.domain,
-                            fcport->d_id.b.al_pa, fcport->d_id.b.area,
-                            fcport->loop_id);
-
-                        if (sess->deleted)
-                                qlt_undelete_sess(sess);
-
-                        kref_get(&sess->se_sess->sess_kref);
-                        ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
-                                                (fcport->flags & FCF_CONF_COMP_SUPPORTED));
-
-                        if (sess->local && !local)
-                                sess->local = 0;
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-                        return sess;
-                }
-        }
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        sess = kzalloc(sizeof(*sess), GFP_KERNEL);
-        if (!sess) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04a,
-                    "qla_target(%u): session allocation failed, "
-                    "all commands from port %02x:%02x:%02x:%02x:"
-                    "%02x:%02x:%02x:%02x will be refused", vha->vp_idx,
-                    fcport->port_name[0], fcport->port_name[1],
-                    fcport->port_name[2], fcport->port_name[3],
-                    fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7]);
-
-                return NULL;
-        }
-        sess->tgt = ha->tgt.qla_tgt;
-        sess->vha = vha;
-        sess->s_id = fcport->d_id;
-        sess->loop_id = fcport->loop_id;
-        sess->local = local;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf006,
-            "Adding sess %p to tgt %p via ->check_initiator_node_acl()\n",
-            sess, ha->tgt.qla_tgt);
-
-        be_sid[0] = sess->s_id.b.domain;
-        be_sid[1] = sess->s_id.b.area;
-        be_sid[2] = sess->s_id.b.al_pa;
-        /*
-         * Determine if this fc_port->port_name is allowed to access
-         * target mode using explict NodeACLs+MappedLUNs, or using
-         * TPG demo mode.  If this is successful a target mode FC nexus
-         * is created.
-         */
-        if (ha->tgt.tgt_ops->check_initiator_node_acl(vha,
-            &fcport->port_name[0], sess, &be_sid[0], fcport->loop_id) < 0) {
-                kfree(sess);
-                return NULL;
-        }
-        /*
-         * Take an extra reference to ->sess_kref here to handle qla_tgt_sess
-         * access across ->hardware_lock reaquire.
-         */
-        kref_get(&sess->se_sess->sess_kref);
-
-        sess->conf_compl_supported = (fcport->flags & FCF_CONF_COMP_SUPPORTED);
-        BUILD_BUG_ON(sizeof(sess->port_name) != sizeof(fcport->port_name));
-        memcpy(sess->port_name, fcport->port_name, sizeof(sess->port_name));
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        list_add_tail(&sess->sess_list_entry, &ha->tgt.qla_tgt->sess_list);
-        ha->tgt.qla_tgt->sess_count++;
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04b,
-            "qla_target(%d): %ssession for wwn %02x:%02x:%02x:%02x:"
-            "%02x:%02x:%02x:%02x (loop_id %d, s_id %x:%x:%x, confirmed"
-            " completion %ssupported) added\n",
-            vha->vp_idx, local ?  "local " : "", fcport->port_name[0],
-            fcport->port_name[1], fcport->port_name[2], fcport->port_name[3],
-            fcport->port_name[4], fcport->port_name[5], fcport->port_name[6],
-            fcport->port_name[7], fcport->loop_id, sess->s_id.b.domain,
-            sess->s_id.b.area, sess->s_id.b.al_pa, sess->conf_compl_supported ?
-            "" : "not ");
-
-        return sess;
-}
-
-/*
- * Called from drivers/scsi/qla2xxx/qla_init.c:qla2x00_reg_remote_port()
- */
-void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_sess *sess;
-        unsigned long flags;
-
-        if (!vha->hw->tgt.tgt_ops)
-                return;
-
-        if (!tgt || (fcport->port_type != FCT_INITIATOR))
-                return;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        if (tgt->tgt_stop) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                return;
-        }
-        sess = qlt_find_sess_by_port_name(tgt, fcport->port_name);
-        if (!sess) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-                mutex_lock(&ha->tgt.tgt_mutex);
-                sess = qlt_create_sess(vha, fcport, false);
-                mutex_unlock(&ha->tgt.tgt_mutex);
-
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-        } else {
-                kref_get(&sess->se_sess->sess_kref);
-
-                if (sess->deleted) {
-                        qlt_undelete_sess(sess);
-
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04c,
-                            "qla_target(%u): %ssession for port %02x:"
-                            "%02x:%02x:%02x:%02x:%02x:%02x:%02x (loop ID %d) "
-                            "reappeared\n", vha->vp_idx, sess->local ? "local "
-                            : "", sess->port_name[0], sess->port_name[1],
-                            sess->port_name[2], sess->port_name[3],
-                            sess->port_name[4], sess->port_name[5],
-                            sess->port_name[6], sess->port_name[7],
-                            sess->loop_id);
-
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf007,
-                            "Reappeared sess %p\n", sess);
-                }
-                ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
-                                        (fcport->flags & FCF_CONF_COMP_SUPPORTED));
-        }
-
-        if (sess && sess->local) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04d,
-                    "qla_target(%u): local session for "
-                    "port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x "
-                    "(loop ID %d) became global\n", vha->vp_idx,
-                    fcport->port_name[0], fcport->port_name[1],
-                    fcport->port_name[2], fcport->port_name[3],
-                    fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7],
-                    sess->loop_id);
-                sess->local = 0;
-        }
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        ha->tgt.tgt_ops->put_sess(sess);
-}
-
-void qlt_fc_port_deleted(struct scsi_qla_host *vha, fc_port_t *fcport)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_sess *sess;
-        unsigned long flags;
-
-        if (!vha->hw->tgt.tgt_ops)
-                return;
-
-        if (!tgt || (fcport->port_type != FCT_INITIATOR))
-                return;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        if (tgt->tgt_stop) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                return;
-        }
-        sess = qlt_find_sess_by_port_name(tgt, fcport->port_name);
-        if (!sess) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                return;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf008, "qla_tgt_fc_port_deleted %p", sess);
-
-        sess->local = 1;
-        qlt_schedule_sess_for_deletion(sess, false);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
-static inline int test_tgt_sess_count(struct qla_tgt *tgt)
-{
-        struct qla_hw_data *ha = tgt->ha;
-        unsigned long flags;
-        int res;
-        /*
-         * We need to protect against race, when tgt is freed before or
-         * inside wake_up()
-         */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        ql_dbg(ql_dbg_tgt, tgt->vha, 0xe002,
-            "tgt %p, empty(sess_list)=%d sess_count=%d\n",
-            tgt, list_empty(&tgt->sess_list), tgt->sess_count);
-        res = (tgt->sess_count == 0);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return res;
-}
-
-/* Called by tcm_qla2xxx configfs code */
-void qlt_stop_phase1(struct qla_tgt *tgt)
-{
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_hw_data *ha = tgt->ha;
-        unsigned long flags;
-
-        if (tgt->tgt_stop || tgt->tgt_stopped) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04e,
-                    "Already in tgt->tgt_stop or tgt_stopped state\n");
-                dump_stack();
-                return;
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe003, "Stopping target for host %ld(%p)\n",
-            vha->host_no, vha);
-        /*
-         * Mutex needed to sync with qla_tgt_fc_port_[added,deleted].
-         * Lock is needed, because we still can get an incoming packet.
-         */
-        mutex_lock(&ha->tgt.tgt_mutex);
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        tgt->tgt_stop = 1;
-        qlt_clear_tgt_db(tgt, true);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        mutex_unlock(&ha->tgt.tgt_mutex);
-
-        flush_delayed_work(&tgt->sess_del_work);
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf009,
-            "Waiting for sess works (tgt %p)", tgt);
-        spin_lock_irqsave(&tgt->sess_work_lock, flags);
-        while (!list_empty(&tgt->sess_works_list)) {
-                spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
-                flush_scheduled_work();
-                spin_lock_irqsave(&tgt->sess_work_lock, flags);
-        }
-        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00a,
-            "Waiting for tgt %p: list_empty(sess_list)=%d "
-            "sess_count=%d\n", tgt, list_empty(&tgt->sess_list),
-            tgt->sess_count);
-
-        wait_event(tgt->waitQ, test_tgt_sess_count(tgt));
-
-        /* Big hammer */
-        if (!ha->flags.host_shutting_down && qla_tgt_mode_enabled(vha))
-                qlt_disable_vha(vha);
-
-        /* Wait for sessions to clear out (just in case) */
-        wait_event(tgt->waitQ, test_tgt_sess_count(tgt));
-}
-EXPORT_SYMBOL(qlt_stop_phase1);
-
-/* Called by tcm_qla2xxx configfs code */
-void qlt_stop_phase2(struct qla_tgt *tgt)
-{
-        struct qla_hw_data *ha = tgt->ha;
-        unsigned long flags;
-
-        if (tgt->tgt_stopped) {
-                ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf04f,
-                    "Already in tgt->tgt_stopped state\n");
-                dump_stack();
-                return;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00b,
-            "Waiting for %d IRQ commands to complete (tgt %p)",
-            tgt->irq_cmd_count, tgt);
-
-        mutex_lock(&ha->tgt.tgt_mutex);
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        while (tgt->irq_cmd_count != 0) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                udelay(2);
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-        }
-        tgt->tgt_stop = 0;
-        tgt->tgt_stopped = 1;
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        mutex_unlock(&ha->tgt.tgt_mutex);
-
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00c, "Stop of tgt %p finished",
-            tgt);
-}
-EXPORT_SYMBOL(qlt_stop_phase2);
-
-/* Called from qlt_remove_target() -> qla2x00_remove_one() */
-static void qlt_release(struct qla_tgt *tgt)
-{
-        struct qla_hw_data *ha = tgt->ha;
-
-        if ((ha->tgt.qla_tgt != NULL) && !tgt->tgt_stopped)
-                qlt_stop_phase2(tgt);
-
-        ha->tgt.qla_tgt = NULL;
-
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00d,
-            "Release of tgt %p finished\n", tgt);
-
-        kfree(tgt);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_sched_sess_work(struct qla_tgt *tgt, int type,
-        const void *param, unsigned int param_size)
-{
-        struct qla_tgt_sess_work_param *prm;
-        unsigned long flags;
-
-        prm = kzalloc(sizeof(*prm), GFP_ATOMIC);
-        if (!prm) {
-                ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf050,
-                    "qla_target(%d): Unable to create session "
-                    "work, command will be refused", 0);
-                return -ENOMEM;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00e,
-            "Scheduling work (type %d, prm %p)"
-            " to find session for param %p (size %d, tgt %p)\n",
-            type, prm, param, param_size, tgt);
-
-        prm->type = type;
-        memcpy(&prm->tm_iocb, param, param_size);
-
-        spin_lock_irqsave(&tgt->sess_work_lock, flags);
-        list_add_tail(&prm->sess_works_list_entry, &tgt->sess_works_list);
-        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
-
-        schedule_work(&tgt->sess_work);
-
-        return 0;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_send_notify_ack(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *ntfy,
-        uint32_t add_flags, uint16_t resp_code, int resp_code_valid,
-        uint16_t srr_flags, uint16_t srr_reject_code, uint8_t srr_explan)
-{
-        struct qla_hw_data *ha = vha->hw;
-        request_t *pkt;
-        struct nack_to_isp *nack;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe004, "Sending NOTIFY_ACK (ha=%p)\n", ha);
-
-        /* Send marker if required */
-        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
-                return;
-
-        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
-        if (!pkt) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe049,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet\n", vha->vp_idx, __func__);
-                return;
-        }
-
-        if (ha->tgt.qla_tgt != NULL)
-                ha->tgt.qla_tgt->notify_ack_expected++;
-
-        pkt->entry_type = NOTIFY_ACK_TYPE;
-        pkt->entry_count = 1;
-
-        nack = (struct nack_to_isp *)pkt;
-        nack->ox_id = ntfy->ox_id;
-
-        nack->u.isp24.nport_handle = ntfy->u.isp24.nport_handle;
-        if (le16_to_cpu(ntfy->u.isp24.status) == IMM_NTFY_ELS) {
-                nack->u.isp24.flags = ntfy->u.isp24.flags &
-                        __constant_cpu_to_le32(NOTIFY24XX_FLAGS_PUREX_IOCB);
-        }
-        nack->u.isp24.srr_rx_id = ntfy->u.isp24.srr_rx_id;
-        nack->u.isp24.status = ntfy->u.isp24.status;
-        nack->u.isp24.status_subcode = ntfy->u.isp24.status_subcode;
-        nack->u.isp24.exchange_address = ntfy->u.isp24.exchange_address;
-        nack->u.isp24.srr_rel_offs = ntfy->u.isp24.srr_rel_offs;
-        nack->u.isp24.srr_ui = ntfy->u.isp24.srr_ui;
-        nack->u.isp24.srr_flags = cpu_to_le16(srr_flags);
-        nack->u.isp24.srr_reject_code = srr_reject_code;
-        nack->u.isp24.srr_reject_code_expl = srr_explan;
-        nack->u.isp24.vp_index = ntfy->u.isp24.vp_index;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe005,
-            "qla_target(%d): Sending 24xx Notify Ack %d\n",
-            vha->vp_idx, nack->u.isp24.status);
-
-        qla2x00_start_iocbs(vha, vha->req);
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_24xx_send_abts_resp(struct scsi_qla_host *vha,
-        struct abts_recv_from_24xx *abts, uint32_t status,
-        bool ids_reversed)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct abts_resp_to_24xx *resp;
-        uint32_t f_ctl;
-        uint8_t *p;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe006,
-            "Sending task mgmt ABTS response (ha=%p, atio=%p, status=%x\n",
-            ha, abts, status);
-
-        /* Send marker if required */
-        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
-                return;
-
-        resp = (struct abts_resp_to_24xx *)qla2x00_alloc_iocbs(vha, NULL);
-        if (!resp) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe04a,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet", vha->vp_idx, __func__);
-                return;
-        }
-
-        resp->entry_type = ABTS_RESP_24XX;
-        resp->entry_count = 1;
-        resp->nport_handle = abts->nport_handle;
-        resp->vp_index = vha->vp_idx;
-        resp->sof_type = abts->sof_type;
-        resp->exchange_address = abts->exchange_address;
-        resp->fcp_hdr_le = abts->fcp_hdr_le;
-        f_ctl = __constant_cpu_to_le32(F_CTL_EXCH_CONTEXT_RESP |
-            F_CTL_LAST_SEQ | F_CTL_END_SEQ |
-            F_CTL_SEQ_INITIATIVE);
-        p = (uint8_t *)&f_ctl;
-        resp->fcp_hdr_le.f_ctl[0] = *p++;
-        resp->fcp_hdr_le.f_ctl[1] = *p++;
-        resp->fcp_hdr_le.f_ctl[2] = *p;
-        if (ids_reversed) {
-                resp->fcp_hdr_le.d_id[0] = abts->fcp_hdr_le.d_id[0];
-                resp->fcp_hdr_le.d_id[1] = abts->fcp_hdr_le.d_id[1];
-                resp->fcp_hdr_le.d_id[2] = abts->fcp_hdr_le.d_id[2];
-                resp->fcp_hdr_le.s_id[0] = abts->fcp_hdr_le.s_id[0];
-                resp->fcp_hdr_le.s_id[1] = abts->fcp_hdr_le.s_id[1];
-                resp->fcp_hdr_le.s_id[2] = abts->fcp_hdr_le.s_id[2];
-        } else {
-                resp->fcp_hdr_le.d_id[0] = abts->fcp_hdr_le.s_id[0];
-                resp->fcp_hdr_le.d_id[1] = abts->fcp_hdr_le.s_id[1];
-                resp->fcp_hdr_le.d_id[2] = abts->fcp_hdr_le.s_id[2];
-                resp->fcp_hdr_le.s_id[0] = abts->fcp_hdr_le.d_id[0];
-                resp->fcp_hdr_le.s_id[1] = abts->fcp_hdr_le.d_id[1];
-                resp->fcp_hdr_le.s_id[2] = abts->fcp_hdr_le.d_id[2];
-        }
-        resp->exchange_addr_to_abort = abts->exchange_addr_to_abort;
-        if (status == FCP_TMF_CMPL) {
-                resp->fcp_hdr_le.r_ctl = R_CTL_BASIC_LINK_SERV | R_CTL_B_ACC;
-                resp->payload.ba_acct.seq_id_valid = SEQ_ID_INVALID;
-                resp->payload.ba_acct.low_seq_cnt = 0x0000;
-                resp->payload.ba_acct.high_seq_cnt = 0xFFFF;
-                resp->payload.ba_acct.ox_id = abts->fcp_hdr_le.ox_id;
-                resp->payload.ba_acct.rx_id = abts->fcp_hdr_le.rx_id;
-        } else {
-                resp->fcp_hdr_le.r_ctl = R_CTL_BASIC_LINK_SERV | R_CTL_B_RJT;
-                resp->payload.ba_rjt.reason_code =
-                        BA_RJT_REASON_CODE_UNABLE_TO_PERFORM;
-                /* Other bytes are zero */
-        }
-
-        ha->tgt.qla_tgt->abts_resp_expected++;
-
-        qla2x00_start_iocbs(vha, vha->req);
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
-        struct abts_resp_from_24xx_fw *entry)
-{
-        struct ctio7_to_24xx *ctio;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe007,
-            "Sending retry TERM EXCH CTIO7 (ha=%p)\n", vha->hw);
-        /* Send marker if required */
-        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
-                return;
-
-        ctio = (struct ctio7_to_24xx *)qla2x00_alloc_iocbs(vha, NULL);
-        if (ctio == NULL) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe04b,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet\n", vha->vp_idx, __func__);
-                return;
-        }
-
-        /*
-         * We've got on entrance firmware's response on by us generated
-         * ABTS response. So, in it ID fields are reversed.
-         */
-
-        ctio->entry_type = CTIO_TYPE7;
-        ctio->entry_count = 1;
-        ctio->nport_handle = entry->nport_handle;
-        ctio->handle = QLA_TGT_SKIP_HANDLE |    CTIO_COMPLETION_HANDLE_MARK;
-        ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
-        ctio->vp_index = vha->vp_idx;
-        ctio->initiator_id[0] = entry->fcp_hdr_le.d_id[0];
-        ctio->initiator_id[1] = entry->fcp_hdr_le.d_id[1];
-        ctio->initiator_id[2] = entry->fcp_hdr_le.d_id[2];
-        ctio->exchange_addr = entry->exchange_addr_to_abort;
-        ctio->u.status1.flags =
-            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
-                CTIO7_FLAGS_TERMINATE);
-        ctio->u.status1.ox_id = entry->fcp_hdr_le.ox_id;
-
-        qla2x00_start_iocbs(vha, vha->req);
-
-        qlt_24xx_send_abts_resp(vha, (struct abts_recv_from_24xx *)entry,
-            FCP_TMF_CMPL, true);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
-        struct abts_recv_from_24xx *abts, struct qla_tgt_sess *sess)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct se_session *se_sess = sess->se_sess;
-        struct qla_tgt_mgmt_cmd *mcmd;
-        struct se_cmd *se_cmd;
-        u32 lun = 0;
-        int rc;
-        bool found_lun = false;
-
-        spin_lock(&se_sess->sess_cmd_lock);
-        list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {
-                struct qla_tgt_cmd *cmd =
-                        container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
-                if (cmd->tag == abts->exchange_addr_to_abort) {
-                        lun = cmd->unpacked_lun;
-                        found_lun = true;
-                        break;
-                }
-        }
-        spin_unlock(&se_sess->sess_cmd_lock);
-
-        if (!found_lun)
-                return -ENOENT;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,
-            "qla_target(%d): task abort (tag=%d)\n",
-            vha->vp_idx, abts->exchange_addr_to_abort);
-
-        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
-        if (mcmd == NULL) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf051,
-                    "qla_target(%d): %s: Allocation of ABORT cmd failed",
-                    vha->vp_idx, __func__);
-                return -ENOMEM;
-        }
-        memset(mcmd, 0, sizeof(*mcmd));
-
-        mcmd->sess = sess;
-        memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));
-
-        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, TMR_ABORT_TASK,
-            abts->exchange_addr_to_abort);
-        if (rc != 0) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,
-                    "qla_target(%d):  tgt_ops->handle_tmr()"
-                    " failed: %d", vha->vp_idx, rc);
-                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_24xx_handle_abts(struct scsi_qla_host *vha,
-        struct abts_recv_from_24xx *abts)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess;
-        uint32_t tag = abts->exchange_addr_to_abort;
-        uint8_t s_id[3];
-        int rc;
-
-        if (le32_to_cpu(abts->fcp_hdr_le.parameter) & ABTS_PARAM_ABORT_SEQ) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf053,
-                    "qla_target(%d): ABTS: Abort Sequence not "
-                    "supported\n", vha->vp_idx);
-                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
-                return;
-        }
-
-        if (tag == ATIO_EXCHANGE_ADDRESS_UNKNOWN) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf010,
-                    "qla_target(%d): ABTS: Unknown Exchange "
-                    "Address received\n", vha->vp_idx);
-                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
-                return;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf011,
-            "qla_target(%d): task abort (s_id=%x:%x:%x, "
-            "tag=%d, param=%x)\n", vha->vp_idx, abts->fcp_hdr_le.s_id[2],
-            abts->fcp_hdr_le.s_id[1], abts->fcp_hdr_le.s_id[0], tag,
-            le32_to_cpu(abts->fcp_hdr_le.parameter));
-
-        s_id[0] = abts->fcp_hdr_le.s_id[2];
-        s_id[1] = abts->fcp_hdr_le.s_id[1];
-        s_id[2] = abts->fcp_hdr_le.s_id[0];
-
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha, s_id);
-        if (!sess) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf012,
-                    "qla_target(%d): task abort for non-existant session\n",
-                    vha->vp_idx);
-                rc = qlt_sched_sess_work(ha->tgt.qla_tgt,
-                    QLA_TGT_SESS_WORK_ABORT, abts, sizeof(*abts));
-                if (rc != 0) {
-                        qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED,
-                            false);
-                }
-                return;
-        }
-
-        rc = __qlt_24xx_handle_abts(vha, abts, sess);
-        if (rc != 0) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf054,
-                    "qla_target(%d): __qlt_24xx_handle_abts() failed: %d\n",
-                    vha->vp_idx, rc);
-                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
-                return;
-        }
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
-        struct qla_tgt_mgmt_cmd *mcmd, uint32_t resp_code)
-{
-        struct atio_from_isp *atio = &mcmd->orig_iocb.atio;
-        struct ctio7_to_24xx *ctio;
-
-        ql_dbg(ql_dbg_tgt, ha, 0xe008,
-            "Sending task mgmt CTIO7 (ha=%p, atio=%p, resp_code=%x\n",
-            ha, atio, resp_code);
-
-        /* Send marker if required */
-        if (qlt_issue_marker(ha, 1) != QLA_SUCCESS)
-                return;
-
-        ctio = (struct ctio7_to_24xx *)qla2x00_alloc_iocbs(ha, NULL);
-        if (ctio == NULL) {
-                ql_dbg(ql_dbg_tgt, ha, 0xe04c,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet\n", ha->vp_idx, __func__);
-                return;
-        }
-
-        ctio->entry_type = CTIO_TYPE7;
-        ctio->entry_count = 1;
-        ctio->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
-        ctio->nport_handle = mcmd->sess->loop_id;
-        ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
-        ctio->vp_index = ha->vp_idx;
-        ctio->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
-        ctio->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
-        ctio->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
-        ctio->exchange_addr = atio->u.isp24.exchange_addr;
-        ctio->u.status1.flags = (atio->u.isp24.attr << 9) |
-            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
-                CTIO7_FLAGS_SEND_STATUS);
-        ctio->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
-        ctio->u.status1.scsi_status =
-            __constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
-        ctio->u.status1.response_len = __constant_cpu_to_le16(8);
-        ctio->u.status1.sense_data[0] = resp_code;
-
-        qla2x00_start_iocbs(ha, ha->req);
-}
-
-void qlt_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)
-{
-        mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
-}
-EXPORT_SYMBOL(qlt_free_mcmd);
-
-/* callback from target fabric module code */
-void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
-{
-        struct scsi_qla_host *vha = mcmd->sess->vha;
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long flags;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf013,
-            "TM response mcmd (%p) status %#x state %#x",
-            mcmd, mcmd->fc_tm_rsp, mcmd->flags);
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        if (mcmd->flags == QLA24XX_MGMT_SEND_NACK)
-                qlt_send_notify_ack(vha, &mcmd->orig_iocb.imm_ntfy,
-                    0, 0, 0, 0, 0, 0);
-        else {
-                if (mcmd->se_cmd.se_tmr_req->function == TMR_ABORT_TASK)
-                        qlt_24xx_send_abts_resp(vha, &mcmd->orig_iocb.abts,
-                            mcmd->fc_tm_rsp, false);
-                else
-                        qlt_24xx_send_task_mgmt_ctio(vha, mcmd,
-                            mcmd->fc_tm_rsp);
-        }
-        /*
-         * Make the callback for ->free_mcmd() to queue_work() and invoke
-         * target_put_sess_cmd() to drop cmd_kref to 1.  The final
-         * target_put_sess_cmd() call will be made from TFO->check_stop_free()
-         * -> tcm_qla2xxx_check_stop_free() to release the TMR associated se_cmd
-         * descriptor after TFO->queue_tm_rsp() -> tcm_qla2xxx_queue_tm_rsp() ->
-         * qlt_xmit_tm_rsp() returns here..
-         */
-        ha->tgt.tgt_ops->free_mcmd(mcmd);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-EXPORT_SYMBOL(qlt_xmit_tm_rsp);
-
-/* No locks */
-static int qlt_pci_map_calc_cnt(struct qla_tgt_prm *prm)
-{
-        struct qla_tgt_cmd *cmd = prm->cmd;
-
-        BUG_ON(cmd->sg_cnt == 0);
-
-        prm->sg = (struct scatterlist *)cmd->sg;
-        prm->seg_cnt = pci_map_sg(prm->tgt->ha->pdev, cmd->sg,
-            cmd->sg_cnt, cmd->dma_data_direction);
-        if (unlikely(prm->seg_cnt == 0))
-                goto out_err;
-
-        prm->cmd->sg_mapped = 1;
-
-        /*
-         * If greater than four sg entries then we need to allocate
-         * the continuation entries
-         */
-        if (prm->seg_cnt > prm->tgt->datasegs_per_cmd)
-                prm->req_cnt += DIV_ROUND_UP(prm->seg_cnt -
-                    prm->tgt->datasegs_per_cmd, prm->tgt->datasegs_per_cont);
-
-        ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe009, "seg_cnt=%d, req_cnt=%d\n",
-            prm->seg_cnt, prm->req_cnt);
-        return 0;
-
-out_err:
-        ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe04d,
-            "qla_target(%d): PCI mapping failed: sg_cnt=%d",
-            0, prm->cmd->sg_cnt);
-        return -1;
-}
-
-static inline void qlt_unmap_sg(struct scsi_qla_host *vha,
-        struct qla_tgt_cmd *cmd)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        BUG_ON(!cmd->sg_mapped);
-        pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
-        cmd->sg_mapped = 0;
-}
-
-static int qlt_check_reserve_free_req(struct scsi_qla_host *vha,
-        uint32_t req_cnt)
-{
-        struct qla_hw_data *ha = vha->hw;
-        device_reg_t __iomem *reg = ha->iobase;
-        uint32_t cnt;
-
-        if (vha->req->cnt < (req_cnt + 2)) {
-                cnt = (uint16_t)RD_REG_DWORD(&reg->isp24.req_q_out);
-
-                ql_dbg(ql_dbg_tgt, vha, 0xe00a,
-                    "Request ring circled: cnt=%d, vha->->ring_index=%d, "
-                    "vha->req->cnt=%d, req_cnt=%d\n", cnt,
-                    vha->req->ring_index, vha->req->cnt, req_cnt);
-                if  (vha->req->ring_index < cnt)
-                        vha->req->cnt = cnt - vha->req->ring_index;
-                else
-                        vha->req->cnt = vha->req->length -
-                            (vha->req->ring_index - cnt);
-        }
-
-        if (unlikely(vha->req->cnt < (req_cnt + 2))) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe00b,
-                    "qla_target(%d): There is no room in the "
-                    "request ring: vha->req->ring_index=%d, vha->req->cnt=%d, "
-                    "req_cnt=%d\n", vha->vp_idx, vha->req->ring_index,
-                    vha->req->cnt, req_cnt);
-                return -EAGAIN;
-        }
-        vha->req->cnt -= req_cnt;
-
-        return 0;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static inline void *qlt_get_req_pkt(struct scsi_qla_host *vha)
-{
-        /* Adjust ring index. */
-        vha->req->ring_index++;
-        if (vha->req->ring_index == vha->req->length) {
-                vha->req->ring_index = 0;
-                vha->req->ring_ptr = vha->req->ring;
-        } else {
-                vha->req->ring_ptr++;
-        }
-        return (cont_entry_t *)vha->req->ring_ptr;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static inline uint32_t qlt_make_handle(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t h;
-
-        h = ha->tgt.current_handle;
-        /* always increment cmd handle */
-        do {
-                ++h;
-                if (h > MAX_OUTSTANDING_COMMANDS)
-                        h = 1; /* 0 is QLA_TGT_NULL_HANDLE */
-                if (h == ha->tgt.current_handle) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe04e,
-                            "qla_target(%d): Ran out of "
-                            "empty cmd slots in ha %p\n", vha->vp_idx, ha);
-                        h = QLA_TGT_NULL_HANDLE;
-                        break;
-                }
-        } while ((h == QLA_TGT_NULL_HANDLE) ||
-            (h == QLA_TGT_SKIP_HANDLE) ||
-            (ha->tgt.cmds[h-1] != NULL));
-
-        if (h != QLA_TGT_NULL_HANDLE)
-                ha->tgt.current_handle = h;
-
-        return h;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
-        struct scsi_qla_host *vha)
-{
-        uint32_t h;
-        struct ctio7_to_24xx *pkt;
-        struct qla_hw_data *ha = vha->hw;
-        struct atio_from_isp *atio = &prm->cmd->atio;
-
-        pkt = (struct ctio7_to_24xx *)vha->req->ring_ptr;
-        prm->pkt = pkt;
-        memset(pkt, 0, sizeof(*pkt));
-
-        pkt->entry_type = CTIO_TYPE7;
-        pkt->entry_count = (uint8_t)prm->req_cnt;
-        pkt->vp_index = vha->vp_idx;
-
-        h = qlt_make_handle(vha);
-        if (unlikely(h == QLA_TGT_NULL_HANDLE)) {
-                /*
-                 * CTIO type 7 from the firmware doesn't provide a way to
-                 * know the initiator's LOOP ID, hence we can't find
-                 * the session and, so, the command.
-                 */
-                return -EAGAIN;
-        } else
-                ha->tgt.cmds[h-1] = prm->cmd;
-
-        pkt->handle = h | CTIO_COMPLETION_HANDLE_MARK;
-        pkt->nport_handle = prm->cmd->loop_id;
-        pkt->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
-        pkt->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
-        pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
-        pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
-        pkt->exchange_addr = atio->u.isp24.exchange_addr;
-        pkt->u.status0.flags |= (atio->u.isp24.attr << 9);
-        pkt->u.status0.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
-        pkt->u.status0.relative_offset = cpu_to_le32(prm->cmd->offset);
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe00c,
-            "qla_target(%d): handle(cmd) -> %08x, timeout %d, ox_id %#x\n",
-            vha->vp_idx, pkt->handle, QLA_TGT_TIMEOUT,
-            le16_to_cpu(pkt->u.status0.ox_id));
-        return 0;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. We have already made sure
- * that there is sufficient amount of request entries to not drop it.
- */
-static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm,
-        struct scsi_qla_host *vha)
-{
-        int cnt;
-        uint32_t *dword_ptr;
-        int enable_64bit_addressing = prm->tgt->tgt_enable_64bit_addr;
-
-        /* Build continuation packets */
-        while (prm->seg_cnt > 0) {
-                cont_a64_entry_t *cont_pkt64 =
-                        (cont_a64_entry_t *)qlt_get_req_pkt(vha);
-
-                /*
-                 * Make sure that from cont_pkt64 none of
-                 * 64-bit specific fields used for 32-bit
-                 * addressing. Cast to (cont_entry_t *) for
-                 * that.
-                 */
-
-                memset(cont_pkt64, 0, sizeof(*cont_pkt64));
-
-                cont_pkt64->entry_count = 1;
-                cont_pkt64->sys_define = 0;
-
-                if (enable_64bit_addressing) {
-                        cont_pkt64->entry_type = CONTINUE_A64_TYPE;
-                        dword_ptr =
-                            (uint32_t *)&cont_pkt64->dseg_0_address;
-                } else {
-                        cont_pkt64->entry_type = CONTINUE_TYPE;
-                        dword_ptr =
-                            (uint32_t *)&((cont_entry_t *)
-                                cont_pkt64)->dseg_0_address;
-                }
-
-                /* Load continuation entry data segments */
-                for (cnt = 0;
-                    cnt < prm->tgt->datasegs_per_cont && prm->seg_cnt;
-                    cnt++, prm->seg_cnt--) {
-                        *dword_ptr++ =
-                            cpu_to_le32(pci_dma_lo32
-                                (sg_dma_address(prm->sg)));
-                        if (enable_64bit_addressing) {
-                                *dword_ptr++ =
-                                    cpu_to_le32(pci_dma_hi32
-                                        (sg_dma_address
-                                        (prm->sg)));
-                        }
-                        *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
-
-                        ql_dbg(ql_dbg_tgt, vha, 0xe00d,
-                            "S/G Segment Cont. phys_addr=%llx:%llx, len=%d\n",
-                            (long long unsigned int)
-                            pci_dma_hi32(sg_dma_address(prm->sg)),
-                            (long long unsigned int)
-                            pci_dma_lo32(sg_dma_address(prm->sg)),
-                            (int)sg_dma_len(prm->sg));
-
-                        prm->sg = sg_next(prm->sg);
-                }
-        }
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. We have already made sure
- * that there is sufficient amount of request entries to not drop it.
- */
-static void qlt_load_data_segments(struct qla_tgt_prm *prm,
-        struct scsi_qla_host *vha)
-{
-        int cnt;
-        uint32_t *dword_ptr;
-        int enable_64bit_addressing = prm->tgt->tgt_enable_64bit_addr;
-        struct ctio7_to_24xx *pkt24 = (struct ctio7_to_24xx *)prm->pkt;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe00e,
-            "iocb->scsi_status=%x, iocb->flags=%x\n",
-            le16_to_cpu(pkt24->u.status0.scsi_status),
-            le16_to_cpu(pkt24->u.status0.flags));
-
-        pkt24->u.status0.transfer_length = cpu_to_le32(prm->cmd->bufflen);
-
-        /* Setup packet address segment pointer */
-        dword_ptr = pkt24->u.status0.dseg_0_address;
-
-        /* Set total data segment count */
-        if (prm->seg_cnt)
-                pkt24->dseg_count = cpu_to_le16(prm->seg_cnt);
-
-        if (prm->seg_cnt == 0) {
-                /* No data transfer */
-                *dword_ptr++ = 0;
-                *dword_ptr = 0;
-                return;
-        }
-
-        /* If scatter gather */
-        ql_dbg(ql_dbg_tgt, vha, 0xe00f, "%s", "Building S/G data segments...");
-
-        /* Load command entry data segments */
-        for (cnt = 0;
-            (cnt < prm->tgt->datasegs_per_cmd) && prm->seg_cnt;
-            cnt++, prm->seg_cnt--) {
-                *dword_ptr++ =
-                    cpu_to_le32(pci_dma_lo32(sg_dma_address(prm->sg)));
-                if (enable_64bit_addressing) {
-                        *dword_ptr++ =
-                            cpu_to_le32(pci_dma_hi32(
-                                sg_dma_address(prm->sg)));
-                }
-                *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
-
-                ql_dbg(ql_dbg_tgt, vha, 0xe010,
-                    "S/G Segment phys_addr=%llx:%llx, len=%d\n",
-                    (long long unsigned int)pci_dma_hi32(sg_dma_address(
-                    prm->sg)),
-                    (long long unsigned int)pci_dma_lo32(sg_dma_address(
-                    prm->sg)),
-                    (int)sg_dma_len(prm->sg));
-
-                prm->sg = sg_next(prm->sg);
-        }
-
-        qlt_load_cont_data_segments(prm, vha);
-}
-
-static inline int qlt_has_data(struct qla_tgt_cmd *cmd)
-{
-        return cmd->bufflen > 0;
-}
-
-/*
- * Called without ha->hardware_lock held
- */
-static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
-        struct qla_tgt_prm *prm, int xmit_type, uint8_t scsi_status,
-        uint32_t *full_req_cnt)
-{
-        struct qla_tgt *tgt = cmd->tgt;
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct se_cmd *se_cmd = &cmd->se_cmd;
-
-        if (unlikely(cmd->aborted)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
-                    "qla_target(%d): terminating exchange "
-                    "for aborted cmd=%p (se_cmd=%p, tag=%d)", vha->vp_idx, cmd,
-                    se_cmd, cmd->tag);
-
-                cmd->state = QLA_TGT_STATE_ABORTED;
-
-                qlt_send_term_exchange(vha, cmd, &cmd->atio, 0);
-
-                /* !! At this point cmd could be already freed !! */
-                return QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED;
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe011, "qla_target(%d): tag=%u\n",
-            vha->vp_idx, cmd->tag);
-
-        prm->cmd = cmd;
-        prm->tgt = tgt;
-        prm->rq_result = scsi_status;
-        prm->sense_buffer = &cmd->sense_buffer[0];
-        prm->sense_buffer_len = TRANSPORT_SENSE_BUFFER;
-        prm->sg = NULL;
-        prm->seg_cnt = -1;
-        prm->req_cnt = 1;
-        prm->add_status_pkt = 0;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe012, "rq_result=%x, xmit_type=%x\n",
-            prm->rq_result, xmit_type);
-
-        /* Send marker if required */
-        if (qlt_issue_marker(vha, 0) != QLA_SUCCESS)
-                return -EFAULT;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe013, "CTIO start: vha(%d)\n", vha->vp_idx);
-
-        if ((xmit_type & QLA_TGT_XMIT_DATA) && qlt_has_data(cmd)) {
-                if  (qlt_pci_map_calc_cnt(prm) != 0)
-                        return -EAGAIN;
-        }
-
-        *full_req_cnt = prm->req_cnt;
-
-        if (se_cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
-                prm->residual = se_cmd->residual_count;
-                ql_dbg(ql_dbg_tgt, vha, 0xe014,
-                    "Residual underflow: %d (tag %d, "
-                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                    cmd->bufflen, prm->rq_result);
-                prm->rq_result |= SS_RESIDUAL_UNDER;
-        } else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
-                prm->residual = se_cmd->residual_count;
-                ql_dbg(ql_dbg_tgt, vha, 0xe015,
-                    "Residual overflow: %d (tag %d, "
-                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                    cmd->bufflen, prm->rq_result);
-                prm->rq_result |= SS_RESIDUAL_OVER;
-        }
-
-        if (xmit_type & QLA_TGT_XMIT_STATUS) {
-                /*
-                 * If QLA_TGT_XMIT_DATA is not set, add_status_pkt will be
-                 * ignored in *xmit_response() below
-                 */
-                if (qlt_has_data(cmd)) {
-                        if (QLA_TGT_SENSE_VALID(prm->sense_buffer) ||
-                            (IS_FWI2_CAPABLE(ha) &&
-                            (prm->rq_result != 0))) {
-                                prm->add_status_pkt = 1;
-                                (*full_req_cnt)++;
-                        }
-                }
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe016,
-            "req_cnt=%d, full_req_cnt=%d, add_status_pkt=%d\n",
-            prm->req_cnt, *full_req_cnt, prm->add_status_pkt);
-
-        return 0;
-}
-
-static inline int qlt_need_explicit_conf(struct qla_hw_data *ha,
-        struct qla_tgt_cmd *cmd, int sending_sense)
-{
-        if (ha->tgt.enable_class_2)
-                return 0;
-
-        if (sending_sense)
-                return cmd->conf_compl_supported;
-        else
-                return ha->tgt.enable_explicit_conf &&
-                    cmd->conf_compl_supported;
-}
-
-#ifdef CONFIG_QLA_TGT_DEBUG_SRR
-/*
- *  Original taken from the XFS code
- */
-static unsigned long qlt_srr_random(void)
-{
-        static int Inited;
-        static unsigned long RandomValue;
-        static DEFINE_SPINLOCK(lock);
-        /* cycles pseudo-randomly through all values between 1 and 2^31 - 2 */
-        register long rv;
-        register long lo;
-        register long hi;
-        unsigned long flags;
-
-        spin_lock_irqsave(&lock, flags);
-        if (!Inited) {
-                RandomValue = jiffies;
-                Inited = 1;
-        }
-        rv = RandomValue;
-        hi = rv / 127773;
-        lo = rv % 127773;
-        rv = 16807 * lo - 2836 * hi;
-        if (rv <= 0)
-                rv += 2147483647;
-        RandomValue = rv;
-        spin_unlock_irqrestore(&lock, flags);
-        return rv;
-}
-
-static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
-{
-#if 0 /* This is not a real status packets lost, so it won't lead to SRR */
-        if ((*xmit_type & QLA_TGT_XMIT_STATUS) && (qlt_srr_random() % 200)
-            == 50) {
-                *xmit_type &= ~QLA_TGT_XMIT_STATUS;
-                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf015,
-                    "Dropping cmd %p (tag %d) status", cmd, cmd->tag);
-        }
-#endif
-        /*
-         * It's currently not possible to simulate SRRs for FCP_WRITE without
-         * a physical link layer failure, so don't even try here..
-         */
-        if (cmd->dma_data_direction != DMA_FROM_DEVICE)
-                return;
-
-        if (qlt_has_data(cmd) && (cmd->sg_cnt > 1) &&
-            ((qlt_srr_random() % 100) == 20)) {
-                int i, leave = 0;
-                unsigned int tot_len = 0;
-
-                while (leave == 0)
-                        leave = qlt_srr_random() % cmd->sg_cnt;
-
-                for (i = 0; i < leave; i++)
-                        tot_len += cmd->sg[i].length;
-
-                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf016,
-                    "Cutting cmd %p (tag %d) buffer"
-                    " tail to len %d, sg_cnt %d (cmd->bufflen %d,"
-                    " cmd->sg_cnt %d)", cmd, cmd->tag, tot_len, leave,
-                    cmd->bufflen, cmd->sg_cnt);
-
-                cmd->bufflen = tot_len;
-                cmd->sg_cnt = leave;
-        }
-
-        if (qlt_has_data(cmd) && ((qlt_srr_random() % 100) == 70)) {
-                unsigned int offset = qlt_srr_random() % cmd->bufflen;
-
-                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf017,
-                    "Cutting cmd %p (tag %d) buffer head "
-                    "to offset %d (cmd->bufflen %d)", cmd, cmd->tag, offset,
-                    cmd->bufflen);
-                if (offset == 0)
-                        *xmit_type &= ~QLA_TGT_XMIT_DATA;
-                else if (qlt_set_data_offset(cmd, offset)) {
-                        ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf018,
-                            "qlt_set_data_offset() failed (tag %d)", cmd->tag);
-                }
-        }
-}
-#else
-static inline void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
-{}
-#endif
-
-static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio,
-        struct qla_tgt_prm *prm)
-{
-        prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
-            (uint32_t)sizeof(ctio->u.status1.sense_data));
-        ctio->u.status0.flags |=
-            __constant_cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
-        if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) {
-                ctio->u.status0.flags |= __constant_cpu_to_le16(
-                    CTIO7_FLAGS_EXPLICIT_CONFORM |
-                    CTIO7_FLAGS_CONFORM_REQ);
-        }
-        ctio->u.status0.residual = cpu_to_le32(prm->residual);
-        ctio->u.status0.scsi_status = cpu_to_le16(prm->rq_result);
-        if (QLA_TGT_SENSE_VALID(prm->sense_buffer)) {
-                int i;
-
-                if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 1)) {
-                        if (prm->cmd->se_cmd.scsi_status != 0) {
-                                ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe017,
-                                    "Skipping EXPLICIT_CONFORM and "
-                                    "CTIO7_FLAGS_CONFORM_REQ for FCP READ w/ "
-                                    "non GOOD status\n");
-                                goto skip_explict_conf;
-                        }
-                        ctio->u.status1.flags |= __constant_cpu_to_le16(
-                            CTIO7_FLAGS_EXPLICIT_CONFORM |
-                            CTIO7_FLAGS_CONFORM_REQ);
-                }
-skip_explict_conf:
-                ctio->u.status1.flags &=
-                    ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
-                ctio->u.status1.flags |=
-                    __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
-                ctio->u.status1.scsi_status |=
-                    __constant_cpu_to_le16(SS_SENSE_LEN_VALID);
-                ctio->u.status1.sense_length =
-                    cpu_to_le16(prm->sense_buffer_len);
-                for (i = 0; i < prm->sense_buffer_len/4; i++)
-                        ((uint32_t *)ctio->u.status1.sense_data)[i] =
-                                cpu_to_be32(((uint32_t *)prm->sense_buffer)[i]);
-#if 0
-                if (unlikely((prm->sense_buffer_len % 4) != 0)) {
-                        static int q;
-                        if (q < 10) {
-                                ql_dbg(ql_dbg_tgt, vha, 0xe04f,
-                                    "qla_target(%d): %d bytes of sense "
-                                    "lost", prm->tgt->ha->vp_idx,
-                                    prm->sense_buffer_len % 4);
-                                q++;
-                        }
-                }
-#endif
-        } else {
-                ctio->u.status1.flags &=
-                    ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
-                ctio->u.status1.flags |=
-                    __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
-                ctio->u.status1.sense_length = 0;
-                memset(ctio->u.status1.sense_data, 0,
-                    sizeof(ctio->u.status1.sense_data));
-        }
-
-        /* Sense with len > 24, is it possible ??? */
-}
-
-/*
- * Callback to setup response of xmit_type of QLA_TGT_XMIT_DATA and *
- * QLA_TGT_XMIT_STATUS for >= 24xx silicon
- */
-int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
-        uint8_t scsi_status)
-{
-        struct scsi_qla_host *vha = cmd->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct ctio7_to_24xx *pkt;
-        struct qla_tgt_prm prm;
-        uint32_t full_req_cnt = 0;
-        unsigned long flags = 0;
-        int res;
-
-        memset(&prm, 0, sizeof(prm));
-        qlt_check_srr_debug(cmd, &xmit_type);
-
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe018,
-            "is_send_status=%d, cmd->bufflen=%d, cmd->sg_cnt=%d, "
-            "cmd->dma_data_direction=%d\n", (xmit_type & QLA_TGT_XMIT_STATUS) ?
-            1 : 0, cmd->bufflen, cmd->sg_cnt, cmd->dma_data_direction);
-
-        res = qlt_pre_xmit_response(cmd, &prm, xmit_type, scsi_status,
-            &full_req_cnt);
-        if (unlikely(res != 0)) {
-                if (res == QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED)
-                        return 0;
-
-                return res;
-        }
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        /* Does F/W have an IOCBs for this request */
-        res = qlt_check_reserve_free_req(vha, full_req_cnt);
-        if (unlikely(res))
-                goto out_unmap_unlock;
-
-        res = qlt_24xx_build_ctio_pkt(&prm, vha);
-        if (unlikely(res != 0))
-                goto out_unmap_unlock;
-
-
-        pkt = (struct ctio7_to_24xx *)prm.pkt;
-
-        if (qlt_has_data(cmd) && (xmit_type & QLA_TGT_XMIT_DATA)) {
-                pkt->u.status0.flags |=
-                    __constant_cpu_to_le16(CTIO7_FLAGS_DATA_IN |
-                        CTIO7_FLAGS_STATUS_MODE_0);
-
-                qlt_load_data_segments(&prm, vha);
-
-                if (prm.add_status_pkt == 0) {
-                        if (xmit_type & QLA_TGT_XMIT_STATUS) {
-                                pkt->u.status0.scsi_status =
-                                    cpu_to_le16(prm.rq_result);
-                                pkt->u.status0.residual =
-                                    cpu_to_le32(prm.residual);
-                                pkt->u.status0.flags |= __constant_cpu_to_le16(
-                                    CTIO7_FLAGS_SEND_STATUS);
-                                if (qlt_need_explicit_conf(ha, cmd, 0)) {
-                                        pkt->u.status0.flags |=
-                                            __constant_cpu_to_le16(
-                                                CTIO7_FLAGS_EXPLICIT_CONFORM |
-                                                CTIO7_FLAGS_CONFORM_REQ);
-                                }
-                        }
-
-                } else {
-                        /*
-                         * We have already made sure that there is sufficient
-                         * amount of request entries to not drop HW lock in
-                         * req_pkt().
-                         */
-                        struct ctio7_to_24xx *ctio =
-                                (struct ctio7_to_24xx *)qlt_get_req_pkt(vha);
-
-                        ql_dbg(ql_dbg_tgt, vha, 0xe019,
-                            "Building additional status packet\n");
-
-                        memcpy(ctio, pkt, sizeof(*ctio));
-                        ctio->entry_count = 1;
-                        ctio->dseg_count = 0;
-                        ctio->u.status1.flags &= ~__constant_cpu_to_le16(
-                            CTIO7_FLAGS_DATA_IN);
-
-                        /* Real finish is ctio_m1's finish */
-                        pkt->handle |= CTIO_INTERMEDIATE_HANDLE_MARK;
-                        pkt->u.status0.flags |= __constant_cpu_to_le16(
-                            CTIO7_FLAGS_DONT_RET_CTIO);
-                        qlt_24xx_init_ctio_to_isp((struct ctio7_to_24xx *)ctio,
-                            &prm);
-                        pr_debug("Status CTIO7: %p\n", ctio);
-                }
-        } else
-                qlt_24xx_init_ctio_to_isp(pkt, &prm);
-
-
-        cmd->state = QLA_TGT_STATE_PROCESSED; /* Mid-level is done processing */
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe01a,
-            "Xmitting CTIO7 response pkt for 24xx: %p scsi_status: 0x%02x\n",
-            pkt, scsi_status);
-
-        qla2x00_start_iocbs(vha, vha->req);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return 0;
-
-out_unmap_unlock:
-        if (cmd->sg_mapped)
-                qlt_unmap_sg(vha, cmd);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return res;
-}
-EXPORT_SYMBOL(qlt_xmit_response);
-
-int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
-{
-        struct ctio7_to_24xx *pkt;
-        struct scsi_qla_host *vha = cmd->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = cmd->tgt;
-        struct qla_tgt_prm prm;
-        unsigned long flags;
-        int res = 0;
-
-        memset(&prm, 0, sizeof(prm));
-        prm.cmd = cmd;
-        prm.tgt = tgt;
-        prm.sg = NULL;
-        prm.req_cnt = 1;
-
-        /* Send marker if required */
-        if (qlt_issue_marker(vha, 0) != QLA_SUCCESS)
-                return -EIO;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe01b, "CTIO_start: vha(%d)",
-            (int)vha->vp_idx);
-
-        /* Calculate number of entries and segments required */
-        if (qlt_pci_map_calc_cnt(&prm) != 0)
-                return -EAGAIN;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        /* Does F/W have an IOCBs for this request */
-        res = qlt_check_reserve_free_req(vha, prm.req_cnt);
-        if (res != 0)
-                goto out_unlock_free_unmap;
-
-        res = qlt_24xx_build_ctio_pkt(&prm, vha);
-        if (unlikely(res != 0))
-                goto out_unlock_free_unmap;
-        pkt = (struct ctio7_to_24xx *)prm.pkt;
-        pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
-            CTIO7_FLAGS_STATUS_MODE_0);
-        qlt_load_data_segments(&prm, vha);
-
-        cmd->state = QLA_TGT_STATE_NEED_DATA;
-
-        qla2x00_start_iocbs(vha, vha->req);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return res;
-
-out_unlock_free_unmap:
-        if (cmd->sg_mapped)
-                qlt_unmap_sg(vha, cmd);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        return res;
-}
-EXPORT_SYMBOL(qlt_rdy_to_xfer);
-
-/* If hardware_lock held on entry, might drop it, then reaquire */
-/* This function sends the appropriate CTIO to ISP 2xxx or 24xx */
-static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
-        struct qla_tgt_cmd *cmd,
-        struct atio_from_isp *atio)
-{
-        struct ctio7_to_24xx *ctio24;
-        struct qla_hw_data *ha = vha->hw;
-        request_t *pkt;
-        int ret = 0;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe01c, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
-
-        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
-        if (pkt == NULL) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe050,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet\n", vha->vp_idx, __func__);
-                return -ENOMEM;
-        }
-
-        if (cmd != NULL) {
-                if (cmd->state < QLA_TGT_STATE_PROCESSED) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe051,
-                            "qla_target(%d): Terminating cmd %p with "
-                            "incorrect state %d\n", vha->vp_idx, cmd,
-                            cmd->state);
-                } else
-                        ret = 1;
-        }
-
-        pkt->entry_count = 1;
-        pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
-
-        ctio24 = (struct ctio7_to_24xx *)pkt;
-        ctio24->entry_type = CTIO_TYPE7;
-        ctio24->nport_handle = cmd ? cmd->loop_id : CTIO7_NHANDLE_UNRECOGNIZED;
-        ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
-        ctio24->vp_index = vha->vp_idx;
-        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
-        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
-        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
-        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
-        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
-            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
-                CTIO7_FLAGS_TERMINATE);
-        ctio24->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
-
-        /* Most likely, it isn't needed */
-        ctio24->u.status1.residual = get_unaligned((uint32_t *)
-            &atio->u.isp24.fcp_cmnd.add_cdb[
-            atio->u.isp24.fcp_cmnd.add_cdb_len]);
-        if (ctio24->u.status1.residual != 0)
-                ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
-
-        qla2x00_start_iocbs(vha, vha->req);
-        return ret;
-}
-
-static void qlt_send_term_exchange(struct scsi_qla_host *vha,
-        struct qla_tgt_cmd *cmd, struct atio_from_isp *atio, int ha_locked)
-{
-        unsigned long flags;
-        int rc;
-
-        if (qlt_issue_marker(vha, ha_locked) < 0)
-                return;
-
-        if (ha_locked) {
-                rc = __qlt_send_term_exchange(vha, cmd, atio);
-                goto done;
-        }
-        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
-        rc = __qlt_send_term_exchange(vha, cmd, atio);
-        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
-done:
-        if (rc == 1) {
-                if (!ha_locked && !in_interrupt())
-                        msleep(250); /* just in case */
-
-                vha->hw->tgt.tgt_ops->free_cmd(cmd);
-        }
-}
-
-void qlt_free_cmd(struct qla_tgt_cmd *cmd)
-{
-        BUG_ON(cmd->sg_mapped);
-
-        if (unlikely(cmd->free_sg))
-                kfree(cmd->sg);
-        kmem_cache_free(qla_tgt_cmd_cachep, cmd);
-}
-EXPORT_SYMBOL(qlt_free_cmd);
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_prepare_srr_ctio(struct scsi_qla_host *vha,
-        struct qla_tgt_cmd *cmd, void *ctio)
-{
-        struct qla_tgt_srr_ctio *sc;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_srr_imm *imm;
-
-        tgt->ctio_srr_id++;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf019,
-            "qla_target(%d): CTIO with SRR status received\n", vha->vp_idx);
-
-        if (!ctio) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf055,
-                    "qla_target(%d): SRR CTIO, but ctio is NULL\n",
-                    vha->vp_idx);
-                return -EINVAL;
-        }
-
-        sc = kzalloc(sizeof(*sc), GFP_ATOMIC);
-        if (sc != NULL) {
-                sc->cmd = cmd;
-                /* IRQ is already OFF */
-                spin_lock(&tgt->srr_lock);
-                sc->srr_id = tgt->ctio_srr_id;
-                list_add_tail(&sc->srr_list_entry,
-                    &tgt->srr_ctio_list);
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01a,
-                    "CTIO SRR %p added (id %d)\n", sc, sc->srr_id);
-                if (tgt->imm_srr_id == tgt->ctio_srr_id) {
-                        int found = 0;
-                        list_for_each_entry(imm, &tgt->srr_imm_list,
-                            srr_list_entry) {
-                                if (imm->srr_id == sc->srr_id) {
-                                        found = 1;
-                                        break;
-                                }
-                        }
-                        if (found) {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01b,
-                                    "Scheduling srr work\n");
-                                schedule_work(&tgt->srr_work);
-                        } else {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf056,
-                                    "qla_target(%d): imm_srr_id "
-                                    "== ctio_srr_id (%d), but there is no "
-                                    "corresponding SRR IMM, deleting CTIO "
-                                    "SRR %p\n", vha->vp_idx,
-                                    tgt->ctio_srr_id, sc);
-                                list_del(&sc->srr_list_entry);
-                                spin_unlock(&tgt->srr_lock);
-
-                                kfree(sc);
-                                return -EINVAL;
-                        }
-                }
-                spin_unlock(&tgt->srr_lock);
-        } else {
-                struct qla_tgt_srr_imm *ti;
-
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf057,
-                    "qla_target(%d): Unable to allocate SRR CTIO entry\n",
-                    vha->vp_idx);
-                spin_lock(&tgt->srr_lock);
-                list_for_each_entry_safe(imm, ti, &tgt->srr_imm_list,
-                    srr_list_entry) {
-                        if (imm->srr_id == tgt->ctio_srr_id) {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01c,
-                                    "IMM SRR %p deleted (id %d)\n",
-                                    imm, imm->srr_id);
-                                list_del(&imm->srr_list_entry);
-                                qlt_reject_free_srr_imm(vha, imm, 1);
-                        }
-                }
-                spin_unlock(&tgt->srr_lock);
-
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static int qlt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
-        struct qla_tgt_cmd *cmd, uint32_t status)
-{
-        int term = 0;
-
-        if (ctio != NULL) {
-                struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;
-                term = !(c->flags &
-                    __constant_cpu_to_le16(OF_TERM_EXCH));
-        } else
-                term = 1;
-
-        if (term)
-                qlt_send_term_exchange(vha, cmd, &cmd->atio, 1);
-
-        return term;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static inline struct qla_tgt_cmd *qlt_get_cmd(struct scsi_qla_host *vha,
-        uint32_t handle)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        handle--;
-        if (ha->tgt.cmds[handle] != NULL) {
-                struct qla_tgt_cmd *cmd = ha->tgt.cmds[handle];
-                ha->tgt.cmds[handle] = NULL;
-                return cmd;
-        } else
-                return NULL;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static struct qla_tgt_cmd *qlt_ctio_to_cmd(struct scsi_qla_host *vha,
-        uint32_t handle, void *ctio)
-{
-        struct qla_tgt_cmd *cmd = NULL;
-
-        /* Clear out internal marks */
-        handle &= ~(CTIO_COMPLETION_HANDLE_MARK |
-            CTIO_INTERMEDIATE_HANDLE_MARK);
-
-        if (handle != QLA_TGT_NULL_HANDLE) {
-                if (unlikely(handle == QLA_TGT_SKIP_HANDLE)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe01d, "%s",
-                            "SKIP_HANDLE CTIO\n");
-                        return NULL;
-                }
-                /* handle-1 is actually used */
-                if (unlikely(handle > MAX_OUTSTANDING_COMMANDS)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe052,
-                            "qla_target(%d): Wrong handle %x received\n",
-                            vha->vp_idx, handle);
-                        return NULL;
-                }
-                cmd = qlt_get_cmd(vha, handle);
-                if (unlikely(cmd == NULL)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe053,
-                            "qla_target(%d): Suspicious: unable to "
-                            "find the command with handle %x\n", vha->vp_idx,
-                            handle);
-                        return NULL;
-                }
-        } else if (ctio != NULL) {
-                /* We can't get loop ID from CTIO7 */
-                ql_dbg(ql_dbg_tgt, vha, 0xe054,
-                    "qla_target(%d): Wrong CTIO received: QLA24xx doesn't "
-                    "support NULL handles\n", vha->vp_idx);
-                return NULL;
-        }
-
-        return cmd;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
-        uint32_t status, void *ctio)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct se_cmd *se_cmd;
-        struct target_core_fabric_ops *tfo;
-        struct qla_tgt_cmd *cmd;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe01e,
-            "qla_target(%d): handle(ctio %p status %#x) <- %08x\n",
-            vha->vp_idx, ctio, status, handle);
-
-        if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
-                /* That could happen only in case of an error/reset/abort */
-                if (status != CTIO_SUCCESS) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01d,
-                            "Intermediate CTIO received"
-                            " (status %x)\n", status);
-                }
-                return;
-        }
-
-        cmd = qlt_ctio_to_cmd(vha, handle, ctio);
-        if (cmd == NULL)
-                return;
-
-        se_cmd = &cmd->se_cmd;
-        tfo = se_cmd->se_tfo;
-
-        if (cmd->sg_mapped)
-                qlt_unmap_sg(vha, cmd);
-
-        if (unlikely(status != CTIO_SUCCESS)) {
-                switch (status & 0xFFFF) {
-                case CTIO_LIP_RESET:
-                case CTIO_TARGET_RESET:
-                case CTIO_ABORTED:
-                case CTIO_TIMEOUT:
-                case CTIO_INVALID_RX_ID:
-                        /* They are OK */
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf058,
-                            "qla_target(%d): CTIO with "
-                            "status %#x received, state %x, se_cmd %p, "
-                            "(LIP_RESET=e, ABORTED=2, TARGET_RESET=17, "
-                            "TIMEOUT=b, INVALID_RX_ID=8)\n", vha->vp_idx,
-                            status, cmd->state, se_cmd);
-                        break;
-
-                case CTIO_PORT_LOGGED_OUT:
-                case CTIO_PORT_UNAVAILABLE:
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf059,
-                            "qla_target(%d): CTIO with PORT LOGGED "
-                            "OUT (29) or PORT UNAVAILABLE (28) status %x "
-                            "received (state %x, se_cmd %p)\n", vha->vp_idx,
-                            status, cmd->state, se_cmd);
-                        break;
-
-                case CTIO_SRR_RECEIVED:
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05a,
-                            "qla_target(%d): CTIO with SRR_RECEIVED"
-                            " status %x received (state %x, se_cmd %p)\n",
-                            vha->vp_idx, status, cmd->state, se_cmd);
-                        if (qlt_prepare_srr_ctio(vha, cmd, ctio) != 0)
-                                break;
-                        else
-                                return;
-
-                default:
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05b,
-                            "qla_target(%d): CTIO with error status "
-                            "0x%x received (state %x, se_cmd %p\n",
-                            vha->vp_idx, status, cmd->state, se_cmd);
-                        break;
-                }
-
-                if (cmd->state != QLA_TGT_STATE_NEED_DATA)
-                        if (qlt_term_ctio_exchange(vha, ctio, cmd, status))
-                                return;
-        }
-
-        if (cmd->state == QLA_TGT_STATE_PROCESSED) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe01f, "Command %p finished\n", cmd);
-        } else if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
-                int rx_status = 0;
-
-                cmd->state = QLA_TGT_STATE_DATA_IN;
-
-                if (unlikely(status != CTIO_SUCCESS))
-                        rx_status = -EIO;
-                else
-                        cmd->write_data_transferred = 1;
-
-                ql_dbg(ql_dbg_tgt, vha, 0xe020,
-                    "Data received, context %x, rx_status %d\n",
-                    0x0, rx_status);
-
-                ha->tgt.tgt_ops->handle_data(cmd);
-                return;
-        } else if (cmd->state == QLA_TGT_STATE_ABORTED) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e,
-                    "Aborted command %p (tag %d) finished\n", cmd, cmd->tag);
-        } else {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c,
-                    "qla_target(%d): A command in state (%d) should "
-                    "not return a CTIO complete\n", vha->vp_idx, cmd->state);
-        }
-
-        if (unlikely(status != CTIO_SUCCESS)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01f, "Finishing failed CTIO\n");
-                dump_stack();
-        }
-
-        ha->tgt.tgt_ops->free_cmd(cmd);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-/* called via callback from qla2xxx */
-void qlt_ctio_completion(struct scsi_qla_host *vha, uint32_t handle)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-
-        if (likely(tgt == NULL)) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe021,
-                    "CTIO, but target mode not enabled"
-                    " (ha %d %p handle %#x)", vha->vp_idx, ha, handle);
-                return;
-        }
-
-        tgt->irq_cmd_count++;
-        qlt_do_ctio_completion(vha, handle, CTIO_SUCCESS, NULL);
-        tgt->irq_cmd_count--;
-}
-
-static inline int qlt_get_fcp_task_attr(struct scsi_qla_host *vha,
-        uint8_t task_codes)
-{
-        int fcp_task_attr;
-
-        switch (task_codes) {
-        case ATIO_SIMPLE_QUEUE:
-                fcp_task_attr = MSG_SIMPLE_TAG;
-                break;
-        case ATIO_HEAD_OF_QUEUE:
-                fcp_task_attr = MSG_HEAD_TAG;
-                break;
-        case ATIO_ORDERED_QUEUE:
-                fcp_task_attr = MSG_ORDERED_TAG;
-                break;
-        case ATIO_ACA_QUEUE:
-                fcp_task_attr = MSG_ACA_TAG;
-                break;
-        case ATIO_UNTAGGED:
-                fcp_task_attr = MSG_SIMPLE_TAG;
-                break;
-        default:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05d,
-                    "qla_target: unknown task code %x, use ORDERED instead\n",
-                    task_codes);
-                fcp_task_attr = MSG_ORDERED_TAG;
-                break;
-        }
-
-        return fcp_task_attr;
-}
-
-static struct qla_tgt_sess *qlt_make_local_sess(struct scsi_qla_host *,
-                                        uint8_t *);
-/*
- * Process context for I/O path into tcm_qla2xxx code
- */
-static void qlt_do_work(struct work_struct *work)
-{
-        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
-        scsi_qla_host_t *vha = cmd->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_sess *sess = NULL;
-        struct atio_from_isp *atio = &cmd->atio;
-        unsigned char *cdb;
-        unsigned long flags;
-        uint32_t data_length;
-        int ret, fcp_task_attr, data_dir, bidi = 0;
-
-        if (tgt->tgt_stop)
-                goto out_term;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
-            atio->u.isp24.fcp_hdr.s_id);
-        /* Do kref_get() before dropping qla_hw_data->hardware_lock. */
-        if (sess)
-                kref_get(&sess->se_sess->sess_kref);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        if (unlikely(!sess)) {
-                uint8_t *s_id = atio->u.isp24.fcp_hdr.s_id;
-
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf022,
-                        "qla_target(%d): Unable to find wwn login"
-                        " (s_id %x:%x:%x), trying to create it manually\n",
-                        vha->vp_idx, s_id[0], s_id[1], s_id[2]);
-
-                if (atio->u.raw.entry_count > 1) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf023,
-                                "Dropping multy entry cmd %p\n", cmd);
-                        goto out_term;
-                }
-
-                mutex_lock(&ha->tgt.tgt_mutex);
-                sess = qlt_make_local_sess(vha, s_id);
-                /* sess has an extra creation ref. */
-                mutex_unlock(&ha->tgt.tgt_mutex);
-
-                if (!sess)
-                        goto out_term;
-        }
-
-        cmd->sess = sess;
-        cmd->loop_id = sess->loop_id;
-        cmd->conf_compl_supported = sess->conf_compl_supported;
-
-        cdb = &atio->u.isp24.fcp_cmnd.cdb[0];
-        cmd->tag = atio->u.isp24.exchange_addr;
-        cmd->unpacked_lun = scsilun_to_int(
-            (struct scsi_lun *)&atio->u.isp24.fcp_cmnd.lun);
-
-        if (atio->u.isp24.fcp_cmnd.rddata &&
-            atio->u.isp24.fcp_cmnd.wrdata) {
-                bidi = 1;
-                data_dir = DMA_TO_DEVICE;
-        } else if (atio->u.isp24.fcp_cmnd.rddata)
-                data_dir = DMA_FROM_DEVICE;
-        else if (atio->u.isp24.fcp_cmnd.wrdata)
-                data_dir = DMA_TO_DEVICE;
-        else
-                data_dir = DMA_NONE;
-
-        fcp_task_attr = qlt_get_fcp_task_attr(vha,
-            atio->u.isp24.fcp_cmnd.task_attr);
-        data_length = be32_to_cpu(get_unaligned((uint32_t *)
-            &atio->u.isp24.fcp_cmnd.add_cdb[
-            atio->u.isp24.fcp_cmnd.add_cdb_len]));
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe022,
-            "qla_target: START qla command: %p lun: 0x%04x (tag %d)\n",
-            cmd, cmd->unpacked_lun, cmd->tag);
-
-        ret = vha->hw->tgt.tgt_ops->handle_cmd(vha, cmd, cdb, data_length,
-            fcp_task_attr, data_dir, bidi);
-        if (ret != 0)
-                goto out_term;
-        /*
-         * Drop extra session reference from qla_tgt_handle_cmd_for_atio*(
-         */
-        ha->tgt.tgt_ops->put_sess(sess);
-        return;
-
-out_term:
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf020, "Terminating work cmd %p", cmd);
-        /*
-         * cmd has not sent to target yet, so pass NULL as the second
-         * argument to qlt_send_term_exchange() and free the memory here.
-         */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        qlt_send_term_exchange(vha, NULL, &cmd->atio, 1);
-        kmem_cache_free(qla_tgt_cmd_cachep, cmd);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        if (sess)
-                ha->tgt.tgt_ops->put_sess(sess);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
-        struct atio_from_isp *atio)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_cmd *cmd;
-
-        if (unlikely(tgt->tgt_stop)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf021,
-                    "New command while device %p is shutting down\n", tgt);
-                return -EFAULT;
-        }
-
-        cmd = kmem_cache_zalloc(qla_tgt_cmd_cachep, GFP_ATOMIC);
-        if (!cmd) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05e,
-                    "qla_target(%d): Allocation of cmd failed\n", vha->vp_idx);
-                return -ENOMEM;
-        }
-
-        INIT_LIST_HEAD(&cmd->cmd_list);
-
-        memcpy(&cmd->atio, atio, sizeof(*atio));
-        cmd->state = QLA_TGT_STATE_NEW;
-        cmd->tgt = ha->tgt.qla_tgt;
-        cmd->vha = vha;
-
-        INIT_WORK(&cmd->work, qlt_do_work);
-        queue_work(qla_tgt_wq, &cmd->work);
-        return 0;
-
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_issue_task_mgmt(struct qla_tgt_sess *sess, uint32_t lun,
-        int fn, void *iocb, int flags)
-{
-        struct scsi_qla_host *vha = sess->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_mgmt_cmd *mcmd;
-        int res;
-        uint8_t tmr_func;
-
-        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
-        if (!mcmd) {
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10009,
-                    "qla_target(%d): Allocation of management "
-                    "command failed, some commands and their data could "
-                    "leak\n", vha->vp_idx);
-                return -ENOMEM;
-        }
-        memset(mcmd, 0, sizeof(*mcmd));
-        mcmd->sess = sess;
-
-        if (iocb) {
-                memcpy(&mcmd->orig_iocb.imm_ntfy, iocb,
-                    sizeof(mcmd->orig_iocb.imm_ntfy));
-        }
-        mcmd->tmr_func = fn;
-        mcmd->flags = flags;
-
-        switch (fn) {
-        case QLA_TGT_CLEAR_ACA:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10000,
-                    "qla_target(%d): CLEAR_ACA received\n", sess->vha->vp_idx);
-                tmr_func = TMR_CLEAR_ACA;
-                break;
-
-        case QLA_TGT_TARGET_RESET:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10001,
-                    "qla_target(%d): TARGET_RESET received\n",
-                    sess->vha->vp_idx);
-                tmr_func = TMR_TARGET_WARM_RESET;
-                break;
-
-        case QLA_TGT_LUN_RESET:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10002,
-                    "qla_target(%d): LUN_RESET received\n", sess->vha->vp_idx);
-                tmr_func = TMR_LUN_RESET;
-                break;
-
-        case QLA_TGT_CLEAR_TS:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10003,
-                    "qla_target(%d): CLEAR_TS received\n", sess->vha->vp_idx);
-                tmr_func = TMR_CLEAR_TASK_SET;
-                break;
-
-        case QLA_TGT_ABORT_TS:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10004,
-                    "qla_target(%d): ABORT_TS received\n", sess->vha->vp_idx);
-                tmr_func = TMR_ABORT_TASK_SET;
-                break;
-#if 0
-        case QLA_TGT_ABORT_ALL:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10005,
-                    "qla_target(%d): Doing ABORT_ALL_TASKS\n",
-                    sess->vha->vp_idx);
-                tmr_func = 0;
-                break;
-
-        case QLA_TGT_ABORT_ALL_SESS:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10006,
-                    "qla_target(%d): Doing ABORT_ALL_TASKS_SESS\n",
-                    sess->vha->vp_idx);
-                tmr_func = 0;
-                break;
-
-        case QLA_TGT_NEXUS_LOSS_SESS:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10007,
-                    "qla_target(%d): Doing NEXUS_LOSS_SESS\n",
-                    sess->vha->vp_idx);
-                tmr_func = 0;
-                break;
-
-        case QLA_TGT_NEXUS_LOSS:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10008,
-                    "qla_target(%d): Doing NEXUS_LOSS\n", sess->vha->vp_idx);
-                tmr_func = 0;
-                break;
-#endif
-        default:
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x1000a,
-                    "qla_target(%d): Unknown task mgmt fn 0x%x\n",
-                    sess->vha->vp_idx, fn);
-                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
-                return -ENOSYS;
-        }
-
-        res = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, tmr_func, 0);
-        if (res != 0) {
-                ql_dbg(ql_dbg_tgt_tmr, vha, 0x1000b,
-                    "qla_target(%d): tgt.tgt_ops->handle_tmr() failed: %d\n",
-                    sess->vha->vp_idx, res);
-                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
-{
-        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt;
-        struct qla_tgt_sess *sess;
-        uint32_t lun, unpacked_lun;
-        int lun_size, fn;
-
-        tgt = ha->tgt.qla_tgt;
-
-        lun = a->u.isp24.fcp_cmnd.lun;
-        lun_size = sizeof(a->u.isp24.fcp_cmnd.lun);
-        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
-            a->u.isp24.fcp_hdr.s_id);
-        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        if (!sess) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf024,
-                    "qla_target(%d): task mgmt fn 0x%x for "
-                    "non-existant session\n", vha->vp_idx, fn);
-                return qlt_sched_sess_work(tgt, QLA_TGT_SESS_WORK_TM, iocb,
-                    sizeof(struct atio_from_isp));
-        }
-
-        return qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int __qlt_abort_task(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *iocb, struct qla_tgt_sess *sess)
-{
-        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_mgmt_cmd *mcmd;
-        uint32_t lun, unpacked_lun;
-        int rc;
-
-        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
-        if (mcmd == NULL) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05f,
-                    "qla_target(%d): %s: Allocation of ABORT cmd failed\n",
-                    vha->vp_idx, __func__);
-                return -ENOMEM;
-        }
-        memset(mcmd, 0, sizeof(*mcmd));
-
-        mcmd->sess = sess;
-        memcpy(&mcmd->orig_iocb.imm_ntfy, iocb,
-            sizeof(mcmd->orig_iocb.imm_ntfy));
-
-        lun = a->u.isp24.fcp_cmnd.lun;
-        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, unpacked_lun, TMR_ABORT_TASK,
-            le16_to_cpu(iocb->u.isp2x.seq_id));
-        if (rc != 0) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf060,
-                    "qla_target(%d): tgt_ops->handle_tmr() failed: %d\n",
-                    vha->vp_idx, rc);
-                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static int qlt_abort_task(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *iocb)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess;
-        int loop_id;
-
-        loop_id = GET_TARGET_ID(ha, (struct atio_from_isp *)iocb);
-
-        sess = ha->tgt.tgt_ops->find_sess_by_loop_id(vha, loop_id);
-        if (sess == NULL) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf025,
-                    "qla_target(%d): task abort for unexisting "
-                    "session\n", vha->vp_idx);
-                return qlt_sched_sess_work(ha->tgt.qla_tgt,
-                    QLA_TGT_SESS_WORK_ABORT, iocb, sizeof(*iocb));
-        }
-
-        return __qlt_abort_task(vha, iocb, sess);
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *iocb)
-{
-        struct qla_hw_data *ha = vha->hw;
-        int res = 0;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf026,
-            "qla_target(%d): Port ID: 0x%02x:%02x:%02x"
-            " ELS opcode: 0x%02x\n", vha->vp_idx, iocb->u.isp24.port_id[0],
-            iocb->u.isp24.port_id[1], iocb->u.isp24.port_id[2],
-            iocb->u.isp24.status_subcode);
-
-        switch (iocb->u.isp24.status_subcode) {
-        case ELS_PLOGI:
-        case ELS_FLOGI:
-        case ELS_PRLI:
-        case ELS_LOGO:
-        case ELS_PRLO:
-                res = qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS);
-                break;
-        case ELS_PDISC:
-        case ELS_ADISC:
-        {
-                struct qla_tgt *tgt = ha->tgt.qla_tgt;
-                if (tgt->link_reinit_iocb_pending) {
-                        qlt_send_notify_ack(vha, &tgt->link_reinit_iocb,
-                            0, 0, 0, 0, 0, 0);
-                        tgt->link_reinit_iocb_pending = 0;
-                }
-                res = 1; /* send notify ack */
-                break;
-        }
-
-        default:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf061,
-                    "qla_target(%d): Unsupported ELS command %x "
-                    "received\n", vha->vp_idx, iocb->u.isp24.status_subcode);
-                res = qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS);
-                break;
-        }
-
-        return res;
-}
-
-static int qlt_set_data_offset(struct qla_tgt_cmd *cmd, uint32_t offset)
-{
-        struct scatterlist *sg, *sgp, *sg_srr, *sg_srr_start = NULL;
-        size_t first_offset = 0, rem_offset = offset, tmp = 0;
-        int i, sg_srr_cnt, bufflen = 0;
-
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe023,
-            "Entering qla_tgt_set_data_offset: cmd: %p, cmd->sg: %p, "
-            "cmd->sg_cnt: %u, direction: %d\n",
-            cmd, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
-
-        /*
-         * FIXME: Reject non zero SRR relative offset until we can test
-         * this code properly.
-         */
-        pr_debug("Rejecting non zero SRR rel_offs: %u\n", offset);
-        return -1;
-
-        if (!cmd->sg || !cmd->sg_cnt) {
-                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe055,
-                    "Missing cmd->sg or zero cmd->sg_cnt in"
-                    " qla_tgt_set_data_offset\n");
-                return -EINVAL;
-        }
-        /*
-         * Walk the current cmd->sg list until we locate the new sg_srr_start
-         */
-        for_each_sg(cmd->sg, sg, cmd->sg_cnt, i) {
-                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe024,
-                    "sg[%d]: %p page: %p, length: %d, offset: %d\n",
-                    i, sg, sg_page(sg), sg->length, sg->offset);
-
-                if ((sg->length + tmp) > offset) {
-                        first_offset = rem_offset;
-                        sg_srr_start = sg;
-                        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe025,
-                            "Found matching sg[%d], using %p as sg_srr_start, "
-                            "and using first_offset: %zu\n", i, sg,
-                            first_offset);
-                        break;
-                }
-                tmp += sg->length;
-                rem_offset -= sg->length;
-        }
-
-        if (!sg_srr_start) {
-                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe056,
-                    "Unable to locate sg_srr_start for offset: %u\n", offset);
-                return -EINVAL;
-        }
-        sg_srr_cnt = (cmd->sg_cnt - i);
-
-        sg_srr = kzalloc(sizeof(struct scatterlist) * sg_srr_cnt, GFP_KERNEL);
-        if (!sg_srr) {
-                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe057,
-                    "Unable to allocate sgp\n");
-                return -ENOMEM;
-        }
-        sg_init_table(sg_srr, sg_srr_cnt);
-        sgp = &sg_srr[0];
-        /*
-         * Walk the remaining list for sg_srr_start, mapping to the newly
-         * allocated sg_srr taking first_offset into account.
-         */
-        for_each_sg(sg_srr_start, sg, sg_srr_cnt, i) {
-                if (first_offset) {
-                        sg_set_page(sgp, sg_page(sg),
-                            (sg->length - first_offset), first_offset);
-                        first_offset = 0;
-                } else {
-                        sg_set_page(sgp, sg_page(sg), sg->length, 0);
-                }
-                bufflen += sgp->length;
-
-                sgp = sg_next(sgp);
-                if (!sgp)
-                        break;
-        }
-
-        cmd->sg = sg_srr;
-        cmd->sg_cnt = sg_srr_cnt;
-        cmd->bufflen = bufflen;
-        cmd->offset += offset;
-        cmd->free_sg = 1;
-
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe026, "New cmd->sg: %p\n", cmd->sg);
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe027, "New cmd->sg_cnt: %u\n",
-            cmd->sg_cnt);
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe028, "New cmd->bufflen: %u\n",
-            cmd->bufflen);
-        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe029, "New cmd->offset: %u\n",
-            cmd->offset);
-
-        if (cmd->sg_cnt < 0)
-                BUG();
-
-        if (cmd->bufflen < 0)
-                BUG();
-
-        return 0;
-}
-
-static inline int qlt_srr_adjust_data(struct qla_tgt_cmd *cmd,
-        uint32_t srr_rel_offs, int *xmit_type)
-{
-        int res = 0, rel_offs;
-
-        rel_offs = srr_rel_offs - cmd->offset;
-        ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf027, "srr_rel_offs=%d, rel_offs=%d",
-            srr_rel_offs, rel_offs);
-
-        *xmit_type = QLA_TGT_XMIT_ALL;
-
-        if (rel_offs < 0) {
-                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf062,
-                    "qla_target(%d): SRR rel_offs (%d) < 0",
-                    cmd->vha->vp_idx, rel_offs);
-                res = -1;
-        } else if (rel_offs == cmd->bufflen)
-                *xmit_type = QLA_TGT_XMIT_STATUS;
-        else if (rel_offs > 0)
-                res = qlt_set_data_offset(cmd, rel_offs);
-
-        return res;
-}
-
-/* No locks, thread context */
-static void qlt_handle_srr(struct scsi_qla_host *vha,
-        struct qla_tgt_srr_ctio *sctio, struct qla_tgt_srr_imm *imm)
-{
-        struct imm_ntfy_from_isp *ntfy =
-            (struct imm_ntfy_from_isp *)&imm->imm_ntfy;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_cmd *cmd = sctio->cmd;
-        struct se_cmd *se_cmd = &cmd->se_cmd;
-        unsigned long flags;
-        int xmit_type = 0, resp = 0;
-        uint32_t offset;
-        uint16_t srr_ui;
-
-        offset = le32_to_cpu(ntfy->u.isp24.srr_rel_offs);
-        srr_ui = ntfy->u.isp24.srr_ui;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf028, "SRR cmd %p, srr_ui %x\n",
-            cmd, srr_ui);
-
-        switch (srr_ui) {
-        case SRR_IU_STATUS:
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                qlt_send_notify_ack(vha, ntfy,
-                    0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                xmit_type = QLA_TGT_XMIT_STATUS;
-                resp = 1;
-                break;
-        case SRR_IU_DATA_IN:
-                if (!cmd->sg || !cmd->sg_cnt) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf063,
-                            "Unable to process SRR_IU_DATA_IN due to"
-                            " missing cmd->sg, state: %d\n", cmd->state);
-                        dump_stack();
-                        goto out_reject;
-                }
-                if (se_cmd->scsi_status != 0) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe02a,
-                            "Rejecting SRR_IU_DATA_IN with non GOOD "
-                            "scsi_status\n");
-                        goto out_reject;
-                }
-                cmd->bufflen = se_cmd->data_length;
-
-                if (qlt_has_data(cmd)) {
-                        if (qlt_srr_adjust_data(cmd, offset, &xmit_type) != 0)
-                                goto out_reject;
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        qlt_send_notify_ack(vha, ntfy,
-                            0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                        resp = 1;
-                } else {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf064,
-                            "qla_target(%d): SRR for in data for cmd "
-                            "without them (tag %d, SCSI status %d), "
-                            "reject", vha->vp_idx, cmd->tag,
-                            cmd->se_cmd.scsi_status);
-                        goto out_reject;
-                }
-                break;
-        case SRR_IU_DATA_OUT:
-                if (!cmd->sg || !cmd->sg_cnt) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf065,
-                            "Unable to process SRR_IU_DATA_OUT due to"
-                            " missing cmd->sg\n");
-                        dump_stack();
-                        goto out_reject;
-                }
-                if (se_cmd->scsi_status != 0) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe02b,
-                            "Rejecting SRR_IU_DATA_OUT"
-                            " with non GOOD scsi_status\n");
-                        goto out_reject;
-                }
-                cmd->bufflen = se_cmd->data_length;
-
-                if (qlt_has_data(cmd)) {
-                        if (qlt_srr_adjust_data(cmd, offset, &xmit_type) != 0)
-                                goto out_reject;
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        qlt_send_notify_ack(vha, ntfy,
-                            0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                        if (xmit_type & QLA_TGT_XMIT_DATA)
-                                qlt_rdy_to_xfer(cmd);
-                } else {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf066,
-                            "qla_target(%d): SRR for out data for cmd "
-                            "without them (tag %d, SCSI status %d), "
-                            "reject", vha->vp_idx, cmd->tag,
-                            cmd->se_cmd.scsi_status);
-                        goto out_reject;
-                }
-                break;
-        default:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf067,
-                    "qla_target(%d): Unknown srr_ui value %x",
-                    vha->vp_idx, srr_ui);
-                goto out_reject;
-        }
-
-        /* Transmit response in case of status and data-in cases */
-        if (resp)
-                qlt_xmit_response(cmd, xmit_type, se_cmd->scsi_status);
-
-        return;
-
-out_reject:
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        qlt_send_notify_ack(vha, ntfy, 0, 0, 0,
-            NOTIFY_ACK_SRR_FLAGS_REJECT,
-            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
-            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
-        if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
-                cmd->state = QLA_TGT_STATE_DATA_IN;
-                dump_stack();
-        } else
-                qlt_send_term_exchange(vha, cmd, &cmd->atio, 1);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
-static void qlt_reject_free_srr_imm(struct scsi_qla_host *vha,
-        struct qla_tgt_srr_imm *imm, int ha_locked)
-{
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long flags = 0;
-
-        if (!ha_locked)
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        qlt_send_notify_ack(vha, (void *)&imm->imm_ntfy, 0, 0, 0,
-            NOTIFY_ACK_SRR_FLAGS_REJECT,
-            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
-            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
-
-        if (!ha_locked)
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        kfree(imm);
-}
-
-static void qlt_handle_srr_work(struct work_struct *work)
-{
-        struct qla_tgt *tgt = container_of(work, struct qla_tgt, srr_work);
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_tgt_srr_ctio *sctio;
-        unsigned long flags;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf029, "Entering SRR work (tgt %p)\n",
-            tgt);
-
-restart:
-        spin_lock_irqsave(&tgt->srr_lock, flags);
-        list_for_each_entry(sctio, &tgt->srr_ctio_list, srr_list_entry) {
-                struct qla_tgt_srr_imm *imm, *i, *ti;
-                struct qla_tgt_cmd *cmd;
-                struct se_cmd *se_cmd;
-
-                imm = NULL;
-                list_for_each_entry_safe(i, ti, &tgt->srr_imm_list,
-                                                srr_list_entry) {
-                        if (i->srr_id == sctio->srr_id) {
-                                list_del(&i->srr_list_entry);
-                                if (imm) {
-                                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf068,
-                                          "qla_target(%d): There must be "
-                                          "only one IMM SRR per CTIO SRR "
-                                          "(IMM SRR %p, id %d, CTIO %p\n",
-                                          vha->vp_idx, i, i->srr_id, sctio);
-                                        qlt_reject_free_srr_imm(tgt->vha, i, 0);
-                                } else
-                                        imm = i;
-                        }
-                }
-
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02a,
-                    "IMM SRR %p, CTIO SRR %p (id %d)\n", imm, sctio,
-                    sctio->srr_id);
-
-                if (imm == NULL) {
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02b,
-                            "Not found matching IMM for SRR CTIO (id %d)\n",
-                            sctio->srr_id);
-                        continue;
-                } else
-                        list_del(&sctio->srr_list_entry);
-
-                spin_unlock_irqrestore(&tgt->srr_lock, flags);
-
-                cmd = sctio->cmd;
-                /*
-                 * Reset qla_tgt_cmd SRR values and SGL pointer+count to follow
-                 * tcm_qla2xxx_write_pending() and tcm_qla2xxx_queue_data_in()
-                 * logic..
-                 */
-                cmd->offset = 0;
-                if (cmd->free_sg) {
-                        kfree(cmd->sg);
-                        cmd->sg = NULL;
-                        cmd->free_sg = 0;
-                }
-                se_cmd = &cmd->se_cmd;
-
-                cmd->sg_cnt = se_cmd->t_data_nents;
-                cmd->sg = se_cmd->t_data_sg;
-
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,
-                    "SRR cmd %p (se_cmd %p, tag %d, op %x), "
-                    "sg_cnt=%d, offset=%d", cmd, &cmd->se_cmd, cmd->tag,
-                    se_cmd->t_task_cdb[0], cmd->sg_cnt, cmd->offset);
-
-                qlt_handle_srr(vha, sctio, imm);
-
-                kfree(imm);
-                kfree(sctio);
-                goto restart;
-        }
-        spin_unlock_irqrestore(&tgt->srr_lock, flags);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-static void qlt_prepare_srr_imm(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *iocb)
-{
-        struct qla_tgt_srr_imm *imm;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        struct qla_tgt_srr_ctio *sctio;
-
-        tgt->imm_srr_id++;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02d, "qla_target(%d): SRR received\n",
-            vha->vp_idx);
-
-        imm = kzalloc(sizeof(*imm), GFP_ATOMIC);
-        if (imm != NULL) {
-                memcpy(&imm->imm_ntfy, iocb, sizeof(imm->imm_ntfy));
-
-                /* IRQ is already OFF */
-                spin_lock(&tgt->srr_lock);
-                imm->srr_id = tgt->imm_srr_id;
-                list_add_tail(&imm->srr_list_entry,
-                    &tgt->srr_imm_list);
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02e,
-                    "IMM NTFY SRR %p added (id %d, ui %x)\n",
-                    imm, imm->srr_id, iocb->u.isp24.srr_ui);
-                if (tgt->imm_srr_id == tgt->ctio_srr_id) {
-                        int found = 0;
-                        list_for_each_entry(sctio, &tgt->srr_ctio_list,
-                            srr_list_entry) {
-                                if (sctio->srr_id == imm->srr_id) {
-                                        found = 1;
-                                        break;
-                                }
-                        }
-                        if (found) {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02f, "%s",
-                                    "Scheduling srr work\n");
-                                schedule_work(&tgt->srr_work);
-                        } else {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf030,
-                                    "qla_target(%d): imm_srr_id "
-                                    "== ctio_srr_id (%d), but there is no "
-                                    "corresponding SRR CTIO, deleting IMM "
-                                    "SRR %p\n", vha->vp_idx, tgt->ctio_srr_id,
-                                    imm);
-                                list_del(&imm->srr_list_entry);
-
-                                kfree(imm);
-
-                                spin_unlock(&tgt->srr_lock);
-                                goto out_reject;
-                        }
-                }
-                spin_unlock(&tgt->srr_lock);
-        } else {
-                struct qla_tgt_srr_ctio *ts;
-
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf069,
-                    "qla_target(%d): Unable to allocate SRR IMM "
-                    "entry, SRR request will be rejected\n", vha->vp_idx);
-
-                /* IRQ is already OFF */
-                spin_lock(&tgt->srr_lock);
-                list_for_each_entry_safe(sctio, ts, &tgt->srr_ctio_list,
-                    srr_list_entry) {
-                        if (sctio->srr_id == tgt->imm_srr_id) {
-                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf031,
-                                    "CTIO SRR %p deleted (id %d)\n",
-                                    sctio, sctio->srr_id);
-                                list_del(&sctio->srr_list_entry);
-                                qlt_send_term_exchange(vha, sctio->cmd,
-                                    &sctio->cmd->atio, 1);
-                                kfree(sctio);
-                        }
-                }
-                spin_unlock(&tgt->srr_lock);
-                goto out_reject;
-        }
-
-        return;
-
-out_reject:
-        qlt_send_notify_ack(vha, iocb, 0, 0, 0,
-            NOTIFY_ACK_SRR_FLAGS_REJECT,
-            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
-            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-static void qlt_handle_imm_notify(struct scsi_qla_host *vha,
-        struct imm_ntfy_from_isp *iocb)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint32_t add_flags = 0;
-        int send_notify_ack = 1;
-        uint16_t status;
-
-        status = le16_to_cpu(iocb->u.isp2x.status);
-        switch (status) {
-        case IMM_NTFY_LIP_RESET:
-        {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf032,
-                    "qla_target(%d): LIP reset (loop %#x), subcode %x\n",
-                    vha->vp_idx, le16_to_cpu(iocb->u.isp24.nport_handle),
-                    iocb->u.isp24.status_subcode);
-
-                if (qlt_reset(vha, iocb, QLA_TGT_ABORT_ALL) == 0)
-                        send_notify_ack = 0;
-                break;
-        }
-
-        case IMM_NTFY_LIP_LINK_REINIT:
-        {
-                struct qla_tgt *tgt = ha->tgt.qla_tgt;
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,
-                    "qla_target(%d): LINK REINIT (loop %#x, "
-                    "subcode %x)\n", vha->vp_idx,
-                    le16_to_cpu(iocb->u.isp24.nport_handle),
-                    iocb->u.isp24.status_subcode);
-                if (tgt->link_reinit_iocb_pending) {
-                        qlt_send_notify_ack(vha, &tgt->link_reinit_iocb,
-                            0, 0, 0, 0, 0, 0);
-                }
-                memcpy(&tgt->link_reinit_iocb, iocb, sizeof(*iocb));
-                tgt->link_reinit_iocb_pending = 1;
-                /*
-                 * QLogic requires to wait after LINK REINIT for possible
-                 * PDISC or ADISC ELS commands
-                 */
-                send_notify_ack = 0;
-                break;
-        }
-
-        case IMM_NTFY_PORT_LOGOUT:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf034,
-                    "qla_target(%d): Port logout (loop "
-                    "%#x, subcode %x)\n", vha->vp_idx,
-                    le16_to_cpu(iocb->u.isp24.nport_handle),
-                    iocb->u.isp24.status_subcode);
-
-                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS) == 0)
-                        send_notify_ack = 0;
-                /* The sessions will be cleared in the callback, if needed */
-                break;
-
-        case IMM_NTFY_GLBL_TPRLO:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf035,
-                    "qla_target(%d): Global TPRLO (%x)\n", vha->vp_idx, status);
-                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS) == 0)
-                        send_notify_ack = 0;
-                /* The sessions will be cleared in the callback, if needed */
-                break;
-
-        case IMM_NTFY_PORT_CONFIG:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf036,
-                    "qla_target(%d): Port config changed (%x)\n", vha->vp_idx,
-                    status);
-                if (qlt_reset(vha, iocb, QLA_TGT_ABORT_ALL) == 0)
-                        send_notify_ack = 0;
-                /* The sessions will be cleared in the callback, if needed */
-                break;
-
-        case IMM_NTFY_GLBL_LOGO:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06a,
-                    "qla_target(%d): Link failure detected\n",
-                    vha->vp_idx);
-                /* I_T nexus loss */
-                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS) == 0)
-                        send_notify_ack = 0;
-                break;
-
-        case IMM_NTFY_IOCB_OVERFLOW:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06b,
-                    "qla_target(%d): Cannot provide requested "
-                    "capability (IOCB overflowed the immediate notify "
-                    "resource count)\n", vha->vp_idx);
-                break;
-
-        case IMM_NTFY_ABORT_TASK:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf037,
-                    "qla_target(%d): Abort Task (S %08x I %#x -> "
-                    "L %#x)\n", vha->vp_idx,
-                    le16_to_cpu(iocb->u.isp2x.seq_id),
-                    GET_TARGET_ID(ha, (struct atio_from_isp *)iocb),
-                    le16_to_cpu(iocb->u.isp2x.lun));
-                if (qlt_abort_task(vha, iocb) == 0)
-                        send_notify_ack = 0;
-                break;
-
-        case IMM_NTFY_RESOURCE:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06c,
-                    "qla_target(%d): Out of resources, host %ld\n",
-                    vha->vp_idx, vha->host_no);
-                break;
-
-        case IMM_NTFY_MSG_RX:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf038,
-                    "qla_target(%d): Immediate notify task %x\n",
-                    vha->vp_idx, iocb->u.isp2x.task_flags);
-                if (qlt_handle_task_mgmt(vha, iocb) == 0)
-                        send_notify_ack = 0;
-                break;
-
-        case IMM_NTFY_ELS:
-                if (qlt_24xx_handle_els(vha, iocb) == 0)
-                        send_notify_ack = 0;
-                break;
-
-        case IMM_NTFY_SRR:
-                qlt_prepare_srr_imm(vha, iocb);
-                send_notify_ack = 0;
-                break;
-
-        default:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06d,
-                    "qla_target(%d): Received unknown immediate "
-                    "notify status %x\n", vha->vp_idx, status);
-                break;
-        }
-
-        if (send_notify_ack)
-                qlt_send_notify_ack(vha, iocb, add_flags, 0, 0, 0, 0, 0);
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- * This function sends busy to ISP 2xxx or 24xx.
- */
-static void qlt_send_busy(struct scsi_qla_host *vha,
-        struct atio_from_isp *atio, uint16_t status)
-{
-        struct ctio7_to_24xx *ctio24;
-        struct qla_hw_data *ha = vha->hw;
-        request_t *pkt;
-        struct qla_tgt_sess *sess = NULL;
-
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
-            atio->u.isp24.fcp_hdr.s_id);
-        if (!sess) {
-                qlt_send_term_exchange(vha, NULL, atio, 1);
-                return;
-        }
-        /* Sending marker isn't necessary, since we called from ISR */
-
-        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
-        if (!pkt) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06e,
-                    "qla_target(%d): %s failed: unable to allocate "
-                    "request packet", vha->vp_idx, __func__);
-                return;
-        }
-
-        pkt->entry_count = 1;
-        pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
-
-        ctio24 = (struct ctio7_to_24xx *)pkt;
-        ctio24->entry_type = CTIO_TYPE7;
-        ctio24->nport_handle = sess->loop_id;
-        ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
-        ctio24->vp_index = vha->vp_idx;
-        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
-        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
-        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
-        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
-        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
-            __constant_cpu_to_le16(
-                CTIO7_FLAGS_STATUS_MODE_1 | CTIO7_FLAGS_SEND_STATUS |
-                CTIO7_FLAGS_DONT_RET_CTIO);
-        /*
-         * CTIO from fw w/o se_cmd doesn't provide enough info to retry it,
-         * if the explicit conformation is used.
-         */
-        ctio24->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
-        ctio24->u.status1.scsi_status = cpu_to_le16(status);
-        ctio24->u.status1.residual = get_unaligned((uint32_t *)
-            &atio->u.isp24.fcp_cmnd.add_cdb[
-            atio->u.isp24.fcp_cmnd.add_cdb_len]);
-        if (ctio24->u.status1.residual != 0)
-                ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
-
-        qla2x00_start_iocbs(vha, vha->req);
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-/* called via callback from qla2xxx */
-static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha,
-        struct atio_from_isp *atio)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        int rc;
-
-        if (unlikely(tgt == NULL)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf039,
-                    "ATIO pkt, but no tgt (ha %p)", ha);
-                return;
-        }
-        ql_dbg(ql_dbg_tgt, vha, 0xe02c,
-            "qla_target(%d): ATIO pkt %p: type %02x count %02x",
-            vha->vp_idx, atio, atio->u.raw.entry_type,
-            atio->u.raw.entry_count);
-        /*
-         * In tgt_stop mode we also should allow all requests to pass.
-         * Otherwise, some commands can stuck.
-         */
-
-        tgt->irq_cmd_count++;
-
-        switch (atio->u.raw.entry_type) {
-        case ATIO_TYPE7:
-                ql_dbg(ql_dbg_tgt, vha, 0xe02d,
-                    "ATIO_TYPE7 instance %d, lun %Lx, read/write %d/%d, "
-                    "add_cdb_len %d, data_length %04x, s_id %x:%x:%x\n",
-                    vha->vp_idx, atio->u.isp24.fcp_cmnd.lun,
-                    atio->u.isp24.fcp_cmnd.rddata,
-                    atio->u.isp24.fcp_cmnd.wrdata,
-                    atio->u.isp24.fcp_cmnd.add_cdb_len,
-                    be32_to_cpu(get_unaligned((uint32_t *)
-                        &atio->u.isp24.fcp_cmnd.add_cdb[
-                        atio->u.isp24.fcp_cmnd.add_cdb_len])),
-                    atio->u.isp24.fcp_hdr.s_id[0],
-                    atio->u.isp24.fcp_hdr.s_id[1],
-                    atio->u.isp24.fcp_hdr.s_id[2]);
-
-                if (unlikely(atio->u.isp24.exchange_addr ==
-                    ATIO_EXCHANGE_ADDRESS_UNKNOWN)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe058,
-                            "qla_target(%d): ATIO_TYPE7 "
-                            "received with UNKNOWN exchange address, "
-                            "sending QUEUE_FULL\n", vha->vp_idx);
-                        qlt_send_busy(vha, atio, SAM_STAT_TASK_SET_FULL);
-                        break;
-                }
-                if (likely(atio->u.isp24.fcp_cmnd.task_mgmt_flags == 0))
-                        rc = qlt_handle_cmd_for_atio(vha, atio);
-                else
-                        rc = qlt_handle_task_mgmt(vha, atio);
-                if (unlikely(rc != 0)) {
-                        if (rc == -ESRCH) {
-#if 1 /* With TERM EXCHANGE some FC cards refuse to boot */
-                                qlt_send_busy(vha, atio, SAM_STAT_BUSY);
-#else
-                                qlt_send_term_exchange(vha, NULL, atio, 1);
-#endif
-                        } else {
-                                if (tgt->tgt_stop) {
-                                        ql_dbg(ql_dbg_tgt, vha, 0xe059,
-                                            "qla_target: Unable to send "
-                                            "command to target for req, "
-                                            "ignoring.\n");
-                                } else {
-                                        ql_dbg(ql_dbg_tgt, vha, 0xe05a,
-                                            "qla_target(%d): Unable to send "
-                                            "command to target, sending BUSY "
-                                            "status.\n", vha->vp_idx);
-                                        qlt_send_busy(vha, atio, SAM_STAT_BUSY);
-                                }
-                        }
-                }
-                break;
-
-        case IMMED_NOTIFY_TYPE:
-        {
-                if (unlikely(atio->u.isp2x.entry_status != 0)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe05b,
-                            "qla_target(%d): Received ATIO packet %x "
-                            "with error status %x\n", vha->vp_idx,
-                            atio->u.raw.entry_type,
-                            atio->u.isp2x.entry_status);
-                        break;
-                }
-                ql_dbg(ql_dbg_tgt, vha, 0xe02e, "%s", "IMMED_NOTIFY ATIO");
-                qlt_handle_imm_notify(vha, (struct imm_ntfy_from_isp *)atio);
-                break;
-        }
-
-        default:
-                ql_dbg(ql_dbg_tgt, vha, 0xe05c,
-                    "qla_target(%d): Received unknown ATIO atio "
-                    "type %x\n", vha->vp_idx, atio->u.raw.entry_type);
-                break;
-        }
-
-        tgt->irq_cmd_count--;
-}
-
-/* ha->hardware_lock supposed to be held on entry */
-/* called via callback from qla2xxx */
-static void qlt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-
-        if (unlikely(tgt == NULL)) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe05d,
-                    "qla_target(%d): Response pkt %x received, but no "
-                    "tgt (ha %p)\n", vha->vp_idx, pkt->entry_type, ha);
-                return;
-        }
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe02f,
-            "qla_target(%d): response pkt %p: T %02x C %02x S %02x "
-            "handle %#x\n", vha->vp_idx, pkt, pkt->entry_type,
-            pkt->entry_count, pkt->entry_status, pkt->handle);
-
-        /*
-         * In tgt_stop mode we also should allow all requests to pass.
-         * Otherwise, some commands can stuck.
-         */
-
-        tgt->irq_cmd_count++;
-
-        switch (pkt->entry_type) {
-        case CTIO_TYPE7:
-        {
-                struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;
-                ql_dbg(ql_dbg_tgt, vha, 0xe030, "CTIO_TYPE7: instance %d\n",
-                    vha->vp_idx);
-                qlt_do_ctio_completion(vha, entry->handle,
-                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
-                    entry);
-                break;
-        }
-
-        case ACCEPT_TGT_IO_TYPE:
-        {
-                struct atio_from_isp *atio = (struct atio_from_isp *)pkt;
-                int rc;
-                ql_dbg(ql_dbg_tgt, vha, 0xe031,
-                    "ACCEPT_TGT_IO instance %d status %04x "
-                    "lun %04x read/write %d data_length %04x "
-                    "target_id %02x rx_id %04x\n ", vha->vp_idx,
-                    le16_to_cpu(atio->u.isp2x.status),
-                    le16_to_cpu(atio->u.isp2x.lun),
-                    atio->u.isp2x.execution_codes,
-                    le32_to_cpu(atio->u.isp2x.data_length), GET_TARGET_ID(ha,
-                    atio), atio->u.isp2x.rx_id);
-                if (atio->u.isp2x.status !=
-                    __constant_cpu_to_le16(ATIO_CDB_VALID)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe05e,
-                            "qla_target(%d): ATIO with error "
-                            "status %x received\n", vha->vp_idx,
-                            le16_to_cpu(atio->u.isp2x.status));
-                        break;
-                }
-                ql_dbg(ql_dbg_tgt, vha, 0xe032,
-                    "FCP CDB: 0x%02x, sizeof(cdb): %lu",
-                    atio->u.isp2x.cdb[0], (unsigned long
-                    int)sizeof(atio->u.isp2x.cdb));
-
-                rc = qlt_handle_cmd_for_atio(vha, atio);
-                if (unlikely(rc != 0)) {
-                        if (rc == -ESRCH) {
-#if 1 /* With TERM EXCHANGE some FC cards refuse to boot */
-                                qlt_send_busy(vha, atio, 0);
-#else
-                                qlt_send_term_exchange(vha, NULL, atio, 1);
-#endif
-                        } else {
-                                if (tgt->tgt_stop) {
-                                        ql_dbg(ql_dbg_tgt, vha, 0xe05f,
-                                            "qla_target: Unable to send "
-                                            "command to target, sending TERM "
-                                            "EXCHANGE for rsp\n");
-                                        qlt_send_term_exchange(vha, NULL,
-                                            atio, 1);
-                                } else {
-                                        ql_dbg(ql_dbg_tgt, vha, 0xe060,
-                                            "qla_target(%d): Unable to send "
-                                            "command to target, sending BUSY "
-                                            "status\n", vha->vp_idx);
-                                        qlt_send_busy(vha, atio, 0);
-                                }
-                        }
-                }
-        }
-        break;
-
-        case CONTINUE_TGT_IO_TYPE:
-        {
-                struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
-                ql_dbg(ql_dbg_tgt, vha, 0xe033,
-                    "CONTINUE_TGT_IO: instance %d\n", vha->vp_idx);
-                qlt_do_ctio_completion(vha, entry->handle,
-                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
-                    entry);
-                break;
-        }
-
-        case CTIO_A64_TYPE:
-        {
-                struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
-                ql_dbg(ql_dbg_tgt, vha, 0xe034, "CTIO_A64: instance %d\n",
-                    vha->vp_idx);
-                qlt_do_ctio_completion(vha, entry->handle,
-                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
-                    entry);
-                break;
-        }
-
-        case IMMED_NOTIFY_TYPE:
-                ql_dbg(ql_dbg_tgt, vha, 0xe035, "%s", "IMMED_NOTIFY\n");
-                qlt_handle_imm_notify(vha, (struct imm_ntfy_from_isp *)pkt);
-                break;
-
-        case NOTIFY_ACK_TYPE:
-                if (tgt->notify_ack_expected > 0) {
-                        struct nack_to_isp *entry = (struct nack_to_isp *)pkt;
-                        ql_dbg(ql_dbg_tgt, vha, 0xe036,
-                            "NOTIFY_ACK seq %08x status %x\n",
-                            le16_to_cpu(entry->u.isp2x.seq_id),
-                            le16_to_cpu(entry->u.isp2x.status));
-                        tgt->notify_ack_expected--;
-                        if (entry->u.isp2x.status !=
-                            __constant_cpu_to_le16(NOTIFY_ACK_SUCCESS)) {
-                                ql_dbg(ql_dbg_tgt, vha, 0xe061,
-                                    "qla_target(%d): NOTIFY_ACK "
-                                    "failed %x\n", vha->vp_idx,
-                                    le16_to_cpu(entry->u.isp2x.status));
-                        }
-                } else {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe062,
-                            "qla_target(%d): Unexpected NOTIFY_ACK received\n",
-                            vha->vp_idx);
-                }
-                break;
-
-        case ABTS_RECV_24XX:
-                ql_dbg(ql_dbg_tgt, vha, 0xe037,
-                    "ABTS_RECV_24XX: instance %d\n", vha->vp_idx);
-                qlt_24xx_handle_abts(vha, (struct abts_recv_from_24xx *)pkt);
-                break;
-
-        case ABTS_RESP_24XX:
-                if (tgt->abts_resp_expected > 0) {
-                        struct abts_resp_from_24xx_fw *entry =
-                                (struct abts_resp_from_24xx_fw *)pkt;
-                        ql_dbg(ql_dbg_tgt, vha, 0xe038,
-                            "ABTS_RESP_24XX: compl_status %x\n",
-                            entry->compl_status);
-                        tgt->abts_resp_expected--;
-                        if (le16_to_cpu(entry->compl_status) !=
-                            ABTS_RESP_COMPL_SUCCESS) {
-                                if ((entry->error_subcode1 == 0x1E) &&
-                                    (entry->error_subcode2 == 0)) {
-                                        /*
-                                         * We've got a race here: aborted
-                                         * exchange not terminated, i.e.
-                                         * response for the aborted command was
-                                         * sent between the abort request was
-                                         * received and processed.
-                                         * Unfortunately, the firmware has a
-                                         * silly requirement that all aborted
-                                         * exchanges must be explicitely
-                                         * terminated, otherwise it refuses to
-                                         * send responses for the abort
-                                         * requests. So, we have to
-                                         * (re)terminate the exchange and retry
-                                         * the abort response.
-                                         */
-                                        qlt_24xx_retry_term_exchange(vha,
-                                            entry);
-                                } else
-                                        ql_dbg(ql_dbg_tgt, vha, 0xe063,
-                                            "qla_target(%d): ABTS_RESP_24XX "
-                                            "failed %x (subcode %x:%x)",
-                                            vha->vp_idx, entry->compl_status,
-                                            entry->error_subcode1,
-                                            entry->error_subcode2);
-                        }
-                } else {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe064,
-                            "qla_target(%d): Unexpected ABTS_RESP_24XX "
-                            "received\n", vha->vp_idx);
-                }
-                break;
-
-        default:
-                ql_dbg(ql_dbg_tgt, vha, 0xe065,
-                    "qla_target(%d): Received unknown response pkt "
-                    "type %x\n", vha->vp_idx, pkt->entry_type);
-                break;
-        }
-
-        tgt->irq_cmd_count--;
-}
-
-/*
- * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
- */
-void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
-        uint16_t *mailbox)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        int login_code;
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe039,
-            "scsi(%ld): ha state %d init_done %d oper_mode %d topo %d\n",
-            vha->host_no, atomic_read(&vha->loop_state), vha->flags.init_done,
-            ha->operating_mode, ha->current_topology);
-
-        if (!ha->tgt.tgt_ops)
-                return;
-
-        if (unlikely(tgt == NULL)) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe03a,
-                    "ASYNC EVENT %#x, but no tgt (ha %p)\n", code, ha);
-                return;
-        }
-
-        if (((code == MBA_POINT_TO_POINT) || (code == MBA_CHG_IN_CONNECTION)) &&
-            IS_QLA2100(ha))
-                return;
-        /*
-         * In tgt_stop mode we also should allow all requests to pass.
-         * Otherwise, some commands can stuck.
-         */
-
-        tgt->irq_cmd_count++;
-
-        switch (code) {
-        case MBA_RESET:                 /* Reset */
-        case MBA_SYSTEM_ERR:            /* System Error */
-        case MBA_REQ_TRANSFER_ERR:      /* Request Transfer Error */
-        case MBA_RSP_TRANSFER_ERR:      /* Response Transfer Error */
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a,
-                    "qla_target(%d): System error async event %#x "
-                    "occurred", vha->vp_idx, code);
-                break;
-        case MBA_WAKEUP_THRES:          /* Request Queue Wake-up. */
-                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                break;
-
-        case MBA_LOOP_UP:
-        {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b,
-                    "qla_target(%d): Async LOOP_UP occurred "
-                    "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx,
-                    le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
-                    le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
-                if (tgt->link_reinit_iocb_pending) {
-                        qlt_send_notify_ack(vha, (void *)&tgt->link_reinit_iocb,
-                            0, 0, 0, 0, 0, 0);
-                        tgt->link_reinit_iocb_pending = 0;
-                }
-                break;
-        }
-
-        case MBA_LIP_OCCURRED:
-        case MBA_LOOP_DOWN:
-        case MBA_LIP_RESET:
-        case MBA_RSCN_UPDATE:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c,
-                    "qla_target(%d): Async event %#x occurred "
-                    "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code,
-                    le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
-                    le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
-                break;
-
-        case MBA_PORT_UPDATE:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d,
-                    "qla_target(%d): Port update async event %#x "
-                    "occurred: updating the ports database (m[0]=%x, m[1]=%x, "
-                    "m[2]=%x, m[3]=%x)", vha->vp_idx, code,
-                    le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
-                    le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
-
-                login_code = le16_to_cpu(mailbox[2]);
-                if (login_code == 0x4)
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03e,
-                            "Async MB 2: Got PLOGI Complete\n");
-                else if (login_code == 0x7)
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03f,
-                            "Async MB 2: Port Logged Out\n");
-                break;
-
-        default:
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040,
-                    "qla_target(%d): Async event %#x occurred: "
-                    "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx,
-                    code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
-                    le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
-                break;
-        }
-
-        tgt->irq_cmd_count--;
-}
-
-static fc_port_t *qlt_get_port_database(struct scsi_qla_host *vha,
-        uint16_t loop_id)
-{
-        fc_port_t *fcport;
-        int rc;
-
-        fcport = kzalloc(sizeof(*fcport), GFP_KERNEL);
-        if (!fcport) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06f,
-                    "qla_target(%d): Allocation of tmp FC port failed",
-                    vha->vp_idx);
-                return NULL;
-        }
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf041, "loop_id %d", loop_id);
-
-        fcport->loop_id = loop_id;
-
-        rc = qla2x00_get_port_database(vha, fcport, 0);
-        if (rc != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf070,
-                    "qla_target(%d): Failed to retrieve fcport "
-                    "information -- get_port_database() returned %x "
-                    "(loop_id=0x%04x)", vha->vp_idx, rc, loop_id);
-                kfree(fcport);
-                return NULL;
-        }
-
-        return fcport;
-}
-
-/* Must be called under tgt_mutex */
-static struct qla_tgt_sess *qlt_make_local_sess(struct scsi_qla_host *vha,
-        uint8_t *s_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess = NULL;
-        fc_port_t *fcport = NULL;
-        int rc, global_resets;
-        uint16_t loop_id = 0;
-
-retry:
-        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
-
-        rc = qla24xx_get_loop_id(vha, s_id, &loop_id);
-        if (rc != 0) {
-                if ((s_id[0] == 0xFF) &&
-                    (s_id[1] == 0xFC)) {
-                        /*
-                         * This is Domain Controller, so it should be
-                         * OK to drop SCSI commands from it.
-                         */
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf042,
-                            "Unable to find initiator with S_ID %x:%x:%x",
-                            s_id[0], s_id[1], s_id[2]);
-                } else
-                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf071,
-                            "qla_target(%d): Unable to find "
-                            "initiator with S_ID %x:%x:%x",
-                            vha->vp_idx, s_id[0], s_id[1],
-                            s_id[2]);
-                return NULL;
-        }
-
-        fcport = qlt_get_port_database(vha, loop_id);
-        if (!fcport)
-                return NULL;
-
-        if (global_resets !=
-            atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count)) {
-                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf043,
-                    "qla_target(%d): global reset during session discovery "
-                    "(counter was %d, new %d), retrying", vha->vp_idx,
-                    global_resets,
-                    atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count));
-                goto retry;
-        }
-
-        sess = qlt_create_sess(vha, fcport, true);
-
-        kfree(fcport);
-        return sess;
-}
-
-static void qlt_abort_work(struct qla_tgt *tgt,
-        struct qla_tgt_sess_work_param *prm)
-{
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess = NULL;
-        unsigned long flags;
-        uint32_t be_s_id;
-        uint8_t s_id[3];
-        int rc;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        if (tgt->tgt_stop)
-                goto out_term;
-
-        s_id[0] = prm->abts.fcp_hdr_le.s_id[2];
-        s_id[1] = prm->abts.fcp_hdr_le.s_id[1];
-        s_id[2] = prm->abts.fcp_hdr_le.s_id[0];
-
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
-            (unsigned char *)&be_s_id);
-        if (!sess) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-                mutex_lock(&ha->tgt.tgt_mutex);
-                sess = qlt_make_local_sess(vha, s_id);
-                /* sess has got an extra creation ref */
-                mutex_unlock(&ha->tgt.tgt_mutex);
-
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                if (!sess)
-                        goto out_term;
-        } else {
-                kref_get(&sess->se_sess->sess_kref);
-        }
-
-        if (tgt->tgt_stop)
-                goto out_term;
-
-        rc = __qlt_24xx_handle_abts(vha, &prm->abts, sess);
-        if (rc != 0)
-                goto out_term;
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        ha->tgt.tgt_ops->put_sess(sess);
-        return;
-
-out_term:
-        qlt_24xx_send_abts_resp(vha, &prm->abts, FCP_TMF_REJECTED, false);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        if (sess)
-                ha->tgt.tgt_ops->put_sess(sess);
-}
-
-static void qlt_tmr_work(struct qla_tgt *tgt,
-        struct qla_tgt_sess_work_param *prm)
-{
-        struct atio_from_isp *a = &prm->tm_iocb2;
-        struct scsi_qla_host *vha = tgt->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt_sess *sess = NULL;
-        unsigned long flags;
-        uint8_t *s_id = NULL; /* to hide compiler warnings */
-        int rc;
-        uint32_t lun, unpacked_lun;
-        int lun_size, fn;
-        void *iocb;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-
-        if (tgt->tgt_stop)
-                goto out_term;
-
-        s_id = prm->tm_iocb2.u.isp24.fcp_hdr.s_id;
-        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha, s_id);
-        if (!sess) {
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-                mutex_lock(&ha->tgt.tgt_mutex);
-                sess = qlt_make_local_sess(vha, s_id);
-                /* sess has got an extra creation ref */
-                mutex_unlock(&ha->tgt.tgt_mutex);
-
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                if (!sess)
-                        goto out_term;
-        } else {
-                kref_get(&sess->se_sess->sess_kref);
-        }
-
-        iocb = a;
-        lun = a->u.isp24.fcp_cmnd.lun;
-        lun_size = sizeof(lun);
-        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
-        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        rc = qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0);
-        if (rc != 0)
-                goto out_term;
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        ha->tgt.tgt_ops->put_sess(sess);
-        return;
-
-out_term:
-        qlt_send_term_exchange(vha, NULL, &prm->tm_iocb2, 1);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        if (sess)
-                ha->tgt.tgt_ops->put_sess(sess);
-}
-
-static void qlt_sess_work_fn(struct work_struct *work)
-{
-        struct qla_tgt *tgt = container_of(work, struct qla_tgt, sess_work);
-        struct scsi_qla_host *vha = tgt->vha;
-        unsigned long flags;
-
-        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf000, "Sess work (tgt %p)", tgt);
-
-        spin_lock_irqsave(&tgt->sess_work_lock, flags);
-        while (!list_empty(&tgt->sess_works_list)) {
-                struct qla_tgt_sess_work_param *prm = list_entry(
-                    tgt->sess_works_list.next, typeof(*prm),
-                    sess_works_list_entry);
-
-                /*
-                 * This work can be scheduled on several CPUs at time, so we
-                 * must delete the entry to eliminate double processing
-                 */
-                list_del(&prm->sess_works_list_entry);
-
-                spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
-
-                switch (prm->type) {
-                case QLA_TGT_SESS_WORK_ABORT:
-                        qlt_abort_work(tgt, prm);
-                        break;
-                case QLA_TGT_SESS_WORK_TM:
-                        qlt_tmr_work(tgt, prm);
-                        break;
-                default:
-                        BUG_ON(1);
-                        break;
-                }
-
-                spin_lock_irqsave(&tgt->sess_work_lock, flags);
-
-                kfree(prm);
-        }
-        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
-}
-
-/* Must be called under tgt_host_action_mutex */
-int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
-{
-        struct qla_tgt *tgt;
-
-        if (!QLA_TGT_MODE_ENABLED())
-                return 0;
-
-        ql_dbg(ql_dbg_tgt, base_vha, 0xe03b,
-            "Registering target for host %ld(%p)", base_vha->host_no, ha);
-
-        BUG_ON((ha->tgt.qla_tgt != NULL) || (ha->tgt.tgt_ops != NULL));
-
-        tgt = kzalloc(sizeof(struct qla_tgt), GFP_KERNEL);
-        if (!tgt) {
-                ql_dbg(ql_dbg_tgt, base_vha, 0xe066,
-                    "Unable to allocate struct qla_tgt\n");
-                return -ENOMEM;
-        }
-
-        if (!(base_vha->host->hostt->supported_mode & MODE_TARGET))
-                base_vha->host->hostt->supported_mode |= MODE_TARGET;
-
-        tgt->ha = ha;
-        tgt->vha = base_vha;
-        init_waitqueue_head(&tgt->waitQ);
-        INIT_LIST_HEAD(&tgt->sess_list);
-        INIT_LIST_HEAD(&tgt->del_sess_list);
-        INIT_DELAYED_WORK(&tgt->sess_del_work,
-                (void (*)(struct work_struct *))qlt_del_sess_work_fn);
-        spin_lock_init(&tgt->sess_work_lock);
-        INIT_WORK(&tgt->sess_work, qlt_sess_work_fn);
-        INIT_LIST_HEAD(&tgt->sess_works_list);
-        spin_lock_init(&tgt->srr_lock);
-        INIT_LIST_HEAD(&tgt->srr_ctio_list);
-        INIT_LIST_HEAD(&tgt->srr_imm_list);
-        INIT_WORK(&tgt->srr_work, qlt_handle_srr_work);
-        atomic_set(&tgt->tgt_global_resets_count, 0);
-
-        ha->tgt.qla_tgt = tgt;
-
-        ql_dbg(ql_dbg_tgt, base_vha, 0xe067,
-                "qla_target(%d): using 64 Bit PCI addressing",
-                base_vha->vp_idx);
-        tgt->tgt_enable_64bit_addr = 1;
-        /* 3 is reserved */
-        tgt->sg_tablesize = QLA_TGT_MAX_SG_24XX(base_vha->req->length - 3);
-        tgt->datasegs_per_cmd = QLA_TGT_DATASEGS_PER_CMD_24XX;
-        tgt->datasegs_per_cont = QLA_TGT_DATASEGS_PER_CONT_24XX;
-
-        mutex_lock(&qla_tgt_mutex);
-        list_add_tail(&tgt->tgt_list_entry, &qla_tgt_glist);
-        mutex_unlock(&qla_tgt_mutex);
-
-        return 0;
-}
-
-/* Must be called under tgt_host_action_mutex */
-int qlt_remove_target(struct qla_hw_data *ha, struct scsi_qla_host *vha)
-{
-        if (!ha->tgt.qla_tgt)
-                return 0;
-
-        mutex_lock(&qla_tgt_mutex);
-        list_del(&ha->tgt.qla_tgt->tgt_list_entry);
-        mutex_unlock(&qla_tgt_mutex);
-
-        ql_dbg(ql_dbg_tgt, vha, 0xe03c, "Unregistering target for host %ld(%p)",
-            vha->host_no, ha);
-        qlt_release(ha->tgt.qla_tgt);
-
-        return 0;
-}
-
-static void qlt_lport_dump(struct scsi_qla_host *vha, u64 wwpn,
-        unsigned char *b)
-{
-        int i;
-
-        pr_debug("qla2xxx HW vha->node_name: ");
-        for (i = 0; i < WWN_SIZE; i++)
-                pr_debug("%02x ", vha->node_name[i]);
-        pr_debug("\n");
-        pr_debug("qla2xxx HW vha->port_name: ");
-        for (i = 0; i < WWN_SIZE; i++)
-                pr_debug("%02x ", vha->port_name[i]);
-        pr_debug("\n");
-
-        pr_debug("qla2xxx passed configfs WWPN: ");
-        put_unaligned_be64(wwpn, b);
-        for (i = 0; i < WWN_SIZE; i++)
-                pr_debug("%02x ", b[i]);
-        pr_debug("\n");
-}
-
-/**
- * qla_tgt_lport_register - register lport with external module
- *
- * @qla_tgt_ops: Pointer for tcm_qla2xxx qla_tgt_ops
- * @wwpn: Passwd FC target WWPN
- * @callback:  lport initialization callback for tcm_qla2xxx code
- * @target_lport_ptr: pointer for tcm_qla2xxx specific lport data
- */
-int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn,
-        int (*callback)(struct scsi_qla_host *), void *target_lport_ptr)
-{
-        struct qla_tgt *tgt;
-        struct scsi_qla_host *vha;
-        struct qla_hw_data *ha;
-        struct Scsi_Host *host;
-        unsigned long flags;
-        int rc;
-        u8 b[WWN_SIZE];
-
-        mutex_lock(&qla_tgt_mutex);
-        list_for_each_entry(tgt, &qla_tgt_glist, tgt_list_entry) {
-                vha = tgt->vha;
-                ha = vha->hw;
-
-                host = vha->host;
-                if (!host)
-                        continue;
-
-                if (ha->tgt.tgt_ops != NULL)
-                        continue;
-
-                if (!(host->hostt->supported_mode & MODE_TARGET))
-                        continue;
-
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                if (host->active_mode & MODE_TARGET) {
-                        pr_debug("MODE_TARGET already active on qla2xxx(%d)\n",
-                            host->host_no);
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                        continue;
-                }
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-                if (!scsi_host_get(host)) {
-                        ql_dbg(ql_dbg_tgt, vha, 0xe068,
-                            "Unable to scsi_host_get() for"
-                            " qla2xxx scsi_host\n");
-                        continue;
-                }
-                qlt_lport_dump(vha, wwpn, b);
-
-                if (memcmp(vha->port_name, b, WWN_SIZE)) {
-                        scsi_host_put(host);
-                        continue;
-                }
-                /*
-                 * Setup passed parameters ahead of invoking callback
-                 */
-                ha->tgt.tgt_ops = qla_tgt_ops;
-                ha->tgt.target_lport_ptr = target_lport_ptr;
-                rc = (*callback)(vha);
-                if (rc != 0) {
-                        ha->tgt.tgt_ops = NULL;
-                        ha->tgt.target_lport_ptr = NULL;
-                }
-                mutex_unlock(&qla_tgt_mutex);
-                return rc;
-        }
-        mutex_unlock(&qla_tgt_mutex);
-
-        return -ENODEV;
-}
-EXPORT_SYMBOL(qlt_lport_register);
-
-/**
- * qla_tgt_lport_deregister - Degister lport
- *
- * @vha:  Registered scsi_qla_host pointer
- */
-void qlt_lport_deregister(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct Scsi_Host *sh = vha->host;
-        /*
-         * Clear the target_lport_ptr qla_target_template pointer in qla_hw_data
-         */
-        ha->tgt.target_lport_ptr = NULL;
-        ha->tgt.tgt_ops = NULL;
-        /*
-         * Release the Scsi_Host reference for the underlying qla2xxx host
-         */
-        scsi_host_put(sh);
-}
-EXPORT_SYMBOL(qlt_lport_deregister);
-
-/* Must be called under HW lock */
-void qlt_set_mode(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        switch (ql2x_ini_mode) {
-        case QLA2XXX_INI_MODE_DISABLED:
-        case QLA2XXX_INI_MODE_EXCLUSIVE:
-                vha->host->active_mode = MODE_TARGET;
-                break;
-        case QLA2XXX_INI_MODE_ENABLED:
-                vha->host->active_mode |= MODE_TARGET;
-                break;
-        default:
-                break;
-        }
-
-        if (ha->tgt.ini_mode_force_reverse)
-                qla_reverse_ini_mode(vha);
-}
-
-/* Must be called under HW lock */
-void qlt_clear_mode(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        switch (ql2x_ini_mode) {
-        case QLA2XXX_INI_MODE_DISABLED:
-                vha->host->active_mode = MODE_UNKNOWN;
-                break;
-        case QLA2XXX_INI_MODE_EXCLUSIVE:
-                vha->host->active_mode = MODE_INITIATOR;
-                break;
-        case QLA2XXX_INI_MODE_ENABLED:
-                vha->host->active_mode &= ~MODE_TARGET;
-                break;
-        default:
-                break;
-        }
-
-        if (ha->tgt.ini_mode_force_reverse)
-                qla_reverse_ini_mode(vha);
-}
-
-/*
- * qla_tgt_enable_vha - NO LOCK HELD
- *
- * host_reset, bring up w/ Target Mode Enabled
- */
-void
-qlt_enable_vha(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        unsigned long flags;
-
-        if (!tgt) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe069,
-                    "Unable to locate qla_tgt pointer from"
-                    " struct qla_hw_data\n");
-                dump_stack();
-                return;
-        }
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        tgt->tgt_stopped = 0;
-        qlt_set_mode(vha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        qla2xxx_wake_dpc(vha);
-        qla2x00_wait_for_hba_online(vha);
-}
-EXPORT_SYMBOL(qlt_enable_vha);
-
-/*
- * qla_tgt_disable_vha - NO LOCK HELD
- *
- * Disable Target Mode and reset the adapter
- */
-void
-qlt_disable_vha(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
-        unsigned long flags;
-
-        if (!tgt) {
-                ql_dbg(ql_dbg_tgt, vha, 0xe06a,
-                    "Unable to locate qla_tgt pointer from"
-                    " struct qla_hw_data\n");
-                dump_stack();
-                return;
-        }
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        qlt_clear_mode(vha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        qla2xxx_wake_dpc(vha);
-        qla2x00_wait_for_hba_online(vha);
-}
-
-/*
- * Called from qla_init.c:qla24xx_vport_create() contex to setup
- * the target mode specific struct scsi_qla_host and struct qla_hw_data
- * members.
- */
-void
-qlt_vport_create(struct scsi_qla_host *vha, struct qla_hw_data *ha)
-{
-        if (!qla_tgt_mode_enabled(vha))
-                return;
-
-        mutex_init(&ha->tgt.tgt_mutex);
-        mutex_init(&ha->tgt.tgt_host_action_mutex);
-
-        qlt_clear_mode(vha);
-
-        /*
-         * NOTE: Currently the value is kept the same for <24xx and
-         * >=24xx ISPs. If it is necessary to change it,
-         * the check should be added for specific ISPs,
-         * assigning the value appropriately.
-         */
-        ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
-}
-
-void
-qlt_rff_id(struct scsi_qla_host *vha, struct ct_sns_req *ct_req)
-{
-        /*
-         * FC-4 Feature bit 0 indicates target functionality to the name server.
-         */
-        if (qla_tgt_mode_enabled(vha)) {
-                if (qla_ini_mode_enabled(vha))
-                        ct_req->req.rff_id.fc4_feature = BIT_0 | BIT_1;
-                else
-                        ct_req->req.rff_id.fc4_feature = BIT_0;
-        } else if (qla_ini_mode_enabled(vha)) {
-                ct_req->req.rff_id.fc4_feature = BIT_1;
-        }
-}
-
-/*
- * qlt_init_atio_q_entries() - Initializes ATIO queue entries.
- * @ha: HA context
- *
- * Beginning of ATIO ring has initialization control block already built
- * by nvram config routine.
- *
- * Returns 0 on success.
- */
-void
-qlt_init_atio_q_entries(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        uint16_t cnt;
-        struct atio_from_isp *pkt = (struct atio_from_isp *)ha->tgt.atio_ring;
-
-        if (!qla_tgt_mode_enabled(vha))
-                return;
-
-        for (cnt = 0; cnt < ha->tgt.atio_q_length; cnt++) {
-                pkt->u.raw.signature = ATIO_PROCESSED;
-                pkt++;
-        }
-
-}
-
-/*
- * qlt_24xx_process_atio_queue() - Process ATIO queue entries.
- * @ha: SCSI driver HA context
- */
-void
-qlt_24xx_process_atio_queue(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-        struct atio_from_isp *pkt;
-        int cnt, i;
-
-        if (!vha->flags.online)
-                return;
-
-        while (ha->tgt.atio_ring_ptr->signature != ATIO_PROCESSED) {
-                pkt = (struct atio_from_isp *)ha->tgt.atio_ring_ptr;
-                cnt = pkt->u.raw.entry_count;
-
-                qlt_24xx_atio_pkt_all_vps(vha, (struct atio_from_isp *)pkt);
-
-                for (i = 0; i < cnt; i++) {
-                        ha->tgt.atio_ring_index++;
-                        if (ha->tgt.atio_ring_index == ha->tgt.atio_q_length) {
-                                ha->tgt.atio_ring_index = 0;
-                                ha->tgt.atio_ring_ptr = ha->tgt.atio_ring;
-                        } else
-                                ha->tgt.atio_ring_ptr++;
-
-                        pkt->u.raw.signature = ATIO_PROCESSED;
-                        pkt = (struct atio_from_isp *)ha->tgt.atio_ring_ptr;
-                }
-                wmb();
-        }
-
-        /* Adjust ring index */
-        WRT_REG_DWORD(&reg->atio_q_out, ha->tgt.atio_ring_index);
-}
-
-void
-qlt_24xx_config_rings(struct scsi_qla_host *vha, device_reg_t __iomem *reg)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-/* FIXME: atio_q in/out for ha->mqenable=1..? */
-        if (ha->mqenable) {
-#if 0
-                WRT_REG_DWORD(&reg->isp25mq.atio_q_in, 0);
-                WRT_REG_DWORD(&reg->isp25mq.atio_q_out, 0);
-                RD_REG_DWORD(&reg->isp25mq.atio_q_out);
-#endif
-        } else {
-                /* Setup APTIO registers for target mode */
-                WRT_REG_DWORD(&reg->isp24.atio_q_in, 0);
-                WRT_REG_DWORD(&reg->isp24.atio_q_out, 0);
-                RD_REG_DWORD(&reg->isp24.atio_q_out);
-        }
-}
-
-void
-qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        if (qla_tgt_mode_enabled(vha)) {
-                if (!ha->tgt.saved_set) {
-                        /* We save only once */
-                        ha->tgt.saved_exchange_count = nv->exchange_count;
-                        ha->tgt.saved_firmware_options_1 =
-                            nv->firmware_options_1;
-                        ha->tgt.saved_firmware_options_2 =
-                            nv->firmware_options_2;
-                        ha->tgt.saved_firmware_options_3 =
-                            nv->firmware_options_3;
-                        ha->tgt.saved_set = 1;
-                }
-
-                nv->exchange_count = __constant_cpu_to_le16(0xFFFF);
-
-                /* Enable target mode */
-                nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_4);
-
-                /* Disable ini mode, if requested */
-                if (!qla_ini_mode_enabled(vha))
-                        nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_5);
-
-                /* Disable Full Login after LIP */
-                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
-                /* Enable initial LIP */
-                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_9);
-                /* Enable FC tapes support */
-                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);
-                /* Disable Full Login after LIP */
-                nv->host_p &= __constant_cpu_to_le32(~BIT_10);
-                /* Enable target PRLI control */
-                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_14);
-        } else {
-                if (ha->tgt.saved_set) {
-                        nv->exchange_count = ha->tgt.saved_exchange_count;
-                        nv->firmware_options_1 =
-                            ha->tgt.saved_firmware_options_1;
-                        nv->firmware_options_2 =
-                            ha->tgt.saved_firmware_options_2;
-                        nv->firmware_options_3 =
-                            ha->tgt.saved_firmware_options_3;
-                }
-                return;
-        }
-
-        /* out-of-order frames reassembly */
-        nv->firmware_options_3 |= BIT_6|BIT_9;
-
-        if (ha->tgt.enable_class_2) {
-                if (vha->flags.init_done)
-                        fc_host_supported_classes(vha->host) =
-                                FC_COS_CLASS2 | FC_COS_CLASS3;
-
-                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_8);
-        } else {
-                if (vha->flags.init_done)
-                        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
-
-                nv->firmware_options_2 &= ~__constant_cpu_to_le32(BIT_8);
-        }
-}
-
-void
-qlt_24xx_config_nvram_stage2(struct scsi_qla_host *vha,
-        struct init_cb_24xx *icb)
-{
-        struct qla_hw_data *ha = vha->hw;
-
-        if (ha->tgt.node_name_set) {
-                memcpy(icb->node_name, ha->tgt.tgt_node_name, WWN_SIZE);
-                icb->firmware_options_1 |= __constant_cpu_to_le32(BIT_14);
-        }
-}
-
-int
-qlt_24xx_process_response_error(struct scsi_qla_host *vha,
-        struct sts_entry_24xx *pkt)
-{
-        switch (pkt->entry_type) {
-        case ABTS_RECV_24XX:
-        case ABTS_RESP_24XX:
-        case CTIO_TYPE7:
-        case NOTIFY_ACK_TYPE:
-                return 1;
-        default:
-                return 0;
-        }
-}
-
-void
-qlt_modify_vp_config(struct scsi_qla_host *vha,
-        struct vp_config_entry_24xx *vpmod)
-{
-        if (qla_tgt_mode_enabled(vha))
-                vpmod->options_idx1 &= ~BIT_5;
-        /* Disable ini mode, if requested */
-        if (!qla_ini_mode_enabled(vha))
-                vpmod->options_idx1 &= ~BIT_4;
-}
-
-void
-qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha)
-{
-        if (!QLA_TGT_MODE_ENABLED())
-                return;
-
-        mutex_init(&ha->tgt.tgt_mutex);
-        mutex_init(&ha->tgt.tgt_host_action_mutex);
-        qlt_clear_mode(base_vha);
-}
-
-int
-qlt_mem_alloc(struct qla_hw_data *ha)
-{
-        if (!QLA_TGT_MODE_ENABLED())
-                return 0;
-
-        ha->tgt.tgt_vp_map = kzalloc(sizeof(struct qla_tgt_vp_map) *
-            MAX_MULTI_ID_FABRIC, GFP_KERNEL);
-        if (!ha->tgt.tgt_vp_map)
-                return -ENOMEM;
-
-        ha->tgt.atio_ring = dma_alloc_coherent(&ha->pdev->dev,
-            (ha->tgt.atio_q_length + 1) * sizeof(struct atio_from_isp),
-            &ha->tgt.atio_dma, GFP_KERNEL);
-        if (!ha->tgt.atio_ring) {
-                kfree(ha->tgt.tgt_vp_map);
-                return -ENOMEM;
-        }
-        return 0;
-}
-
-void
-qlt_mem_free(struct qla_hw_data *ha)
-{
-        if (!QLA_TGT_MODE_ENABLED())
-                return;
-
-        if (ha->tgt.atio_ring) {
-                dma_free_coherent(&ha->pdev->dev, (ha->tgt.atio_q_length + 1) *
-                    sizeof(struct atio_from_isp), ha->tgt.atio_ring,
-                    ha->tgt.atio_dma);
-        }
-        kfree(ha->tgt.tgt_vp_map);
-}
-
-/* vport_slock to be held by the caller */
-void
-qlt_update_vp_map(struct scsi_qla_host *vha, int cmd)
-{
-        if (!QLA_TGT_MODE_ENABLED())
-                return;
-
-        switch (cmd) {
-        case SET_VP_IDX:
-                vha->hw->tgt.tgt_vp_map[vha->vp_idx].vha = vha;
-                break;
-        case SET_AL_PA:
-                vha->hw->tgt.tgt_vp_map[vha->d_id.b.al_pa].idx = vha->vp_idx;
-                break;
-        case RESET_VP_IDX:
-                vha->hw->tgt.tgt_vp_map[vha->vp_idx].vha = NULL;
-                break;
-        case RESET_AL_PA:
-                vha->hw->tgt.tgt_vp_map[vha->d_id.b.al_pa].idx = 0;
-                break;
-        }
-}
-
-static int __init qlt_parse_ini_mode(void)
-{
-        if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_EXCLUSIVE) == 0)
-                ql2x_ini_mode = QLA2XXX_INI_MODE_EXCLUSIVE;
-        else if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_DISABLED) == 0)
-                ql2x_ini_mode = QLA2XXX_INI_MODE_DISABLED;
-        else if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_ENABLED) == 0)
-                ql2x_ini_mode = QLA2XXX_INI_MODE_ENABLED;
-        else
-                return false;
-
-        return true;
-}
-
-int __init qlt_init(void)
-{
-        int ret;
-
-        if (!qlt_parse_ini_mode()) {
-                ql_log(ql_log_fatal, NULL, 0xe06b,
-                    "qlt_parse_ini_mode() failed\n");
-                return -EINVAL;
-        }
-
-        if (!QLA_TGT_MODE_ENABLED())
-                return 0;
-
-        qla_tgt_cmd_cachep = kmem_cache_create("qla_tgt_cmd_cachep",
-            sizeof(struct qla_tgt_cmd), __alignof__(struct qla_tgt_cmd), 0,
-            NULL);
-        if (!qla_tgt_cmd_cachep) {
-                ql_log(ql_log_fatal, NULL, 0xe06c,
-                    "kmem_cache_create for qla_tgt_cmd_cachep failed\n");
-                return -ENOMEM;
-        }
-
-        qla_tgt_mgmt_cmd_cachep = kmem_cache_create("qla_tgt_mgmt_cmd_cachep",
-            sizeof(struct qla_tgt_mgmt_cmd), __alignof__(struct
-            qla_tgt_mgmt_cmd), 0, NULL);
-        if (!qla_tgt_mgmt_cmd_cachep) {
-                ql_log(ql_log_fatal, NULL, 0xe06d,
-                    "kmem_cache_create for qla_tgt_mgmt_cmd_cachep failed\n");
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        qla_tgt_mgmt_cmd_mempool = mempool_create(25, mempool_alloc_slab,
-            mempool_free_slab, qla_tgt_mgmt_cmd_cachep);
-        if (!qla_tgt_mgmt_cmd_mempool) {
-                ql_log(ql_log_fatal, NULL, 0xe06e,
-                    "mempool_create for qla_tgt_mgmt_cmd_mempool failed\n");
-                ret = -ENOMEM;
-                goto out_mgmt_cmd_cachep;
-        }
-
-        qla_tgt_wq = alloc_workqueue("qla_tgt_wq", 0, 0);
-        if (!qla_tgt_wq) {
-                ql_log(ql_log_fatal, NULL, 0xe06f,
-                    "alloc_workqueue for qla_tgt_wq failed\n");
-                ret = -ENOMEM;
-                goto out_cmd_mempool;
-        }
-        /*
-         * Return 1 to signal that initiator-mode is being disabled
-         */
-        return (ql2x_ini_mode == QLA2XXX_INI_MODE_DISABLED) ? 1 : 0;
-
-out_cmd_mempool:
-        mempool_destroy(qla_tgt_mgmt_cmd_mempool);
-out_mgmt_cmd_cachep:
-        kmem_cache_destroy(qla_tgt_mgmt_cmd_cachep);
-out:
-        kmem_cache_destroy(qla_tgt_cmd_cachep);
-        return ret;
-}
-
-void qlt_exit(void)
-{
-        if (!QLA_TGT_MODE_ENABLED())
-                return;
-
-        destroy_workqueue(qla_tgt_wq);
-        mempool_destroy(qla_tgt_mgmt_cmd_mempool);
-        kmem_cache_destroy(qla_tgt_mgmt_cmd_cachep);
-        kmem_cache_destroy(qla_tgt_cmd_cachep);
-}
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
deleted file mode 100644
index bad749561ec..00000000000
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*
- *  Copyright (C) 2004 - 2010 Vladislav Bolkhovitin <vst@vlnb.net>
- *  Copyright (C) 2004 - 2005 Leonid Stoljar
- *  Copyright (C) 2006 Nathaniel Clark <nate@misrule.us>
- *  Copyright (C) 2007 - 2010 ID7 Ltd.
- *
- *  Forward port and refactoring to modern qla2xxx and target/configfs
- *
- *  Copyright (C) 2010-2011 Nicholas A. Bellinger <nab@kernel.org>
- *
- *  Additional file for the target driver support.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-/*
- * This is the global def file that is useful for including from the
- * target portion.
- */
-
-#ifndef __QLA_TARGET_H
-#define __QLA_TARGET_H
-
-#include "qla_def.h"
-
-/*
- * Must be changed on any change in any initiator visible interfaces or
- * data in the target add-on
- */
-#define QLA2XXX_TARGET_MAGIC    269
-
-/*
- * Must be changed on any change in any target visible interfaces or
- * data in the initiator
- */
-#define QLA2XXX_INITIATOR_MAGIC   57222
-
-#define QLA2XXX_INI_MODE_STR_EXCLUSIVE  "exclusive"
-#define QLA2XXX_INI_MODE_STR_DISABLED   "disabled"
-#define QLA2XXX_INI_MODE_STR_ENABLED    "enabled"
-
-#define QLA2XXX_INI_MODE_EXCLUSIVE      0
-#define QLA2XXX_INI_MODE_DISABLED       1
-#define QLA2XXX_INI_MODE_ENABLED        2
-
-#define QLA2XXX_COMMAND_COUNT_INIT      250
-#define QLA2XXX_IMMED_NOTIFY_COUNT_INIT 250
-
-/*
- * Used to mark which completion handles (for RIO Status's) are for CTIO's
- * vs. regular (non-target) info. This is checked for in
- * qla2x00_process_response_queue() to see if a handle coming back in a
- * multi-complete should come to the tgt driver or be handled there by qla2xxx
- */
-#define CTIO_COMPLETION_HANDLE_MARK     BIT_29
-#if (CTIO_COMPLETION_HANDLE_MARK <= MAX_OUTSTANDING_COMMANDS)
-#error "CTIO_COMPLETION_HANDLE_MARK not larger than MAX_OUTSTANDING_COMMANDS"
-#endif
-#define HANDLE_IS_CTIO_COMP(h) (h & CTIO_COMPLETION_HANDLE_MARK)
-
-/* Used to mark CTIO as intermediate */
-#define CTIO_INTERMEDIATE_HANDLE_MARK   BIT_30
-
-#ifndef OF_SS_MODE_0
-/*
- * ISP target entries - Flags bit definitions.
- */
-#define OF_SS_MODE_0        0
-#define OF_SS_MODE_1        1
-#define OF_SS_MODE_2        2
-#define OF_SS_MODE_3        3
-
-#define OF_EXPL_CONF        BIT_5       /* Explicit Confirmation Requested */
-#define OF_DATA_IN          BIT_6       /* Data in to initiator */
-                                        /*  (data from target to initiator) */
-#define OF_DATA_OUT         BIT_7       /* Data out from initiator */
-                                        /*  (data from initiator to target) */
-#define OF_NO_DATA          (BIT_7 | BIT_6)
-#define OF_INC_RC           BIT_8       /* Increment command resource count */
-#define OF_FAST_POST        BIT_9       /* Enable mailbox fast posting. */
-#define OF_CONF_REQ         BIT_13      /* Confirmation Requested */
-#define OF_TERM_EXCH        BIT_14      /* Terminate exchange */
-#define OF_SSTS             BIT_15      /* Send SCSI status */
-#endif
-
-#ifndef QLA_TGT_DATASEGS_PER_CMD32
-#define QLA_TGT_DATASEGS_PER_CMD32      3
-#define QLA_TGT_DATASEGS_PER_CONT32     7
-#define QLA_TGT_MAX_SG32(ql) \
-        (((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD32 + \
-                QLA_TGT_DATASEGS_PER_CONT32*((ql) - 1)) : 0)
-
-#define QLA_TGT_DATASEGS_PER_CMD64      2
-#define QLA_TGT_DATASEGS_PER_CONT64     5
-#define QLA_TGT_MAX_SG64(ql) \
-        (((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD64 + \
-                QLA_TGT_DATASEGS_PER_CONT64*((ql) - 1)) : 0)
-#endif
-
-#ifndef QLA_TGT_DATASEGS_PER_CMD_24XX
-#define QLA_TGT_DATASEGS_PER_CMD_24XX   1
-#define QLA_TGT_DATASEGS_PER_CONT_24XX  5
-#define QLA_TGT_MAX_SG_24XX(ql) \
-        (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
-                QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
-#endif
-#endif
-
-#define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha))                 \
-                         ? le16_to_cpu((iocb)->u.isp2x.target.extended) \
-                         : (uint16_t)(iocb)->u.isp2x.target.id.standard)
-
-#ifndef IMMED_NOTIFY_TYPE
-#define IMMED_NOTIFY_TYPE 0x0D          /* Immediate notify entry. */
-/*
- * ISP queue -  immediate notify entry structure definition.
- *              This is sent by the ISP to the Target driver.
- *              This IOCB would have report of events sent by the
- *              initiator, that needs to be handled by the target
- *              driver immediately.
- */
-struct imm_ntfy_from_isp {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        union {
-                struct {
-                        uint32_t sys_define_2; /* System defined. */
-                        target_id_t target;
-                        uint16_t lun;
-                        uint8_t  target_id;
-                        uint8_t  reserved_1;
-                        uint16_t status_modifier;
-                        uint16_t status;
-                        uint16_t task_flags;
-                        uint16_t seq_id;
-                        uint16_t srr_rx_id;
-                        uint32_t srr_rel_offs;
-                        uint16_t srr_ui;
-#define SRR_IU_DATA_IN  0x1
-#define SRR_IU_DATA_OUT 0x5
-#define SRR_IU_STATUS   0x7
-                        uint16_t srr_ox_id;
-                        uint8_t reserved_2[28];
-                } isp2x;
-                struct {
-                        uint32_t reserved;
-                        uint16_t nport_handle;
-                        uint16_t reserved_2;
-                        uint16_t flags;
-#define NOTIFY24XX_FLAGS_GLOBAL_TPRLO   BIT_1
-#define NOTIFY24XX_FLAGS_PUREX_IOCB     BIT_0
-                        uint16_t srr_rx_id;
-                        uint16_t status;
-                        uint8_t  status_subcode;
-                        uint8_t  reserved_3;
-                        uint32_t exchange_address;
-                        uint32_t srr_rel_offs;
-                        uint16_t srr_ui;
-                        uint16_t srr_ox_id;
-                        uint8_t  reserved_4[19];
-                        uint8_t  vp_index;
-                        uint32_t reserved_5;
-                        uint8_t  port_id[3];
-                        uint8_t  reserved_6;
-                } isp24;
-        } u;
-        uint16_t reserved_7;
-        uint16_t ox_id;
-} __packed;
-#endif
-
-#ifndef NOTIFY_ACK_TYPE
-#define NOTIFY_ACK_TYPE 0x0E      /* Notify acknowledge entry. */
-/*
- * ISP queue -  notify acknowledge entry structure definition.
- *              This is sent to the ISP from the target driver.
- */
-struct nack_to_isp {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        union {
-                struct {
-                        uint32_t sys_define_2; /* System defined. */
-                        target_id_t target;
-                        uint8_t  target_id;
-                        uint8_t  reserved_1;
-                        uint16_t flags;
-                        uint16_t resp_code;
-                        uint16_t status;
-                        uint16_t task_flags;
-                        uint16_t seq_id;
-                        uint16_t srr_rx_id;
-                        uint32_t srr_rel_offs;
-                        uint16_t srr_ui;
-                        uint16_t srr_flags;
-                        uint16_t srr_reject_code;
-                        uint8_t  srr_reject_vendor_uniq;
-                        uint8_t  srr_reject_code_expl;
-                        uint8_t  reserved_2[24];
-                } isp2x;
-                struct {
-                        uint32_t handle;
-                        uint16_t nport_handle;
-                        uint16_t reserved_1;
-                        uint16_t flags;
-                        uint16_t srr_rx_id;
-                        uint16_t status;
-                        uint8_t  status_subcode;
-                        uint8_t  reserved_3;
-                        uint32_t exchange_address;
-                        uint32_t srr_rel_offs;
-                        uint16_t srr_ui;
-                        uint16_t srr_flags;
-                        uint8_t  reserved_4[19];
-                        uint8_t  vp_index;
-                        uint8_t  srr_reject_vendor_uniq;
-                        uint8_t  srr_reject_code_expl;
-                        uint8_t  srr_reject_code;
-                        uint8_t  reserved_5[5];
-                } isp24;
-        } u;
-        uint8_t  reserved[2];
-        uint16_t ox_id;
-} __packed;
-#define NOTIFY_ACK_SRR_FLAGS_ACCEPT     0
-#define NOTIFY_ACK_SRR_FLAGS_REJECT     1
-
-#define NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM  0x9
-
-#define NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL                0
-#define NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_UNABLE_TO_SUPPLY_DATA  0x2a
-
-#define NOTIFY_ACK_SUCCESS      0x01
-#endif
-
-#ifndef ACCEPT_TGT_IO_TYPE
-#define ACCEPT_TGT_IO_TYPE 0x16 /* Accept target I/O entry. */
-#endif
-
-#ifndef CONTINUE_TGT_IO_TYPE
-#define CONTINUE_TGT_IO_TYPE 0x17
-/*
- * ISP queue -  Continue Target I/O (CTIO) entry for status mode 0 structure.
- *              This structure is sent to the ISP 2xxx from target driver.
- */
-struct ctio_to_2xxx {
-        uint8_t  entry_type;            /* Entry type. */
-        uint8_t  entry_count;           /* Entry count. */
-        uint8_t  sys_define;            /* System defined. */
-        uint8_t  entry_status;          /* Entry Status. */
-        uint32_t handle;                /* System defined handle */
-        target_id_t target;
-        uint16_t rx_id;
-        uint16_t flags;
-        uint16_t status;
-        uint16_t timeout;               /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;            /* Data segment count. */
-        uint32_t relative_offset;
-        uint32_t residual;
-        uint16_t reserved_1[3];
-        uint16_t scsi_status;
-        uint32_t transfer_length;
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length;         /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length;         /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length;         /* Data segment 2 length. */
-} __packed;
-#define ATIO_PATH_INVALID       0x07
-#define ATIO_CANT_PROV_CAP      0x16
-#define ATIO_CDB_VALID          0x3D
-
-#define ATIO_EXEC_READ          BIT_1
-#define ATIO_EXEC_WRITE         BIT_0
-#endif
-
-#ifndef CTIO_A64_TYPE
-#define CTIO_A64_TYPE 0x1F
-#define CTIO_SUCCESS                    0x01
-#define CTIO_ABORTED                    0x02
-#define CTIO_INVALID_RX_ID              0x08
-#define CTIO_TIMEOUT                    0x0B
-#define CTIO_LIP_RESET                  0x0E
-#define CTIO_TARGET_RESET               0x17
-#define CTIO_PORT_UNAVAILABLE           0x28
-#define CTIO_PORT_LOGGED_OUT            0x29
-#define CTIO_PORT_CONF_CHANGED          0x2A
-#define CTIO_SRR_RECEIVED               0x45
-#endif
-
-#ifndef CTIO_RET_TYPE
-#define CTIO_RET_TYPE   0x17            /* CTIO return entry */
-#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
-
-struct fcp_hdr {
-        uint8_t  r_ctl;
-        uint8_t  d_id[3];
-        uint8_t  cs_ctl;
-        uint8_t  s_id[3];
-        uint8_t  type;
-        uint8_t  f_ctl[3];
-        uint8_t  seq_id;
-        uint8_t  df_ctl;
-        uint16_t seq_cnt;
-        uint16_t ox_id;
-        uint16_t rx_id;
-        uint32_t parameter;
-} __packed;
-
-struct fcp_hdr_le {
-        uint8_t  d_id[3];
-        uint8_t  r_ctl;
-        uint8_t  s_id[3];
-        uint8_t  cs_ctl;
-        uint8_t  f_ctl[3];
-        uint8_t  type;
-        uint16_t seq_cnt;
-        uint8_t  df_ctl;
-        uint8_t  seq_id;
-        uint16_t rx_id;
-        uint16_t ox_id;
-        uint32_t parameter;
-} __packed;
-
-#define F_CTL_EXCH_CONTEXT_RESP BIT_23
-#define F_CTL_SEQ_CONTEXT_RESIP BIT_22
-#define F_CTL_LAST_SEQ          BIT_20
-#define F_CTL_END_SEQ           BIT_19
-#define F_CTL_SEQ_INITIATIVE    BIT_16
-
-#define R_CTL_BASIC_LINK_SERV   0x80
-#define R_CTL_B_ACC             0x4
-#define R_CTL_B_RJT             0x5
-
-struct atio7_fcp_cmnd {
-        uint64_t lun;
-        uint8_t  cmnd_ref;
-        uint8_t  task_attr:3;
-        uint8_t  reserved:5;
-        uint8_t  task_mgmt_flags;
-#define FCP_CMND_TASK_MGMT_CLEAR_ACA            6
-#define FCP_CMND_TASK_MGMT_TARGET_RESET         5
-#define FCP_CMND_TASK_MGMT_LU_RESET             4
-#define FCP_CMND_TASK_MGMT_CLEAR_TASK_SET       2
-#define FCP_CMND_TASK_MGMT_ABORT_TASK_SET       1
-        uint8_t  wrdata:1;
-        uint8_t  rddata:1;
-        uint8_t  add_cdb_len:6;
-        uint8_t  cdb[16];
-        /*
-         * add_cdb is optional and can absent from struct atio7_fcp_cmnd. Size 4
-         * only to make sizeof(struct atio7_fcp_cmnd) be as expected by
-         * BUILD_BUG_ON in qlt_init().
-         */
-        uint8_t  add_cdb[4];
-        /* uint32_t data_length; */
-} __packed;
-
-/*
- * ISP queue -  Accept Target I/O (ATIO) type entry IOCB structure.
- *              This is sent from the ISP to the target driver.
- */
-struct atio_from_isp {
-        union {
-                struct {
-                        uint16_t entry_hdr;
-                        uint8_t  sys_define;   /* System defined. */
-                        uint8_t  entry_status; /* Entry Status.   */
-                        uint32_t sys_define_2; /* System defined. */
-                        target_id_t target;
-                        uint16_t rx_id;
-                        uint16_t flags;
-                        uint16_t status;
-                        uint8_t  command_ref;
-                        uint8_t  task_codes;
-                        uint8_t  task_flags;
-                        uint8_t  execution_codes;
-                        uint8_t  cdb[MAX_CMDSZ];
-                        uint32_t data_length;
-                        uint16_t lun;
-                        uint8_t  initiator_port_name[WWN_SIZE]; /* on qla23xx */
-                        uint16_t reserved_32[6];
-                        uint16_t ox_id;
-                } isp2x;
-                struct {
-                        uint16_t entry_hdr;
-                        uint8_t  fcp_cmnd_len_low;
-                        uint8_t  fcp_cmnd_len_high:4;
-                        uint8_t  attr:4;
-                        uint32_t exchange_addr;
-#define ATIO_EXCHANGE_ADDRESS_UNKNOWN   0xFFFFFFFF
-                        struct fcp_hdr fcp_hdr;
-                        struct atio7_fcp_cmnd fcp_cmnd;
-                } isp24;
-                struct {
-                        uint8_t  entry_type;    /* Entry type. */
-                        uint8_t  entry_count;   /* Entry count. */
-                        uint8_t  data[58];
-                        uint32_t signature;
-#define ATIO_PROCESSED 0xDEADDEAD               /* Signature */
-                } raw;
-        } u;
-} __packed;
-
-#define CTIO_TYPE7 0x12 /* Continue target I/O entry (for 24xx) */
-
-/*
- * ISP queue -  Continue Target I/O (ATIO) type 7 entry (for 24xx) structure.
- *              This structure is sent to the ISP 24xx from the target driver.
- */
-
-struct ctio7_to_24xx {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        uint32_t handle;                    /* System defined handle */
-        uint16_t nport_handle;
-#define CTIO7_NHANDLE_UNRECOGNIZED      0xFFFF
-        uint16_t timeout;
-        uint16_t dseg_count;                /* Data segment count. */
-        uint8_t  vp_index;
-        uint8_t  add_flags;
-        uint8_t  initiator_id[3];
-        uint8_t  reserved;
-        uint32_t exchange_addr;
-        union {
-                struct {
-                        uint16_t reserved1;
-                        uint16_t flags;
-                        uint32_t residual;
-                        uint16_t ox_id;
-                        uint16_t scsi_status;
-                        uint32_t relative_offset;
-                        uint32_t reserved2;
-                        uint32_t transfer_length;
-                        uint32_t reserved3;
-                        /* Data segment 0 address. */
-                        uint32_t dseg_0_address[2];
-                        /* Data segment 0 length. */
-                        uint32_t dseg_0_length;
-                } status0;
-                struct {
-                        uint16_t sense_length;
-                        uint16_t flags;
-                        uint32_t residual;
-                        uint16_t ox_id;
-                        uint16_t scsi_status;
-                        uint16_t response_len;
-                        uint16_t reserved;
-                        uint8_t sense_data[24];
-                } status1;
-        } u;
-} __packed;
-
-/*
- * ISP queue - CTIO type 7 from ISP 24xx to target driver
- * returned entry structure.
- */
-struct ctio7_from_24xx {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        uint32_t handle;                    /* System defined handle */
-        uint16_t status;
-        uint16_t timeout;
-        uint16_t dseg_count;                /* Data segment count. */
-        uint8_t  vp_index;
-        uint8_t  reserved1[5];
-        uint32_t exchange_address;
-        uint16_t reserved2;
-        uint16_t flags;
-        uint32_t residual;
-        uint16_t ox_id;
-        uint16_t reserved3;
-        uint32_t relative_offset;
-        uint8_t  reserved4[24];
-} __packed;
-
-/* CTIO7 flags values */
-#define CTIO7_FLAGS_SEND_STATUS         BIT_15
-#define CTIO7_FLAGS_TERMINATE           BIT_14
-#define CTIO7_FLAGS_CONFORM_REQ         BIT_13
-#define CTIO7_FLAGS_DONT_RET_CTIO       BIT_8
-#define CTIO7_FLAGS_STATUS_MODE_0       0
-#define CTIO7_FLAGS_STATUS_MODE_1       BIT_6
-#define CTIO7_FLAGS_EXPLICIT_CONFORM    BIT_5
-#define CTIO7_FLAGS_CONFIRM_SATISF      BIT_4
-#define CTIO7_FLAGS_DSD_PTR             BIT_2
-#define CTIO7_FLAGS_DATA_IN             BIT_1
-#define CTIO7_FLAGS_DATA_OUT            BIT_0
-
-#define ELS_PLOGI                       0x3
-#define ELS_FLOGI                       0x4
-#define ELS_LOGO                        0x5
-#define ELS_PRLI                        0x20
-#define ELS_PRLO                        0x21
-#define ELS_TPRLO                       0x24
-#define ELS_PDISC                       0x50
-#define ELS_ADISC                       0x52
-
-/*
- * ISP queue - ABTS received/response entries structure definition for 24xx.
- */
-#define ABTS_RECV_24XX          0x54 /* ABTS received (for 24xx) */
-#define ABTS_RESP_24XX          0x55 /* ABTS responce (for 24xx) */
-
-/*
- * ISP queue -  ABTS received IOCB entry structure definition for 24xx.
- *              The ABTS BLS received from the wire is sent to the
- *              target driver by the ISP 24xx.
- *              The IOCB is placed on the response queue.
- */
-struct abts_recv_from_24xx {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        uint8_t  reserved_1[6];
-        uint16_t nport_handle;
-        uint8_t  reserved_2[2];
-        uint8_t  vp_index;
-        uint8_t  reserved_3:4;
-        uint8_t  sof_type:4;
-        uint32_t exchange_address;
-        struct fcp_hdr_le fcp_hdr_le;
-        uint8_t  reserved_4[16];
-        uint32_t exchange_addr_to_abort;
-} __packed;
-
-#define ABTS_PARAM_ABORT_SEQ            BIT_0
-
-struct ba_acc_le {
-        uint16_t reserved;
-        uint8_t  seq_id_last;
-        uint8_t  seq_id_valid;
-#define SEQ_ID_VALID    0x80
-#define SEQ_ID_INVALID  0x00
-        uint16_t rx_id;
-        uint16_t ox_id;
-        uint16_t high_seq_cnt;
-        uint16_t low_seq_cnt;
-} __packed;
-
-struct ba_rjt_le {
-        uint8_t vendor_uniq;
-        uint8_t reason_expl;
-        uint8_t reason_code;
-#define BA_RJT_REASON_CODE_INVALID_COMMAND      0x1
-#define BA_RJT_REASON_CODE_UNABLE_TO_PERFORM    0x9
-        uint8_t reserved;
-} __packed;
-
-/*
- * ISP queue -  ABTS Response IOCB entry structure definition for 24xx.
- *              The ABTS response to the ABTS received is sent by the
- *              target driver to the ISP 24xx.
- *              The IOCB is placed on the request queue.
- */
-struct abts_resp_to_24xx {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        uint32_t handle;
-        uint16_t reserved_1;
-        uint16_t nport_handle;
-        uint16_t control_flags;
-#define ABTS_CONTR_FLG_TERM_EXCHG       BIT_0
-        uint8_t  vp_index;
-        uint8_t  reserved_3:4;
-        uint8_t  sof_type:4;
-        uint32_t exchange_address;
-        struct fcp_hdr_le fcp_hdr_le;
-        union {
-                struct ba_acc_le ba_acct;
-                struct ba_rjt_le ba_rjt;
-        } __packed payload;
-        uint32_t reserved_4;
-        uint32_t exchange_addr_to_abort;
-} __packed;
-
-/*
- * ISP queue -  ABTS Response IOCB from ISP24xx Firmware entry structure.
- *              The ABTS response with completion status to the ABTS response
- *              (sent by the target driver to the ISP 24xx) is sent by the
- *              ISP24xx firmware to the target driver.
- *              The IOCB is placed on the response queue.
- */
-struct abts_resp_from_24xx_fw {
-        uint8_t  entry_type;                /* Entry type. */
-        uint8_t  entry_count;               /* Entry count. */
-        uint8_t  sys_define;                /* System defined. */
-        uint8_t  entry_status;              /* Entry Status. */
-        uint32_t handle;
-        uint16_t compl_status;
-#define ABTS_RESP_COMPL_SUCCESS         0
-#define ABTS_RESP_COMPL_SUBCODE_ERROR   0x31
-        uint16_t nport_handle;
-        uint16_t reserved_1;
-        uint8_t  reserved_2;
-        uint8_t  reserved_3:4;
-        uint8_t  sof_type:4;
-        uint32_t exchange_address;
-        struct fcp_hdr_le fcp_hdr_le;
-        uint8_t reserved_4[8];
-        uint32_t error_subcode1;
-#define ABTS_RESP_SUBCODE_ERR_ABORTED_EXCH_NOT_TERM     0x1E
-        uint32_t error_subcode2;
-        uint32_t exchange_addr_to_abort;
-} __packed;
-
-/********************************************************************\
- * Type Definitions used by initiator & target halves
-\********************************************************************/
-
-struct qla_tgt_mgmt_cmd;
-struct qla_tgt_sess;
-
-/*
- * This structure provides a template of function calls that the
- * target driver (from within qla_target.c) can issue to the
- * target module (tcm_qla2xxx).
- */
-struct qla_tgt_func_tmpl {
-
-        int (*handle_cmd)(struct scsi_qla_host *, struct qla_tgt_cmd *,
-                        unsigned char *, uint32_t, int, int, int);
-        void (*handle_data)(struct qla_tgt_cmd *);
-        int (*handle_tmr)(struct qla_tgt_mgmt_cmd *, uint32_t, uint8_t,
-                        uint32_t);
-        void (*free_cmd)(struct qla_tgt_cmd *);
-        void (*free_mcmd)(struct qla_tgt_mgmt_cmd *);
-        void (*free_session)(struct qla_tgt_sess *);
-
-        int (*check_initiator_node_acl)(struct scsi_qla_host *, unsigned char *,
-                                        void *, uint8_t *, uint16_t);
-        void (*update_sess)(struct qla_tgt_sess *, port_id_t, uint16_t, bool);
-        struct qla_tgt_sess *(*find_sess_by_loop_id)(struct scsi_qla_host *,
-                                                const uint16_t);
-        struct qla_tgt_sess *(*find_sess_by_s_id)(struct scsi_qla_host *,
-                                                const uint8_t *);
-        void (*clear_nacl_from_fcport_map)(struct qla_tgt_sess *);
-        void (*put_sess)(struct qla_tgt_sess *);
-        void (*shutdown_sess)(struct qla_tgt_sess *);
-};
-
-int qla2x00_wait_for_hba_online(struct scsi_qla_host *);
-
-#include <target/target_core_base.h>
-
-#define QLA_TGT_TIMEOUT                 10      /* in seconds */
-
-#define QLA_TGT_MAX_HW_PENDING_TIME     60 /* in seconds */
-
-/* Immediate notify status constants */
-#define IMM_NTFY_LIP_RESET          0x000E
-#define IMM_NTFY_LIP_LINK_REINIT    0x000F
-#define IMM_NTFY_IOCB_OVERFLOW      0x0016
-#define IMM_NTFY_ABORT_TASK         0x0020
-#define IMM_NTFY_PORT_LOGOUT        0x0029
-#define IMM_NTFY_PORT_CONFIG        0x002A
-#define IMM_NTFY_GLBL_TPRLO         0x002D
-#define IMM_NTFY_GLBL_LOGO          0x002E
-#define IMM_NTFY_RESOURCE           0x0034
-#define IMM_NTFY_MSG_RX             0x0036
-#define IMM_NTFY_SRR                0x0045
-#define IMM_NTFY_ELS                0x0046
-
-/* Immediate notify task flags */
-#define IMM_NTFY_TASK_MGMT_SHIFT    8
-
-#define QLA_TGT_CLEAR_ACA               0x40
-#define QLA_TGT_TARGET_RESET            0x20
-#define QLA_TGT_LUN_RESET               0x10
-#define QLA_TGT_CLEAR_TS                0x04
-#define QLA_TGT_ABORT_TS                0x02
-#define QLA_TGT_ABORT_ALL_SESS          0xFFFF
-#define QLA_TGT_ABORT_ALL               0xFFFE
-#define QLA_TGT_NEXUS_LOSS_SESS         0xFFFD
-#define QLA_TGT_NEXUS_LOSS              0xFFFC
-
-/* Notify Acknowledge flags */
-#define NOTIFY_ACK_RES_COUNT        BIT_8
-#define NOTIFY_ACK_CLEAR_LIP_RESET  BIT_5
-#define NOTIFY_ACK_TM_RESP_CODE_VALID BIT_4
-
-/* Command's states */
-#define QLA_TGT_STATE_NEW               0 /* New command + target processing */
-#define QLA_TGT_STATE_NEED_DATA         1 /* target needs data to continue */
-#define QLA_TGT_STATE_DATA_IN           2 /* Data arrived + target processing */
-#define QLA_TGT_STATE_PROCESSED         3 /* target done processing */
-#define QLA_TGT_STATE_ABORTED           4 /* Command aborted */
-
-/* Special handles */
-#define QLA_TGT_NULL_HANDLE     0
-#define QLA_TGT_SKIP_HANDLE     (0xFFFFFFFF & ~CTIO_COMPLETION_HANDLE_MARK)
-
-/* ATIO task_codes field */
-#define ATIO_SIMPLE_QUEUE           0
-#define ATIO_HEAD_OF_QUEUE          1
-#define ATIO_ORDERED_QUEUE          2
-#define ATIO_ACA_QUEUE              4
-#define ATIO_UNTAGGED               5
-
-/* TM failed response codes, see FCP (9.4.11 FCP_RSP_INFO) */
-#define FC_TM_SUCCESS               0
-#define FC_TM_BAD_FCP_DATA          1
-#define FC_TM_BAD_CMD               2
-#define FC_TM_FCP_DATA_MISMATCH     3
-#define FC_TM_REJECT                4
-#define FC_TM_FAILED                5
-
-/*
- * Error code of qlt_pre_xmit_response() meaning that cmd's exchange was
- * terminated, so no more actions is needed and success should be returned
- * to target.
- */
-#define QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED       0x1717
-
-#if (BITS_PER_LONG > 32) || defined(CONFIG_HIGHMEM64G)
-#define pci_dma_lo32(a) (a & 0xffffffff)
-#define pci_dma_hi32(a) ((((a) >> 16)>>16) & 0xffffffff)
-#else
-#define pci_dma_lo32(a) (a & 0xffffffff)
-#define pci_dma_hi32(a) 0
-#endif
-
-#define QLA_TGT_SENSE_VALID(sense)  ((sense != NULL) && \
-                                (((const uint8_t *)(sense))[0] & 0x70) == 0x70)
-
-struct qla_port_24xx_data {
-        uint8_t port_name[WWN_SIZE];
-        uint16_t loop_id;
-        uint16_t reserved;
-};
-
-struct qla_tgt {
-        struct scsi_qla_host *vha;
-        struct qla_hw_data *ha;
-
-        /*
-         * To sync between IRQ handlers and qlt_target_release(). Needed,
-         * because req_pkt() can drop/reaquire HW lock inside. Protected by
-         * HW lock.
-         */
-        int irq_cmd_count;
-
-        int datasegs_per_cmd, datasegs_per_cont, sg_tablesize;
-
-        /* Target's flags, serialized by pha->hardware_lock */
-        unsigned int tgt_enable_64bit_addr:1; /* 64-bits PCI addr enabled */
-        unsigned int link_reinit_iocb_pending:1;
-
-        /*
-         * Protected by tgt_mutex AND hardware_lock for writing and tgt_mutex
-         * OR hardware_lock for reading.
-         */
-        int tgt_stop; /* the target mode driver is being stopped */
-        int tgt_stopped; /* the target mode driver has been stopped */
-
-        /* Count of sessions refering qla_tgt. Protected by hardware_lock. */
-        int sess_count;
-
-        /* Protected by hardware_lock. Addition also protected by tgt_mutex. */
-        struct list_head sess_list;
-
-        /* Protected by hardware_lock */
-        struct list_head del_sess_list;
-        struct delayed_work sess_del_work;
-
-        spinlock_t sess_work_lock;
-        struct list_head sess_works_list;
-        struct work_struct sess_work;
-
-        struct imm_ntfy_from_isp link_reinit_iocb;
-        wait_queue_head_t waitQ;
-        int notify_ack_expected;
-        int abts_resp_expected;
-        int modify_lun_expected;
-
-        int ctio_srr_id;
-        int imm_srr_id;
-        spinlock_t srr_lock;
-        struct list_head srr_ctio_list;
-        struct list_head srr_imm_list;
-        struct work_struct srr_work;
-
-        atomic_t tgt_global_resets_count;
-
-        struct list_head tgt_list_entry;
-};
-
-/*
- * Equivilant to IT Nexus (Initiator-Target)
- */
-struct qla_tgt_sess {
-        uint16_t loop_id;
-        port_id_t s_id;
-
-        unsigned int conf_compl_supported:1;
-        unsigned int deleted:1;
-        unsigned int local:1;
-
-        struct se_session *se_sess;
-        struct scsi_qla_host *vha;
-        struct qla_tgt *tgt;
-
-        struct list_head sess_list_entry;
-        unsigned long expires;
-        struct list_head del_list_entry;
-
-        uint8_t port_name[WWN_SIZE];
-        struct work_struct free_work;
-};
-
-struct qla_tgt_cmd {
-        struct qla_tgt_sess *sess;
-        int state;
-        struct se_cmd se_cmd;
-        struct work_struct free_work;
-        struct work_struct work;
-        /* Sense buffer that will be mapped into outgoing status */
-        unsigned char sense_buffer[TRANSPORT_SENSE_BUFFER];
-
-        /* to save extra sess dereferences */
-        unsigned int conf_compl_supported:1;
-        unsigned int sg_mapped:1;
-        unsigned int free_sg:1;
-        unsigned int aborted:1; /* Needed in case of SRR */
-        unsigned int write_data_transferred:1;
-
-        struct scatterlist *sg; /* cmd data buffer SG vector */
-        int sg_cnt;             /* SG segments count */
-        int bufflen;            /* cmd buffer length */
-        int offset;
-        uint32_t tag;
-        uint32_t unpacked_lun;
-        enum dma_data_direction dma_data_direction;
-
-        uint16_t loop_id;       /* to save extra sess dereferences */
-        struct qla_tgt *tgt;    /* to save extra sess dereferences */
-        struct scsi_qla_host *vha;
-        struct list_head cmd_list;
-
-        struct atio_from_isp atio;
-};
-
-struct qla_tgt_sess_work_param {
-        struct list_head sess_works_list_entry;
-
-#define QLA_TGT_SESS_WORK_ABORT 1
-#define QLA_TGT_SESS_WORK_TM    2
-        int type;
-
-        union {
-                struct abts_recv_from_24xx abts;
-                struct imm_ntfy_from_isp tm_iocb;
-                struct atio_from_isp tm_iocb2;
-        };
-};
-
-struct qla_tgt_mgmt_cmd {
-        uint8_t tmr_func;
-        uint8_t fc_tm_rsp;
-        struct qla_tgt_sess *sess;
-        struct se_cmd se_cmd;
-        struct work_struct free_work;
-        unsigned int flags;
-#define QLA24XX_MGMT_SEND_NACK  1
-        union {
-                struct atio_from_isp atio;
-                struct imm_ntfy_from_isp imm_ntfy;
-                struct abts_recv_from_24xx abts;
-        } __packed orig_iocb;
-};
-
-struct qla_tgt_prm {
-        struct qla_tgt_cmd *cmd;
-        struct qla_tgt *tgt;
-        void *pkt;
-        struct scatterlist *sg; /* cmd data buffer SG vector */
-        int seg_cnt;
-        int req_cnt;
-        uint16_t rq_result;
-        uint16_t scsi_status;
-        unsigned char *sense_buffer;
-        int sense_buffer_len;
-        int residual;
-        int add_status_pkt;
-};
-
-struct qla_tgt_srr_imm {
-        struct list_head srr_list_entry;
-        int srr_id;
-        struct imm_ntfy_from_isp imm_ntfy;
-};
-
-struct qla_tgt_srr_ctio {
-        struct list_head srr_list_entry;
-        int srr_id;
-        struct qla_tgt_cmd *cmd;
-};
-
-#define QLA_TGT_XMIT_DATA               1
-#define QLA_TGT_XMIT_STATUS             2
-#define QLA_TGT_XMIT_ALL                (QLA_TGT_XMIT_STATUS|QLA_TGT_XMIT_DATA)
-
-
-extern struct qla_tgt_data qla_target;
-/*
- * Internal function prototypes
- */
-void qlt_disable_vha(struct scsi_qla_host *);
-
-/*
- * Function prototypes for qla_target.c logic used by qla2xxx LLD code.
- */
-extern int qlt_add_target(struct qla_hw_data *, struct scsi_qla_host *);
-extern int qlt_remove_target(struct qla_hw_data *, struct scsi_qla_host *);
-extern int qlt_lport_register(struct qla_tgt_func_tmpl *, u64,
-                        int (*callback)(struct scsi_qla_host *), void *);
-extern void qlt_lport_deregister(struct scsi_qla_host *);
-extern void qlt_unreg_sess(struct qla_tgt_sess *);
-extern void qlt_fc_port_added(struct scsi_qla_host *, fc_port_t *);
-extern void qlt_fc_port_deleted(struct scsi_qla_host *, fc_port_t *);
-extern void qlt_set_mode(struct scsi_qla_host *ha);
-extern void qlt_clear_mode(struct scsi_qla_host *ha);
-extern int __init qlt_init(void);
-extern void qlt_exit(void);
-extern void qlt_update_vp_map(struct scsi_qla_host *, int);
-
-/*
- * This macro is used during early initializations when host->active_mode
- * is not set. Right now, ha value is ignored.
- */
-#define QLA_TGT_MODE_ENABLED() (ql2x_ini_mode != QLA2XXX_INI_MODE_ENABLED)
-
-static inline bool qla_tgt_mode_enabled(struct scsi_qla_host *ha)
-{
-        return ha->host->active_mode & MODE_TARGET;
-}
-
-static inline bool qla_ini_mode_enabled(struct scsi_qla_host *ha)
-{
-        return ha->host->active_mode & MODE_INITIATOR;
-}
-
-static inline void qla_reverse_ini_mode(struct scsi_qla_host *ha)
-{
-        if (ha->host->active_mode & MODE_INITIATOR)
-                ha->host->active_mode &= ~MODE_INITIATOR;
-        else
-                ha->host->active_mode |= MODE_INITIATOR;
-}
-
-/*
- * Exported symbols from qla_target.c LLD logic used by qla2xxx code..
- */
-extern void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *,
-        struct atio_from_isp *);
-extern void qlt_response_pkt_all_vps(struct scsi_qla_host *, response_t *);
-extern int qlt_rdy_to_xfer(struct qla_tgt_cmd *);
-extern int qlt_xmit_response(struct qla_tgt_cmd *, int, uint8_t);
-extern void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *);
-extern void qlt_free_mcmd(struct qla_tgt_mgmt_cmd *);
-extern void qlt_free_cmd(struct qla_tgt_cmd *cmd);
-extern void qlt_ctio_completion(struct scsi_qla_host *, uint32_t);
-extern void qlt_async_event(uint16_t, struct scsi_qla_host *, uint16_t *);
-extern void qlt_enable_vha(struct scsi_qla_host *);
-extern void qlt_vport_create(struct scsi_qla_host *, struct qla_hw_data *);
-extern void qlt_rff_id(struct scsi_qla_host *, struct ct_sns_req *);
-extern void qlt_init_atio_q_entries(struct scsi_qla_host *);
-extern void qlt_24xx_process_atio_queue(struct scsi_qla_host *);
-extern void qlt_24xx_config_rings(struct scsi_qla_host *,
-        device_reg_t __iomem *);
-extern void qlt_24xx_config_nvram_stage1(struct scsi_qla_host *,
-        struct nvram_24xx *);
-extern void qlt_24xx_config_nvram_stage2(struct scsi_qla_host *,
-        struct init_cb_24xx *);
-extern int qlt_24xx_process_response_error(struct scsi_qla_host *,
-        struct sts_entry_24xx *);
-extern void qlt_modify_vp_config(struct scsi_qla_host *,
-        struct vp_config_entry_24xx *);
-extern void qlt_probe_one_stage1(struct scsi_qla_host *, struct qla_hw_data *);
-extern int qlt_mem_alloc(struct qla_hw_data *);
-extern void qlt_mem_free(struct qla_hw_data *);
-extern void qlt_stop_phase1(struct qla_tgt *);
-extern void qlt_stop_phase2(struct qla_tgt *);
-
-#endif /* __QLA_TARGET_H */
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 49697ca41e7..13b6357c1fa 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -1,15 +1,15 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2011 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.04.00.08-k"
+#define QLA2XXX_VERSION      "8.03.07.07-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
-#define QLA_DRIVER_MINOR_VER    4
-#define QLA_DRIVER_PATCH_VER    0
-#define QLA_DRIVER_BETA_VER     0
+#define QLA_DRIVER_MINOR_VER    3
+#define QLA_DRIVER_PATCH_VER    7
+#define QLA_DRIVER_BETA_VER     3
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
deleted file mode 100644
index d182c96e17e..00000000000
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ /dev/null
@@ -1,1964 +0,0 @@
-/*******************************************************************************
- * This file contains tcm implementation using v4 configfs fabric infrastructure
- * for QLogic target mode HBAs
- *
- * ?? Copyright 2010-2011 RisingTide Systems LLC.
- *
- * Licensed to the Linux Foundation under the General Public License (GPL)
- * version 2.
- *
- * Author: Nicholas A. Bellinger <nab@risingtidesystems.com>
- *
- * tcm_qla2xxx_parse_wwn() and tcm_qla2xxx_format_wwn() contains code from
- * the TCM_FC / Open-FCoE.org fabric module.
- *
- * Copyright (c) 2010 Cisco Systems, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- ****************************************************************************/
-
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <generated/utsrelease.h>
-#include <linux/utsname.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/kthread.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/configfs.h>
-#include <linux/ctype.h>
-#include <asm/unaligned.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_cmnd.h>
-#include <target/target_core_base.h>
-#include <target/target_core_fabric.h>
-#include <target/target_core_fabric_configfs.h>
-#include <target/target_core_configfs.h>
-#include <target/configfs_macros.h>
-
-#include "qla_def.h"
-#include "qla_target.h"
-#include "tcm_qla2xxx.h"
-
-struct workqueue_struct *tcm_qla2xxx_free_wq;
-struct workqueue_struct *tcm_qla2xxx_cmd_wq;
-
-static int tcm_qla2xxx_check_true(struct se_portal_group *se_tpg)
-{
-        return 1;
-}
-
-static int tcm_qla2xxx_check_false(struct se_portal_group *se_tpg)
-{
-        return 0;
-}
-
-/*
- * Parse WWN.
- * If strict, we require lower-case hex and colon separators to be sure
- * the name is the same as what would be generated by ft_format_wwn()
- * so the name and wwn are mapped one-to-one.
- */
-static ssize_t tcm_qla2xxx_parse_wwn(const char *name, u64 *wwn, int strict)
-{
-        const char *cp;
-        char c;
-        u32 nibble;
-        u32 byte = 0;
-        u32 pos = 0;
-        u32 err;
-
-        *wwn = 0;
-        for (cp = name; cp < &name[TCM_QLA2XXX_NAMELEN - 1]; cp++) {
-                c = *cp;
-                if (c == '\n' && cp[1] == '\0')
-                        continue;
-                if (strict && pos++ == 2 && byte++ < 7) {
-                        pos = 0;
-                        if (c == ':')
-                                continue;
-                        err = 1;
-                        goto fail;
-                }
-                if (c == '\0') {
-                        err = 2;
-                        if (strict && byte != 8)
-                                goto fail;
-                        return cp - name;
-                }
-                err = 3;
-                if (isdigit(c))
-                        nibble = c - '0';
-                else if (isxdigit(c) && (islower(c) || !strict))
-                        nibble = tolower(c) - 'a' + 10;
-                else
-                        goto fail;
-                *wwn = (*wwn << 4) | nibble;
-        }
-        err = 4;
-fail:
-        pr_debug("err %u len %zu pos %u byte %u\n",
-                        err, cp - name, pos, byte);
-        return -1;
-}
-
-static ssize_t tcm_qla2xxx_format_wwn(char *buf, size_t len, u64 wwn)
-{
-        u8 b[8];
-
-        put_unaligned_be64(wwn, b);
-        return snprintf(buf, len,
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
-                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
-}
-
-static char *tcm_qla2xxx_get_fabric_name(void)
-{
-        return "qla2xxx";
-}
-
-/*
- * From drivers/scsi/scsi_transport_fc.c:fc_parse_wwn
- */
-static int tcm_qla2xxx_npiv_extract_wwn(const char *ns, u64 *nm)
-{
-        unsigned int i, j;
-        u8 wwn[8];
-
-        memset(wwn, 0, sizeof(wwn));
-
-        /* Validate and store the new name */
-        for (i = 0, j = 0; i < 16; i++) {
-                int value;
-
-                value = hex_to_bin(*ns++);
-                if (value >= 0)
-                        j = (j << 4) | value;
-                else
-                        return -EINVAL;
-
-                if (i % 2) {
-                        wwn[i/2] = j & 0xff;
-                        j = 0;
-                }
-        }
-
-        *nm = wwn_to_u64(wwn);
-        return 0;
-}
-
-/*
- * This parsing logic follows drivers/scsi/scsi_transport_fc.c:
- * store_fc_host_vport_create()
- */
-static int tcm_qla2xxx_npiv_parse_wwn(
-        const char *name,
-        size_t count,
-        u64 *wwpn,
-        u64 *wwnn)
-{
-        unsigned int cnt = count;
-        int rc;
-
-        *wwpn = 0;
-        *wwnn = 0;
-
-        /* count may include a LF at end of string */
-        if (name[cnt-1] == '\n')
-                cnt--;
-
-        /* validate we have enough characters for WWPN */
-        if ((cnt != (16+1+16)) || (name[16] != ':'))
-                return -EINVAL;
-
-        rc = tcm_qla2xxx_npiv_extract_wwn(&name[0], wwpn);
-        if (rc != 0)
-                return rc;
-
-        rc = tcm_qla2xxx_npiv_extract_wwn(&name[17], wwnn);
-        if (rc != 0)
-                return rc;
-
-        return 0;
-}
-
-static ssize_t tcm_qla2xxx_npiv_format_wwn(char *buf, size_t len,
-                                        u64 wwpn, u64 wwnn)
-{
-        u8 b[8], b2[8];
-
-        put_unaligned_be64(wwpn, b);
-        put_unaligned_be64(wwnn, b2);
-        return snprintf(buf, len,
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x,"
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
-                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
-                b2[0], b2[1], b2[2], b2[3], b2[4], b2[5], b2[6], b2[7]);
-}
-
-static char *tcm_qla2xxx_npiv_get_fabric_name(void)
-{
-        return "qla2xxx_npiv";
-}
-
-static u8 tcm_qla2xxx_get_fabric_proto_ident(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        u8 proto_id;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                proto_id = fc_get_fabric_proto_ident(se_tpg);
-                break;
-        }
-
-        return proto_id;
-}
-
-static char *tcm_qla2xxx_get_fabric_wwn(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-
-        return lport->lport_naa_name;
-}
-
-static char *tcm_qla2xxx_npiv_get_fabric_wwn(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-
-        return &lport->lport_npiv_name[0];
-}
-
-static u16 tcm_qla2xxx_get_tag(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        return tpg->lport_tpgt;
-}
-
-static u32 tcm_qla2xxx_get_default_depth(struct se_portal_group *se_tpg)
-{
-        return 1;
-}
-
-static u32 tcm_qla2xxx_get_pr_transport_id(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl,
-        struct t10_pr_registration *pr_reg,
-        int *format_code,
-        unsigned char *buf)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        int ret = 0;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                ret = fc_get_pr_transport_id(se_tpg, se_nacl, pr_reg,
-                                        format_code, buf);
-                break;
-        }
-
-        return ret;
-}
-
-static u32 tcm_qla2xxx_get_pr_transport_id_len(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl,
-        struct t10_pr_registration *pr_reg,
-        int *format_code)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        int ret = 0;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                ret = fc_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,
-                                        format_code);
-                break;
-        }
-
-        return ret;
-}
-
-static char *tcm_qla2xxx_parse_pr_out_transport_id(
-        struct se_portal_group *se_tpg,
-        const char *buf,
-        u32 *out_tid_len,
-        char **port_nexus_ptr)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        char *tid = NULL;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                tid = fc_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,
-                                        port_nexus_ptr);
-                break;
-        }
-
-        return tid;
-}
-
-static int tcm_qla2xxx_check_demo_mode(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-
-        return QLA_TPG_ATTRIB(tpg)->generate_node_acls;
-}
-
-static int tcm_qla2xxx_check_demo_mode_cache(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-
-        return QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls;
-}
-
-static int tcm_qla2xxx_check_demo_write_protect(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-
-        return QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect;
-}
-
-static int tcm_qla2xxx_check_prod_write_protect(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-
-        return QLA_TPG_ATTRIB(tpg)->prod_mode_write_protect;
-}
-
-static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
-        struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_nacl *nacl;
-
-        nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL);
-        if (!nacl) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_nacl\n");
-                return NULL;
-        }
-
-        return &nacl->se_node_acl;
-}
-
-static void tcm_qla2xxx_release_fabric_acl(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl)
-{
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
-                        struct tcm_qla2xxx_nacl, se_node_acl);
-        kfree(nacl);
-}
-
-static u32 tcm_qla2xxx_tpg_get_inst_index(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-
-        return tpg->lport_tpgt;
-}
-
-static void tcm_qla2xxx_complete_mcmd(struct work_struct *work)
-{
-        struct qla_tgt_mgmt_cmd *mcmd = container_of(work,
-                        struct qla_tgt_mgmt_cmd, free_work);
-
-        transport_generic_free_cmd(&mcmd->se_cmd, 0);
-}
-
-/*
- * Called from qla_target_template->free_mcmd(), and will call
- * tcm_qla2xxx_release_cmd() via normal struct target_core_fabric_ops
- * release callback.  qla_hw_data->hardware_lock is expected to be held
- */
-static void tcm_qla2xxx_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)
-{
-        INIT_WORK(&mcmd->free_work, tcm_qla2xxx_complete_mcmd);
-        queue_work(tcm_qla2xxx_free_wq, &mcmd->free_work);
-}
-
-static void tcm_qla2xxx_complete_free(struct work_struct *work)
-{
-        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
-
-        transport_generic_free_cmd(&cmd->se_cmd, 0);
-}
-
-/*
- * Called from qla_target_template->free_cmd(), and will call
- * tcm_qla2xxx_release_cmd via normal struct target_core_fabric_ops
- * release callback.  qla_hw_data->hardware_lock is expected to be held
- */
-static void tcm_qla2xxx_free_cmd(struct qla_tgt_cmd *cmd)
-{
-        INIT_WORK(&cmd->work, tcm_qla2xxx_complete_free);
-        queue_work(tcm_qla2xxx_free_wq, &cmd->work);
-}
-
-/*
- * Called from struct target_core_fabric_ops->check_stop_free() context
- */
-static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd)
-{
-        return target_put_sess_cmd(se_cmd->se_sess, se_cmd);
-}
-
-/* tcm_qla2xxx_release_cmd - Callback from TCM Core to release underlying
- * fabric descriptor @se_cmd command to release
- */
-static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd;
-
-        if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB) {
-                struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd,
-                                struct qla_tgt_mgmt_cmd, se_cmd);
-                qlt_free_mcmd(mcmd);
-                return;
-        }
-
-        cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
-        qlt_free_cmd(cmd);
-}
-
-static int tcm_qla2xxx_shutdown_session(struct se_session *se_sess)
-{
-        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
-        struct scsi_qla_host *vha;
-        unsigned long flags;
-
-        BUG_ON(!sess);
-        vha = sess->vha;
-
-        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
-        target_sess_cmd_list_set_waiting(se_sess);
-        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
-
-        return 1;
-}
-
-static void tcm_qla2xxx_close_session(struct se_session *se_sess)
-{
-        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
-        struct scsi_qla_host *vha;
-        unsigned long flags;
-
-        BUG_ON(!sess);
-        vha = sess->vha;
-
-        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
-        qlt_unreg_sess(sess);
-        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
-}
-
-static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
-{
-        return 0;
-}
-
-/*
- * The LIO target core uses DMA_TO_DEVICE to mean that data is going
- * to the target (eg handling a WRITE) and DMA_FROM_DEVICE to mean
- * that data is coming from the target (eg handling a READ).  However,
- * this is just the opposite of what we have to tell the DMA mapping
- * layer -- eg when handling a READ, the HBA will have to DMA the data
- * out of memory so it can send it to the initiator, which means we
- * need to use DMA_TO_DEVICE when we map the data.
- */
-static enum dma_data_direction tcm_qla2xxx_mapping_dir(struct se_cmd *se_cmd)
-{
-        if (se_cmd->se_cmd_flags & SCF_BIDI)
-                return DMA_BIDIRECTIONAL;
-
-        switch (se_cmd->data_direction) {
-        case DMA_TO_DEVICE:
-                return DMA_FROM_DEVICE;
-        case DMA_FROM_DEVICE:
-                return DMA_TO_DEVICE;
-        case DMA_NONE:
-        default:
-                return DMA_NONE;
-        }
-}
-
-static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd = container_of(se_cmd,
-                                struct qla_tgt_cmd, se_cmd);
-
-        cmd->bufflen = se_cmd->data_length;
-        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
-
-        cmd->sg_cnt = se_cmd->t_data_nents;
-        cmd->sg = se_cmd->t_data_sg;
-
-        /*
-         * qla_target.c:qlt_rdy_to_xfer() will call pci_map_sg() to setup
-         * the SGL mappings into PCIe memory for incoming FCP WRITE data.
-         */
-        return qlt_rdy_to_xfer(cmd);
-}
-
-static int tcm_qla2xxx_write_pending_status(struct se_cmd *se_cmd)
-{
-        unsigned long flags;
-        /*
-         * Check for WRITE_PENDING status to determine if we need to wait for
-         * CTIO aborts to be posted via hardware in tcm_qla2xxx_handle_data().
-         */
-        spin_lock_irqsave(&se_cmd->t_state_lock, flags);
-        if (se_cmd->t_state == TRANSPORT_WRITE_PENDING ||
-            se_cmd->t_state == TRANSPORT_COMPLETE_QF_WP) {
-                spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
-                wait_for_completion_timeout(&se_cmd->t_transport_stop_comp,
-                                                3000);
-                return 0;
-        }
-        spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
-
-        return 0;
-}
-
-static void tcm_qla2xxx_set_default_node_attrs(struct se_node_acl *nacl)
-{
-        return;
-}
-
-static u32 tcm_qla2xxx_get_task_tag(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd = container_of(se_cmd,
-                                struct qla_tgt_cmd, se_cmd);
-
-        return cmd->tag;
-}
-
-static int tcm_qla2xxx_get_cmd_state(struct se_cmd *se_cmd)
-{
-        return 0;
-}
-
-/*
- * Called from process context in qla_target.c:qlt_do_work() code
- */
-static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,
-        unsigned char *cdb, uint32_t data_length, int fcp_task_attr,
-        int data_dir, int bidi)
-{
-        struct se_cmd *se_cmd = &cmd->se_cmd;
-        struct se_session *se_sess;
-        struct qla_tgt_sess *sess;
-        int flags = TARGET_SCF_ACK_KREF;
-
-        if (bidi)
-                flags |= TARGET_SCF_BIDI_OP;
-
-        sess = cmd->sess;
-        if (!sess) {
-                pr_err("Unable to locate struct qla_tgt_sess from qla_tgt_cmd\n");
-                return -EINVAL;
-        }
-
-        se_sess = sess->se_sess;
-        if (!se_sess) {
-                pr_err("Unable to locate active struct se_session\n");
-                return -EINVAL;
-        }
-
-        return target_submit_cmd(se_cmd, se_sess, cdb, &cmd->sense_buffer[0],
-                                cmd->unpacked_lun, data_length, fcp_task_attr,
-                                data_dir, flags);
-}
-
-static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
-{
-        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
-
-        /*
-         * Ensure that the complete FCP WRITE payload has been received.
-         * Otherwise return an exception via CHECK_CONDITION status.
-         */
-        if (!cmd->write_data_transferred) {
-                /*
-                 * Check if se_cmd has already been aborted via LUN_RESET, and
-                 * waiting upon completion in tcm_qla2xxx_write_pending_status()
-                 */
-                if (cmd->se_cmd.transport_state & CMD_T_ABORTED) {
-                        complete(&cmd->se_cmd.t_transport_stop_comp);
-                        return;
-                }
-
-                transport_generic_request_failure(&cmd->se_cmd,
-                                                  TCM_CHECK_CONDITION_ABORT_CMD);
-                return;
-        }
-
-        return target_execute_cmd(&cmd->se_cmd);
-}
-
-/*
- * Called from qla_target.c:qlt_do_ctio_completion()
- */
-static void tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd)
-{
-        INIT_WORK(&cmd->work, tcm_qla2xxx_handle_data_work);
-        queue_work(tcm_qla2xxx_free_wq, &cmd->work);
-}
-
-/*
- * Called from qla_target.c:qlt_issue_task_mgmt()
- */
-static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,
-        uint8_t tmr_func, uint32_t tag)
-{
-        struct qla_tgt_sess *sess = mcmd->sess;
-        struct se_cmd *se_cmd = &mcmd->se_cmd;
-
-        return target_submit_tmr(se_cmd, sess->se_sess, NULL, lun, mcmd,
-                        tmr_func, GFP_ATOMIC, tag, TARGET_SCF_ACK_KREF);
-}
-
-static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd = container_of(se_cmd,
-                                struct qla_tgt_cmd, se_cmd);
-
-        cmd->bufflen = se_cmd->data_length;
-        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
-        cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
-
-        cmd->sg_cnt = se_cmd->t_data_nents;
-        cmd->sg = se_cmd->t_data_sg;
-        cmd->offset = 0;
-
-        /*
-         * Now queue completed DATA_IN the qla2xxx LLD and response ring
-         */
-        return qlt_xmit_response(cmd, QLA_TGT_XMIT_DATA|QLA_TGT_XMIT_STATUS,
-                                se_cmd->scsi_status);
-}
-
-static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd = container_of(se_cmd,
-                                struct qla_tgt_cmd, se_cmd);
-        int xmit_type = QLA_TGT_XMIT_STATUS;
-
-        cmd->bufflen = se_cmd->data_length;
-        cmd->sg = NULL;
-        cmd->sg_cnt = 0;
-        cmd->offset = 0;
-        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
-        cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
-
-        if (se_cmd->data_direction == DMA_FROM_DEVICE) {
-                /*
-                 * For FCP_READ with CHECK_CONDITION status, clear cmd->bufflen
-                 * for qla_tgt_xmit_response LLD code
-                 */
-                se_cmd->se_cmd_flags |= SCF_UNDERFLOW_BIT;
-                se_cmd->residual_count = se_cmd->data_length;
-
-                cmd->bufflen = 0;
-        }
-        /*
-         * Now queue status response to qla2xxx LLD code and response ring
-         */
-        return qlt_xmit_response(cmd, xmit_type, se_cmd->scsi_status);
-}
-
-static int tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd)
-{
-        struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;
-        struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd,
-                                struct qla_tgt_mgmt_cmd, se_cmd);
-
-        pr_debug("queue_tm_rsp: mcmd: %p func: 0x%02x response: 0x%02x\n",
-                        mcmd, se_tmr->function, se_tmr->response);
-        /*
-         * Do translation between TCM TM response codes and
-         * QLA2xxx FC TM response codes.
-         */
-        switch (se_tmr->response) {
-        case TMR_FUNCTION_COMPLETE:
-                mcmd->fc_tm_rsp = FC_TM_SUCCESS;
-                break;
-        case TMR_TASK_DOES_NOT_EXIST:
-                mcmd->fc_tm_rsp = FC_TM_BAD_CMD;
-                break;
-        case TMR_FUNCTION_REJECTED:
-                mcmd->fc_tm_rsp = FC_TM_REJECT;
-                break;
-        case TMR_LUN_DOES_NOT_EXIST:
-        default:
-                mcmd->fc_tm_rsp = FC_TM_FAILED;
-                break;
-        }
-        /*
-         * Queue the TM response to QLA2xxx LLD to build a
-         * CTIO response packet.
-         */
-        qlt_xmit_tm_rsp(mcmd);
-
-        return 0;
-}
-
-/* Local pointer to allocated TCM configfs fabric module */
-struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
-struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
-
-static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,
-                        struct tcm_qla2xxx_nacl *, struct qla_tgt_sess *);
-/*
- * Expected to be called with struct qla_hw_data->hardware_lock held
- */
-static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct qla_tgt_sess *sess)
-{
-        struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
-        struct se_portal_group *se_tpg = se_nacl->se_tpg;
-        struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;
-        struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
-                                struct tcm_qla2xxx_lport, lport_wwn);
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
-                                struct tcm_qla2xxx_nacl, se_node_acl);
-        void *node;
-
-        pr_debug("fc_rport domain: port_id 0x%06x\n", nacl->nport_id);
-
-        node = btree_remove32(&lport->lport_fcport_map, nacl->nport_id);
-        WARN_ON(node && (node != se_nacl));
-
-        pr_debug("Removed from fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%06x\n",
-            se_nacl, nacl->nport_wwnn, nacl->nport_id);
-        /*
-         * Now clear the se_nacl and session pointers from our HW lport lookup
-         * table mapping for this initiator's fabric S_ID and LOOP_ID entries.
-         *
-         * This is done ahead of callbacks into tcm_qla2xxx_free_session() ->
-         * target_wait_for_sess_cmds() before the session waits for outstanding
-         * I/O to complete, to avoid a race between session shutdown execution
-         * and incoming ATIOs or TMRs picking up a stale se_node_act reference.
-         */
-        tcm_qla2xxx_clear_sess_lookup(lport, nacl, sess);
-}
-
-static void tcm_qla2xxx_release_session(struct kref *kref)
-{
-        struct se_session *se_sess = container_of(kref,
-                        struct se_session, sess_kref);
-
-        qlt_unreg_sess(se_sess->fabric_sess_ptr);
-}
-
-static void tcm_qla2xxx_put_session(struct se_session *se_sess)
-{
-        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
-        struct qla_hw_data *ha = sess->vha->hw;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        kref_put(&se_sess->sess_kref, tcm_qla2xxx_release_session);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
-static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
-{
-        tcm_qla2xxx_put_session(sess->se_sess);
-}
-
-static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
-{
-        tcm_qla2xxx_shutdown_session(sess->se_sess);
-}
-
-static struct se_node_acl *tcm_qla2xxx_make_nodeacl(
-        struct se_portal_group *se_tpg,
-        struct config_group *group,
-        const char *name)
-{
-        struct se_node_acl *se_nacl, *se_nacl_new;
-        struct tcm_qla2xxx_nacl *nacl;
-        u64 wwnn;
-        u32 qla2xxx_nexus_depth;
-
-        if (tcm_qla2xxx_parse_wwn(name, &wwnn, 1) < 0)
-                return ERR_PTR(-EINVAL);
-
-        se_nacl_new = tcm_qla2xxx_alloc_fabric_acl(se_tpg);
-        if (!se_nacl_new)
-                return ERR_PTR(-ENOMEM);
-/* #warning FIXME: Hardcoded qla2xxx_nexus depth in tcm_qla2xxx_make_nodeacl */
-        qla2xxx_nexus_depth = 1;
-
-        /*
-         * se_nacl_new may be released by core_tpg_add_initiator_node_acl()
-         * when converting a NodeACL from demo mode -> explict
-         */
-        se_nacl = core_tpg_add_initiator_node_acl(se_tpg, se_nacl_new,
-                                name, qla2xxx_nexus_depth);
-        if (IS_ERR(se_nacl)) {
-                tcm_qla2xxx_release_fabric_acl(se_tpg, se_nacl_new);
-                return se_nacl;
-        }
-        /*
-         * Locate our struct tcm_qla2xxx_nacl and set the FC Nport WWPN
-         */
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
-        nacl->nport_wwnn = wwnn;
-        tcm_qla2xxx_format_wwn(&nacl->nport_name[0], TCM_QLA2XXX_NAMELEN, wwnn);
-
-        return se_nacl;
-}
-
-static void tcm_qla2xxx_drop_nodeacl(struct se_node_acl *se_acl)
-{
-        struct se_portal_group *se_tpg = se_acl->se_tpg;
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_acl,
-                                struct tcm_qla2xxx_nacl, se_node_acl);
-
-        core_tpg_del_initiator_node_acl(se_tpg, se_acl, 1);
-        kfree(nacl);
-}
-
-/* Start items for tcm_qla2xxx_tpg_attrib_cit */
-
-#define DEF_QLA_TPG_ATTRIB(name)                                        \
-                                                                        \
-static ssize_t tcm_qla2xxx_tpg_attrib_show_##name(                      \
-        struct se_portal_group *se_tpg,                                 \
-        char *page)                                                     \
-{                                                                       \
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,              \
-                        struct tcm_qla2xxx_tpg, se_tpg);                \
-                                                                        \
-        return sprintf(page, "%u\n", QLA_TPG_ATTRIB(tpg)->name);        \
-}                                                                       \
-                                                                        \
-static ssize_t tcm_qla2xxx_tpg_attrib_store_##name(                     \
-        struct se_portal_group *se_tpg,                                 \
-        const char *page,                                               \
-        size_t count)                                                   \
-{                                                                       \
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,              \
-                        struct tcm_qla2xxx_tpg, se_tpg);                \
-        unsigned long val;                                              \
-        int ret;                                                        \
-                                                                        \
-        ret = kstrtoul(page, 0, &val);                                  \
-        if (ret < 0) {                                                  \
-                pr_err("kstrtoul() failed with"                         \
-                                " ret: %d\n", ret);                     \
-                return -EINVAL;                                         \
-        }                                                               \
-        ret = tcm_qla2xxx_set_attrib_##name(tpg, val);                  \
-                                                                        \
-        return (!ret) ? count : -EINVAL;                                \
-}
-
-#define DEF_QLA_TPG_ATTR_BOOL(_name)                                    \
-                                                                        \
-static int tcm_qla2xxx_set_attrib_##_name(                              \
-        struct tcm_qla2xxx_tpg *tpg,                                    \
-        unsigned long val)                                              \
-{                                                                       \
-        struct tcm_qla2xxx_tpg_attrib *a = &tpg->tpg_attrib;            \
-                                                                        \
-        if ((val != 0) && (val != 1)) {                                 \
-                pr_err("Illegal boolean value %lu\n", val);             \
-                return -EINVAL;                                         \
-        }                                                               \
-                                                                        \
-        a->_name = val;                                                 \
-        return 0;                                                       \
-}
-
-#define QLA_TPG_ATTR(_name, _mode) \
-        TF_TPG_ATTRIB_ATTR(tcm_qla2xxx, _name, _mode);
-
-/*
- * Define tcm_qla2xxx_tpg_attrib_s_generate_node_acls
- */
-DEF_QLA_TPG_ATTR_BOOL(generate_node_acls);
-DEF_QLA_TPG_ATTRIB(generate_node_acls);
-QLA_TPG_ATTR(generate_node_acls, S_IRUGO | S_IWUSR);
-
-/*
- Define tcm_qla2xxx_attrib_s_cache_dynamic_acls
- */
-DEF_QLA_TPG_ATTR_BOOL(cache_dynamic_acls);
-DEF_QLA_TPG_ATTRIB(cache_dynamic_acls);
-QLA_TPG_ATTR(cache_dynamic_acls, S_IRUGO | S_IWUSR);
-
-/*
- * Define tcm_qla2xxx_tpg_attrib_s_demo_mode_write_protect
- */
-DEF_QLA_TPG_ATTR_BOOL(demo_mode_write_protect);
-DEF_QLA_TPG_ATTRIB(demo_mode_write_protect);
-QLA_TPG_ATTR(demo_mode_write_protect, S_IRUGO | S_IWUSR);
-
-/*
- * Define tcm_qla2xxx_tpg_attrib_s_prod_mode_write_protect
- */
-DEF_QLA_TPG_ATTR_BOOL(prod_mode_write_protect);
-DEF_QLA_TPG_ATTRIB(prod_mode_write_protect);
-QLA_TPG_ATTR(prod_mode_write_protect, S_IRUGO | S_IWUSR);
-
-static struct configfs_attribute *tcm_qla2xxx_tpg_attrib_attrs[] = {
-        &tcm_qla2xxx_tpg_attrib_generate_node_acls.attr,
-        &tcm_qla2xxx_tpg_attrib_cache_dynamic_acls.attr,
-        &tcm_qla2xxx_tpg_attrib_demo_mode_write_protect.attr,
-        &tcm_qla2xxx_tpg_attrib_prod_mode_write_protect.attr,
-        NULL,
-};
-
-/* End items for tcm_qla2xxx_tpg_attrib_cit */
-
-static ssize_t tcm_qla2xxx_tpg_show_enable(
-        struct se_portal_group *se_tpg,
-        char *page)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                        struct tcm_qla2xxx_tpg, se_tpg);
-
-        return snprintf(page, PAGE_SIZE, "%d\n",
-                        atomic_read(&tpg->lport_tpg_enabled));
-}
-
-static ssize_t tcm_qla2xxx_tpg_store_enable(
-        struct se_portal_group *se_tpg,
-        const char *page,
-        size_t count)
-{
-        struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;
-        struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
-                        struct tcm_qla2xxx_lport, lport_wwn);
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                        struct tcm_qla2xxx_tpg, se_tpg);
-        unsigned long op;
-        int rc;
-
-        rc = kstrtoul(page, 0, &op);
-        if (rc < 0) {
-                pr_err("kstrtoul() returned %d\n", rc);
-                return -EINVAL;
-        }
-        if ((op != 1) && (op != 0)) {
-                pr_err("Illegal value for tpg_enable: %lu\n", op);
-                return -EINVAL;
-        }
-
-        if (op) {
-                atomic_set(&tpg->lport_tpg_enabled, 1);
-                qlt_enable_vha(vha);
-        } else {
-                if (!ha->tgt.qla_tgt) {
-                        pr_err("truct qla_hw_data *ha->tgt.qla_tgt is NULL\n");
-                        return -ENODEV;
-                }
-                atomic_set(&tpg->lport_tpg_enabled, 0);
-                qlt_stop_phase1(ha->tgt.qla_tgt);
-        }
-
-        return count;
-}
-
-TF_TPG_BASE_ATTR(tcm_qla2xxx, enable, S_IRUGO | S_IWUSR);
-
-static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = {
-        &tcm_qla2xxx_tpg_enable.attr,
-        NULL,
-};
-
-static struct se_portal_group *tcm_qla2xxx_make_tpg(
-        struct se_wwn *wwn,
-        struct config_group *group,
-        const char *name)
-{
-        struct tcm_qla2xxx_lport *lport = container_of(wwn,
-                        struct tcm_qla2xxx_lport, lport_wwn);
-        struct tcm_qla2xxx_tpg *tpg;
-        unsigned long tpgt;
-        int ret;
-
-        if (strstr(name, "tpgt_") != name)
-                return ERR_PTR(-EINVAL);
-        if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
-                return ERR_PTR(-EINVAL);
-
-        if (!lport->qla_npiv_vp && (tpgt != 1)) {
-                pr_err("In non NPIV mode, a single TPG=1 is used for HW port mappings\n");
-                return ERR_PTR(-ENOSYS);
-        }
-
-        tpg = kzalloc(sizeof(struct tcm_qla2xxx_tpg), GFP_KERNEL);
-        if (!tpg) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
-                return ERR_PTR(-ENOMEM);
-        }
-        tpg->lport = lport;
-        tpg->lport_tpgt = tpgt;
-        /*
-         * By default allow READ-ONLY TPG demo-mode access w/ cached dynamic
-         * NodeACLs
-         */
-        QLA_TPG_ATTRIB(tpg)->generate_node_acls = 1;
-        QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect = 1;
-        QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls = 1;
-
-        ret = core_tpg_register(&tcm_qla2xxx_fabric_configfs->tf_ops, wwn,
-                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
-        if (ret < 0) {
-                kfree(tpg);
-                return NULL;
-        }
-        /*
-         * Setup local TPG=1 pointer for non NPIV mode.
-         */
-        if (lport->qla_npiv_vp == NULL)
-                lport->tpg_1 = tpg;
-
-        return &tpg->se_tpg;
-}
-
-static void tcm_qla2xxx_drop_tpg(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                        struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
-        /*
-         * Call into qla2x_target.c LLD logic to shutdown the active
-         * FC Nexuses and disable target mode operation for this qla_hw_data
-         */
-        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stop)
-                qlt_stop_phase1(ha->tgt.qla_tgt);
-
-        core_tpg_deregister(se_tpg);
-        /*
-         * Clear local TPG=1 pointer for non NPIV mode.
-         */
-        if (lport->qla_npiv_vp == NULL)
-                lport->tpg_1 = NULL;
-
-        kfree(tpg);
-}
-
-static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
-        struct se_wwn *wwn,
-        struct config_group *group,
-        const char *name)
-{
-        struct tcm_qla2xxx_lport *lport = container_of(wwn,
-                        struct tcm_qla2xxx_lport, lport_wwn);
-        struct tcm_qla2xxx_tpg *tpg;
-        unsigned long tpgt;
-        int ret;
-
-        if (strstr(name, "tpgt_") != name)
-                return ERR_PTR(-EINVAL);
-        if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
-                return ERR_PTR(-EINVAL);
-
-        tpg = kzalloc(sizeof(struct tcm_qla2xxx_tpg), GFP_KERNEL);
-        if (!tpg) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
-                return ERR_PTR(-ENOMEM);
-        }
-        tpg->lport = lport;
-        tpg->lport_tpgt = tpgt;
-
-        ret = core_tpg_register(&tcm_qla2xxx_npiv_fabric_configfs->tf_ops, wwn,
-                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
-        if (ret < 0) {
-                kfree(tpg);
-                return NULL;
-        }
-        return &tpg->se_tpg;
-}
-
-/*
- * Expected to be called with struct qla_hw_data->hardware_lock held
- */
-static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_s_id(
-        scsi_qla_host_t *vha,
-        const uint8_t *s_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_lport *lport;
-        struct se_node_acl *se_nacl;
-        struct tcm_qla2xxx_nacl *nacl;
-        u32 key;
-
-        lport = ha->tgt.target_lport_ptr;
-        if (!lport) {
-                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
-                dump_stack();
-                return NULL;
-        }
-
-        key = (((unsigned long)s_id[0] << 16) |
-               ((unsigned long)s_id[1] << 8) |
-               (unsigned long)s_id[2]);
-        pr_debug("find_sess_by_s_id: 0x%06x\n", key);
-
-        se_nacl = btree_lookup32(&lport->lport_fcport_map, key);
-        if (!se_nacl) {
-                pr_debug("Unable to locate s_id: 0x%06x\n", key);
-                return NULL;
-        }
-        pr_debug("find_sess_by_s_id: located se_nacl: %p, initiatorname: %s\n",
-            se_nacl, se_nacl->initiatorname);
-
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
-        if (!nacl->qla_tgt_sess) {
-                pr_err("Unable to locate struct qla_tgt_sess\n");
-                return NULL;
-        }
-
-        return nacl->qla_tgt_sess;
-}
-
-/*
- * Expected to be called with struct qla_hw_data->hardware_lock held
- */
-static void tcm_qla2xxx_set_sess_by_s_id(
-        struct tcm_qla2xxx_lport *lport,
-        struct se_node_acl *new_se_nacl,
-        struct tcm_qla2xxx_nacl *nacl,
-        struct se_session *se_sess,
-        struct qla_tgt_sess *qla_tgt_sess,
-        uint8_t *s_id)
-{
-        u32 key;
-        void *slot;
-        int rc;
-
-        key = (((unsigned long)s_id[0] << 16) |
-               ((unsigned long)s_id[1] << 8) |
-               (unsigned long)s_id[2]);
-        pr_debug("set_sess_by_s_id: %06x\n", key);
-
-        slot = btree_lookup32(&lport->lport_fcport_map, key);
-        if (!slot) {
-                if (new_se_nacl) {
-                        pr_debug("Setting up new fc_port entry to new_se_nacl\n");
-                        nacl->nport_id = key;
-                        rc = btree_insert32(&lport->lport_fcport_map, key,
-                                        new_se_nacl, GFP_ATOMIC);
-                        if (rc)
-                                printk(KERN_ERR "Unable to insert s_id into fcport_map: %06x\n",
-                                    (int)key);
-                } else {
-                        pr_debug("Wiping nonexisting fc_port entry\n");
-                }
-
-                qla_tgt_sess->se_sess = se_sess;
-                nacl->qla_tgt_sess = qla_tgt_sess;
-                return;
-        }
-
-        if (nacl->qla_tgt_sess) {
-                if (new_se_nacl == NULL) {
-                        pr_debug("Clearing existing nacl->qla_tgt_sess and fc_port entry\n");
-                        btree_remove32(&lport->lport_fcport_map, key);
-                        nacl->qla_tgt_sess = NULL;
-                        return;
-                }
-                pr_debug("Replacing existing nacl->qla_tgt_sess and fc_port entry\n");
-                btree_update32(&lport->lport_fcport_map, key, new_se_nacl);
-                qla_tgt_sess->se_sess = se_sess;
-                nacl->qla_tgt_sess = qla_tgt_sess;
-                return;
-        }
-
-        if (new_se_nacl == NULL) {
-                pr_debug("Clearing existing fc_port entry\n");
-                btree_remove32(&lport->lport_fcport_map, key);
-                return;
-        }
-
-        pr_debug("Replacing existing fc_port entry w/o active nacl->qla_tgt_sess\n");
-        btree_update32(&lport->lport_fcport_map, key, new_se_nacl);
-        qla_tgt_sess->se_sess = se_sess;
-        nacl->qla_tgt_sess = qla_tgt_sess;
-
-        pr_debug("Setup nacl->qla_tgt_sess %p by s_id for se_nacl: %p, initiatorname: %s\n",
-            nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);
-}
-
-/*
- * Expected to be called with struct qla_hw_data->hardware_lock held
- */
-static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_loop_id(
-        scsi_qla_host_t *vha,
-        const uint16_t loop_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_lport *lport;
-        struct se_node_acl *se_nacl;
-        struct tcm_qla2xxx_nacl *nacl;
-        struct tcm_qla2xxx_fc_loopid *fc_loopid;
-
-        lport = ha->tgt.target_lport_ptr;
-        if (!lport) {
-                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
-                dump_stack();
-                return NULL;
-        }
-
-        pr_debug("find_sess_by_loop_id: Using loop_id: 0x%04x\n", loop_id);
-
-        fc_loopid = lport->lport_loopid_map + loop_id;
-        se_nacl = fc_loopid->se_nacl;
-        if (!se_nacl) {
-                pr_debug("Unable to locate se_nacl by loop_id: 0x%04x\n",
-                    loop_id);
-                return NULL;
-        }
-
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
-
-        if (!nacl->qla_tgt_sess) {
-                pr_err("Unable to locate struct qla_tgt_sess\n");
-                return NULL;
-        }
-
-        return nacl->qla_tgt_sess;
-}
-
-/*
- * Expected to be called with struct qla_hw_data->hardware_lock held
- */
-static void tcm_qla2xxx_set_sess_by_loop_id(
-        struct tcm_qla2xxx_lport *lport,
-        struct se_node_acl *new_se_nacl,
-        struct tcm_qla2xxx_nacl *nacl,
-        struct se_session *se_sess,
-        struct qla_tgt_sess *qla_tgt_sess,
-        uint16_t loop_id)
-{
-        struct se_node_acl *saved_nacl;
-        struct tcm_qla2xxx_fc_loopid *fc_loopid;
-
-        pr_debug("set_sess_by_loop_id: Using loop_id: 0x%04x\n", loop_id);
-
-        fc_loopid = &((struct tcm_qla2xxx_fc_loopid *)
-                        lport->lport_loopid_map)[loop_id];
-
-        saved_nacl = fc_loopid->se_nacl;
-        if (!saved_nacl) {
-                pr_debug("Setting up new fc_loopid->se_nacl to new_se_nacl\n");
-                fc_loopid->se_nacl = new_se_nacl;
-                if (qla_tgt_sess->se_sess != se_sess)
-                        qla_tgt_sess->se_sess = se_sess;
-                if (nacl->qla_tgt_sess != qla_tgt_sess)
-                        nacl->qla_tgt_sess = qla_tgt_sess;
-                return;
-        }
-
-        if (nacl->qla_tgt_sess) {
-                if (new_se_nacl == NULL) {
-                        pr_debug("Clearing nacl->qla_tgt_sess and fc_loopid->se_nacl\n");
-                        fc_loopid->se_nacl = NULL;
-                        nacl->qla_tgt_sess = NULL;
-                        return;
-                }
-
-                pr_debug("Replacing existing nacl->qla_tgt_sess and fc_loopid->se_nacl\n");
-                fc_loopid->se_nacl = new_se_nacl;
-                if (qla_tgt_sess->se_sess != se_sess)
-                        qla_tgt_sess->se_sess = se_sess;
-                if (nacl->qla_tgt_sess != qla_tgt_sess)
-                        nacl->qla_tgt_sess = qla_tgt_sess;
-                return;
-        }
-
-        if (new_se_nacl == NULL) {
-                pr_debug("Clearing fc_loopid->se_nacl\n");
-                fc_loopid->se_nacl = NULL;
-                return;
-        }
-
-        pr_debug("Replacing existing fc_loopid->se_nacl w/o active nacl->qla_tgt_sess\n");
-        fc_loopid->se_nacl = new_se_nacl;
-        if (qla_tgt_sess->se_sess != se_sess)
-                qla_tgt_sess->se_sess = se_sess;
-        if (nacl->qla_tgt_sess != qla_tgt_sess)
-                nacl->qla_tgt_sess = qla_tgt_sess;
-
-        pr_debug("Setup nacl->qla_tgt_sess %p by loop_id for se_nacl: %p, initiatorname: %s\n",
-            nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);
-}
-
-/*
- * Should always be called with qla_hw_data->hardware_lock held.
- */
-static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport,
-                struct tcm_qla2xxx_nacl *nacl, struct qla_tgt_sess *sess)
-{
-        struct se_session *se_sess = sess->se_sess;
-        unsigned char be_sid[3];
-
-        be_sid[0] = sess->s_id.b.domain;
-        be_sid[1] = sess->s_id.b.area;
-        be_sid[2] = sess->s_id.b.al_pa;
-
-        tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,
-                                sess, be_sid);
-        tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,
-                                sess, sess->loop_id);
-}
-
-static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
-{
-        struct qla_tgt *tgt = sess->tgt;
-        struct qla_hw_data *ha = tgt->ha;
-        struct se_session *se_sess;
-        struct se_node_acl *se_nacl;
-        struct tcm_qla2xxx_lport *lport;
-        struct tcm_qla2xxx_nacl *nacl;
-
-        BUG_ON(in_interrupt());
-
-        se_sess = sess->se_sess;
-        if (!se_sess) {
-                pr_err("struct qla_tgt_sess->se_sess is NULL\n");
-                dump_stack();
-                return;
-        }
-        se_nacl = se_sess->se_node_acl;
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
-
-        lport = ha->tgt.target_lport_ptr;
-        if (!lport) {
-                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
-                dump_stack();
-                return;
-        }
-        target_wait_for_sess_cmds(se_sess, 0);
-
-        transport_deregister_session_configfs(sess->se_sess);
-        transport_deregister_session(sess->se_sess);
-}
-
-/*
- * Called via qlt_create_sess():ha->qla2x_tmpl->check_initiator_node_acl()
- * to locate struct se_node_acl
- */
-static int tcm_qla2xxx_check_initiator_node_acl(
-        scsi_qla_host_t *vha,
-        unsigned char *fc_wwpn,
-        void *qla_tgt_sess,
-        uint8_t *s_id,
-        uint16_t loop_id)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_lport *lport;
-        struct tcm_qla2xxx_tpg *tpg;
-        struct tcm_qla2xxx_nacl *nacl;
-        struct se_portal_group *se_tpg;
-        struct se_node_acl *se_nacl;
-        struct se_session *se_sess;
-        struct qla_tgt_sess *sess = qla_tgt_sess;
-        unsigned char port_name[36];
-        unsigned long flags;
-
-        lport = ha->tgt.target_lport_ptr;
-        if (!lport) {
-                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
-                dump_stack();
-                return -EINVAL;
-        }
-        /*
-         * Locate the TPG=1 reference..
-         */
-        tpg = lport->tpg_1;
-        if (!tpg) {
-                pr_err("Unable to lcoate struct tcm_qla2xxx_lport->tpg_1\n");
-                return -EINVAL;
-        }
-        se_tpg = &tpg->se_tpg;
-
-        se_sess = transport_init_session();
-        if (IS_ERR(se_sess)) {
-                pr_err("Unable to initialize struct se_session\n");
-                return PTR_ERR(se_sess);
-        }
-        /*
-         * Format the FCP Initiator port_name into colon seperated values to
-         * match the format by tcm_qla2xxx explict ConfigFS NodeACLs.
-         */
-        memset(&port_name, 0, 36);
-        snprintf(port_name, 36, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
-                fc_wwpn[0], fc_wwpn[1], fc_wwpn[2], fc_wwpn[3], fc_wwpn[4],
-                fc_wwpn[5], fc_wwpn[6], fc_wwpn[7]);
-        /*
-         * Locate our struct se_node_acl either from an explict NodeACL created
-         * via ConfigFS, or via running in TPG demo mode.
-         */
-        se_sess->se_node_acl = core_tpg_check_initiator_node_acl(se_tpg,
-                                        port_name);
-        if (!se_sess->se_node_acl) {
-                transport_free_session(se_sess);
-                return -EINVAL;
-        }
-        se_nacl = se_sess->se_node_acl;
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
-        /*
-         * And now setup the new se_nacl and session pointers into our HW lport
-         * mappings for fabric S_ID and LOOP_ID.
-         */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        tcm_qla2xxx_set_sess_by_s_id(lport, se_nacl, nacl, se_sess,
-                        qla_tgt_sess, s_id);
-        tcm_qla2xxx_set_sess_by_loop_id(lport, se_nacl, nacl, se_sess,
-                        qla_tgt_sess, loop_id);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        /*
-         * Finally register the new FC Nexus with TCM
-         */
-        __transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
-
-        return 0;
-}
-
-static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
-                                    uint16_t loop_id, bool conf_compl_supported)
-{
-        struct qla_tgt *tgt = sess->tgt;
-        struct qla_hw_data *ha = tgt->ha;
-        struct tcm_qla2xxx_lport *lport = ha->tgt.target_lport_ptr;
-        struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
-                        struct tcm_qla2xxx_nacl, se_node_acl);
-        u32 key;
-
-
-        if (sess->loop_id != loop_id || sess->s_id.b24 != s_id.b24)
-                pr_info("Updating session %p from port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n",
-                        sess,
-                        sess->port_name[0], sess->port_name[1],
-                        sess->port_name[2], sess->port_name[3],
-                        sess->port_name[4], sess->port_name[5],
-                        sess->port_name[6], sess->port_name[7],
-                        sess->loop_id, loop_id,
-                        sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa,
-                        s_id.b.domain, s_id.b.area, s_id.b.al_pa);
-
-        if (sess->loop_id != loop_id) {
-                /*
-                 * Because we can shuffle loop IDs around and we
-                 * update different sessions non-atomically, we might
-                 * have overwritten this session's old loop ID
-                 * already, and we might end up overwriting some other
-                 * session that will be updated later.  So we have to
-                 * be extra careful and we can't warn about those things...
-                 */
-                if (lport->lport_loopid_map[sess->loop_id].se_nacl == se_nacl)
-                        lport->lport_loopid_map[sess->loop_id].se_nacl = NULL;
-
-                lport->lport_loopid_map[loop_id].se_nacl = se_nacl;
-
-                sess->loop_id = loop_id;
-        }
-
-        if (sess->s_id.b24 != s_id.b24) {
-                key = (((u32) sess->s_id.b.domain << 16) |
-                       ((u32) sess->s_id.b.area   <<  8) |
-                       ((u32) sess->s_id.b.al_pa));
-
-                if (btree_lookup32(&lport->lport_fcport_map, key))
-                        WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl,
-                             "Found wrong se_nacl when updating s_id %x:%x:%x\n",
-                             sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
-                else
-                        WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n",
-                             sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
-
-                key = (((u32) s_id.b.domain << 16) |
-                       ((u32) s_id.b.area   <<  8) |
-                       ((u32) s_id.b.al_pa));
-
-                if (btree_lookup32(&lport->lport_fcport_map, key)) {
-                        WARN(1, "Already have lport_fcport_map entry for s_id %x:%x:%x\n",
-                             s_id.b.domain, s_id.b.area, s_id.b.al_pa);
-                        btree_update32(&lport->lport_fcport_map, key, se_nacl);
-                } else {
-                        btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC);
-                }
-
-                sess->s_id = s_id;
-                nacl->nport_id = key;
-        }
-
-        sess->conf_compl_supported = conf_compl_supported;
-}
-
-/*
- * Calls into tcm_qla2xxx used by qla2xxx LLD I/O path.
- */
-static struct qla_tgt_func_tmpl tcm_qla2xxx_template = {
-        .handle_cmd             = tcm_qla2xxx_handle_cmd,
-        .handle_data            = tcm_qla2xxx_handle_data,
-        .handle_tmr             = tcm_qla2xxx_handle_tmr,
-        .free_cmd               = tcm_qla2xxx_free_cmd,
-        .free_mcmd              = tcm_qla2xxx_free_mcmd,
-        .free_session           = tcm_qla2xxx_free_session,
-        .update_sess            = tcm_qla2xxx_update_sess,
-        .check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl,
-        .find_sess_by_s_id      = tcm_qla2xxx_find_sess_by_s_id,
-        .find_sess_by_loop_id   = tcm_qla2xxx_find_sess_by_loop_id,
-        .clear_nacl_from_fcport_map = tcm_qla2xxx_clear_nacl_from_fcport_map,
-        .put_sess               = tcm_qla2xxx_put_sess,
-        .shutdown_sess          = tcm_qla2xxx_shutdown_sess,
-};
-
-static int tcm_qla2xxx_init_lport(struct tcm_qla2xxx_lport *lport)
-{
-        int rc;
-
-        rc = btree_init32(&lport->lport_fcport_map);
-        if (rc) {
-                pr_err("Unable to initialize lport->lport_fcport_map btree\n");
-                return rc;
-        }
-
-        lport->lport_loopid_map = vmalloc(sizeof(struct tcm_qla2xxx_fc_loopid) *
-                                65536);
-        if (!lport->lport_loopid_map) {
-                pr_err("Unable to allocate lport->lport_loopid_map of %zu bytes\n",
-                    sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
-                btree_destroy32(&lport->lport_fcport_map);
-                return -ENOMEM;
-        }
-        memset(lport->lport_loopid_map, 0, sizeof(struct tcm_qla2xxx_fc_loopid)
-               * 65536);
-        pr_debug("qla2xxx: Allocated lport_loopid_map of %zu bytes\n",
-               sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
-        return 0;
-}
-
-static int tcm_qla2xxx_lport_register_cb(struct scsi_qla_host *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_lport *lport;
-        /*
-         * Setup local pointer to vha, NPIV VP pointer (if present) and
-         * vha->tcm_lport pointer
-         */
-        lport = (struct tcm_qla2xxx_lport *)ha->tgt.target_lport_ptr;
-        lport->qla_vha = vha;
-
-        return 0;
-}
-
-static struct se_wwn *tcm_qla2xxx_make_lport(
-        struct target_fabric_configfs *tf,
-        struct config_group *group,
-        const char *name)
-{
-        struct tcm_qla2xxx_lport *lport;
-        u64 wwpn;
-        int ret = -ENODEV;
-
-        if (tcm_qla2xxx_parse_wwn(name, &wwpn, 1) < 0)
-                return ERR_PTR(-EINVAL);
-
-        lport = kzalloc(sizeof(struct tcm_qla2xxx_lport), GFP_KERNEL);
-        if (!lport) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_lport\n");
-                return ERR_PTR(-ENOMEM);
-        }
-        lport->lport_wwpn = wwpn;
-        tcm_qla2xxx_format_wwn(&lport->lport_name[0], TCM_QLA2XXX_NAMELEN,
-                                wwpn);
-        sprintf(lport->lport_naa_name, "naa.%016llx", (unsigned long long) wwpn);
-
-        ret = tcm_qla2xxx_init_lport(lport);
-        if (ret != 0)
-                goto out;
-
-        ret = qlt_lport_register(&tcm_qla2xxx_template, wwpn,
-                                tcm_qla2xxx_lport_register_cb, lport);
-        if (ret != 0)
-                goto out_lport;
-
-        return &lport->lport_wwn;
-out_lport:
-        vfree(lport->lport_loopid_map);
-        btree_destroy32(&lport->lport_fcport_map);
-out:
-        kfree(lport);
-        return ERR_PTR(ret);
-}
-
-static void tcm_qla2xxx_drop_lport(struct se_wwn *wwn)
-{
-        struct tcm_qla2xxx_lport *lport = container_of(wwn,
-                        struct tcm_qla2xxx_lport, lport_wwn);
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct se_node_acl *node;
-        u32 key = 0;
-
-        /*
-         * Call into qla2x_target.c LLD logic to complete the
-         * shutdown of struct qla_tgt after the call to
-         * qlt_stop_phase1() from tcm_qla2xxx_drop_tpg() above..
-         */
-        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stopped)
-                qlt_stop_phase2(ha->tgt.qla_tgt);
-
-        qlt_lport_deregister(vha);
-
-        vfree(lport->lport_loopid_map);
-        btree_for_each_safe32(&lport->lport_fcport_map, key, node)
-                btree_remove32(&lport->lport_fcport_map, key);
-        btree_destroy32(&lport->lport_fcport_map);
-        kfree(lport);
-}
-
-static struct se_wwn *tcm_qla2xxx_npiv_make_lport(
-        struct target_fabric_configfs *tf,
-        struct config_group *group,
-        const char *name)
-{
-        struct tcm_qla2xxx_lport *lport;
-        u64 npiv_wwpn, npiv_wwnn;
-        int ret;
-
-        if (tcm_qla2xxx_npiv_parse_wwn(name, strlen(name)+1,
-                                &npiv_wwpn, &npiv_wwnn) < 0)
-                return ERR_PTR(-EINVAL);
-
-        lport = kzalloc(sizeof(struct tcm_qla2xxx_lport), GFP_KERNEL);
-        if (!lport) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_lport for NPIV\n");
-                return ERR_PTR(-ENOMEM);
-        }
-        lport->lport_npiv_wwpn = npiv_wwpn;
-        lport->lport_npiv_wwnn = npiv_wwnn;
-        tcm_qla2xxx_npiv_format_wwn(&lport->lport_npiv_name[0],
-                        TCM_QLA2XXX_NAMELEN, npiv_wwpn, npiv_wwnn);
-        sprintf(lport->lport_naa_name, "naa.%016llx", (unsigned long long) npiv_wwpn);
-
-/* FIXME: tcm_qla2xxx_npiv_make_lport */
-        ret = -ENOSYS;
-        if (ret != 0)
-                goto out;
-
-        return &lport->lport_wwn;
-out:
-        kfree(lport);
-        return ERR_PTR(ret);
-}
-
-static void tcm_qla2xxx_npiv_drop_lport(struct se_wwn *wwn)
-{
-        struct tcm_qla2xxx_lport *lport = container_of(wwn,
-                        struct tcm_qla2xxx_lport, lport_wwn);
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct Scsi_Host *sh = vha->host;
-        /*
-         * Notify libfc that we want to release the lport->npiv_vport
-         */
-        fc_vport_terminate(lport->npiv_vport);
-
-        scsi_host_put(sh);
-        kfree(lport);
-}
-
-
-static ssize_t tcm_qla2xxx_wwn_show_attr_version(
-        struct target_fabric_configfs *tf,
-        char *page)
-{
-        return sprintf(page,
-            "TCM QLOGIC QLA2XXX NPIV capable fabric module %s on %s/%s on "
-            UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
-            utsname()->machine);
-}
-
-TF_WWN_ATTR_RO(tcm_qla2xxx, version);
-
-static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = {
-        &tcm_qla2xxx_wwn_version.attr,
-        NULL,
-};
-
-static struct target_core_fabric_ops tcm_qla2xxx_ops = {
-        .get_fabric_name                = tcm_qla2xxx_get_fabric_name,
-        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
-        .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
-        .tpg_get_tag                    = tcm_qla2xxx_get_tag,
-        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
-        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
-        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
-        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
-        .tpg_check_demo_mode            = tcm_qla2xxx_check_demo_mode,
-        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_demo_mode_cache,
-        .tpg_check_demo_mode_write_protect =
-                                        tcm_qla2xxx_check_demo_write_protect,
-        .tpg_check_prod_mode_write_protect =
-                                        tcm_qla2xxx_check_prod_write_protect,
-        .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_true,
-        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
-        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
-        .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
-        .check_stop_free                = tcm_qla2xxx_check_stop_free,
-        .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .put_session                    = tcm_qla2xxx_put_session,
-        .shutdown_session               = tcm_qla2xxx_shutdown_session,
-        .close_session                  = tcm_qla2xxx_close_session,
-        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
-        .sess_get_initiator_sid         = NULL,
-        .write_pending                  = tcm_qla2xxx_write_pending,
-        .write_pending_status           = tcm_qla2xxx_write_pending_status,
-        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
-        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
-        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
-        .queue_data_in                  = tcm_qla2xxx_queue_data_in,
-        .queue_status                   = tcm_qla2xxx_queue_status,
-        .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
-        /*
-         * Setup function pointers for generic logic in
-         * target_core_fabric_configfs.c
-         */
-        .fabric_make_wwn                = tcm_qla2xxx_make_lport,
-        .fabric_drop_wwn                = tcm_qla2xxx_drop_lport,
-        .fabric_make_tpg                = tcm_qla2xxx_make_tpg,
-        .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
-        .fabric_post_link               = NULL,
-        .fabric_pre_unlink              = NULL,
-        .fabric_make_np                 = NULL,
-        .fabric_drop_np                 = NULL,
-        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
-        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
-};
-
-static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
-        .get_fabric_name                = tcm_qla2xxx_npiv_get_fabric_name,
-        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
-        .tpg_get_wwn                    = tcm_qla2xxx_npiv_get_fabric_wwn,
-        .tpg_get_tag                    = tcm_qla2xxx_get_tag,
-        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
-        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
-        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
-        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
-        .tpg_check_demo_mode            = tcm_qla2xxx_check_false,
-        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_true,
-        .tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_true,
-        .tpg_check_prod_mode_write_protect = tcm_qla2xxx_check_false,
-        .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_true,
-        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
-        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
-        .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
-        .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .put_session                    = tcm_qla2xxx_put_session,
-        .shutdown_session               = tcm_qla2xxx_shutdown_session,
-        .close_session                  = tcm_qla2xxx_close_session,
-        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
-        .sess_get_initiator_sid         = NULL,
-        .write_pending                  = tcm_qla2xxx_write_pending,
-        .write_pending_status           = tcm_qla2xxx_write_pending_status,
-        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
-        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
-        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
-        .queue_data_in                  = tcm_qla2xxx_queue_data_in,
-        .queue_status                   = tcm_qla2xxx_queue_status,
-        .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
-        /*
-         * Setup function pointers for generic logic in
-         * target_core_fabric_configfs.c
-         */
-        .fabric_make_wwn                = tcm_qla2xxx_npiv_make_lport,
-        .fabric_drop_wwn                = tcm_qla2xxx_npiv_drop_lport,
-        .fabric_make_tpg                = tcm_qla2xxx_npiv_make_tpg,
-        .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
-        .fabric_post_link               = NULL,
-        .fabric_pre_unlink              = NULL,
-        .fabric_make_np                 = NULL,
-        .fabric_drop_np                 = NULL,
-        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
-        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
-};
-
-static int tcm_qla2xxx_register_configfs(void)
-{
-        struct target_fabric_configfs *fabric, *npiv_fabric;
-        int ret;
-
-        pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on "
-            UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
-            utsname()->machine);
-        /*
-         * Register the top level struct config_item_type with TCM core
-         */
-        fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx");
-        if (IS_ERR(fabric)) {
-                pr_err("target_fabric_configfs_init() failed\n");
-                return PTR_ERR(fabric);
-        }
-        /*
-         * Setup fabric->tf_ops from our local tcm_qla2xxx_ops
-         */
-        fabric->tf_ops = tcm_qla2xxx_ops;
-        /*
-         * Setup default attribute lists for various fabric->tf_cit_tmpl
-         */
-        TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
-        TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;
-        TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs =
-                                                tcm_qla2xxx_tpg_attrib_attrs;
-        TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-        /*
-         * Register the fabric for use within TCM
-         */
-        ret = target_fabric_configfs_register(fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
-                return ret;
-        }
-        /*
-         * Setup our local pointer to *fabric
-         */
-        tcm_qla2xxx_fabric_configfs = fabric;
-        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_fabric_configfs\n");
-
-        /*
-         * Register the top level struct config_item_type for NPIV with TCM core
-         */
-        npiv_fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx_npiv");
-        if (IS_ERR(npiv_fabric)) {
-                pr_err("target_fabric_configfs_init() failed\n");
-                ret = PTR_ERR(npiv_fabric);
-                goto out_fabric;
-        }
-        /*
-         * Setup fabric->tf_ops from our local tcm_qla2xxx_npiv_ops
-         */
-        npiv_fabric->tf_ops = tcm_qla2xxx_npiv_ops;
-        /*
-         * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
-         */
-        TF_CIT_TMPL(npiv_fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_base_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_param_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-        /*
-         * Register the npiv_fabric for use within TCM
-         */
-        ret = target_fabric_configfs_register(npiv_fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
-                goto out_fabric;
-        }
-        /*
-         * Setup our local pointer to *npiv_fabric
-         */
-        tcm_qla2xxx_npiv_fabric_configfs = npiv_fabric;
-        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_npiv_fabric_configfs\n");
-
-        tcm_qla2xxx_free_wq = alloc_workqueue("tcm_qla2xxx_free",
-                                                WQ_MEM_RECLAIM, 0);
-        if (!tcm_qla2xxx_free_wq) {
-                ret = -ENOMEM;
-                goto out_fabric_npiv;
-        }
-
-        tcm_qla2xxx_cmd_wq = alloc_workqueue("tcm_qla2xxx_cmd", 0, 0);
-        if (!tcm_qla2xxx_cmd_wq) {
-                ret = -ENOMEM;
-                goto out_free_wq;
-        }
-
-        return 0;
-
-out_free_wq:
-        destroy_workqueue(tcm_qla2xxx_free_wq);
-out_fabric_npiv:
-        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
-out_fabric:
-        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
-        return ret;
-}
-
-static void tcm_qla2xxx_deregister_configfs(void)
-{
-        destroy_workqueue(tcm_qla2xxx_cmd_wq);
-        destroy_workqueue(tcm_qla2xxx_free_wq);
-
-        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
-        tcm_qla2xxx_fabric_configfs = NULL;
-        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_fabric_configfs\n");
-
-        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
-        tcm_qla2xxx_npiv_fabric_configfs = NULL;
-        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_npiv_fabric_configfs\n");
-}
-
-static int __init tcm_qla2xxx_init(void)
-{
-        int ret;
-
-        ret = tcm_qla2xxx_register_configfs();
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-static void __exit tcm_qla2xxx_exit(void)
-{
-        tcm_qla2xxx_deregister_configfs();
-}
-
-MODULE_DESCRIPTION("TCM QLA2XXX series NPIV enabled fabric driver");
-MODULE_LICENSE("GPL");
-module_init(tcm_qla2xxx_init);
-module_exit(tcm_qla2xxx_exit);
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
deleted file mode 100644
index 9ba075fe978..00000000000
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <target/target_core_base.h>
-#include <linux/btree.h>
-
-#define TCM_QLA2XXX_VERSION     "v0.1"
-/* length of ASCII WWPNs including pad */
-#define TCM_QLA2XXX_NAMELEN     32
-/* lenth of ASCII NPIV 'WWPN+WWNN' including pad */
-#define TCM_QLA2XXX_NPIV_NAMELEN 66
-
-#include "qla_target.h"
-
-struct tcm_qla2xxx_nacl {
-        /* From libfc struct fc_rport->port_id */
-        u32 nport_id;
-        /* Binary World Wide unique Node Name for remote FC Initiator Nport */
-        u64 nport_wwnn;
-        /* ASCII formatted WWPN for FC Initiator Nport */
-        char nport_name[TCM_QLA2XXX_NAMELEN];
-        /* Pointer to qla_tgt_sess */
-        struct qla_tgt_sess *qla_tgt_sess;
-        /* Pointer to TCM FC nexus */
-        struct se_session *nport_nexus;
-        /* Returned by tcm_qla2xxx_make_nodeacl() */
-        struct se_node_acl se_node_acl;
-};
-
-struct tcm_qla2xxx_tpg_attrib {
-        int generate_node_acls;
-        int cache_dynamic_acls;
-        int demo_mode_write_protect;
-        int prod_mode_write_protect;
-};
-
-struct tcm_qla2xxx_tpg {
-        /* FC lport target portal group tag for TCM */
-        u16 lport_tpgt;
-        /* Atomic bit to determine TPG active status */
-        atomic_t lport_tpg_enabled;
-        /* Pointer back to tcm_qla2xxx_lport */
-        struct tcm_qla2xxx_lport *lport;
-        /* Used by tcm_qla2xxx_tpg_attrib_cit */
-        struct tcm_qla2xxx_tpg_attrib tpg_attrib;
-        /* Returned by tcm_qla2xxx_make_tpg() */
-        struct se_portal_group se_tpg;
-};
-
-#define QLA_TPG_ATTRIB(tpg)     (&(tpg)->tpg_attrib)
-
-struct tcm_qla2xxx_fc_loopid {
-        struct se_node_acl *se_nacl;
-};
-
-struct tcm_qla2xxx_lport {
-        /* SCSI protocol the lport is providing */
-        u8 lport_proto_id;
-        /* Binary World Wide unique Port Name for FC Target Lport */
-        u64 lport_wwpn;
-        /* Binary World Wide unique Port Name for FC NPIV Target Lport */
-        u64 lport_npiv_wwpn;
-        /* Binary World Wide unique Node Name for FC NPIV Target Lport */
-        u64 lport_npiv_wwnn;
-        /* ASCII formatted WWPN for FC Target Lport */
-        char lport_name[TCM_QLA2XXX_NAMELEN];
-        /* ASCII formatted naa WWPN for VPD page 83 etc */
-        char lport_naa_name[TCM_QLA2XXX_NAMELEN];
-        /* ASCII formatted WWPN+WWNN for NPIV FC Target Lport */
-        char lport_npiv_name[TCM_QLA2XXX_NPIV_NAMELEN];
-        /* map for fc_port pointers in 24-bit FC Port ID space */
-        struct btree_head32 lport_fcport_map;
-        /* vmalloc-ed memory for fc_port pointers for 16-bit FC loop ID */
-        struct tcm_qla2xxx_fc_loopid *lport_loopid_map;
-        /* Pointer to struct scsi_qla_host from qla2xxx LLD */
-        struct scsi_qla_host *qla_vha;
-        /* Pointer to struct scsi_qla_host for NPIV VP from qla2xxx LLD */
-        struct scsi_qla_host *qla_npiv_vp;
-        /* Pointer to struct qla_tgt pointer */
-        struct qla_tgt lport_qla_tgt;
-        /* Pointer to struct fc_vport for NPIV vport from libfc */
-        struct fc_vport *npiv_vport;
-        /* Pointer to TPG=1 for non NPIV mode */
-        struct tcm_qla2xxx_tpg *tpg_1;
-        /* Returned by tcm_qla2xxx_make_lport() */
-        struct se_wwn lport_wwn;
-};