Merge branch 'master' into for-2.6.35
[safe/jmp/linux-2.6] / drivers / scsi / qla2xxx / qla_attr.c
index 2bd017f..1c7ef55 100644 (file)
@@ -8,10 +8,13 @@
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 
 static int qla24xx_vport_disable(struct fc_vport *, bool);
-
+static int qla84xx_reset(scsi_qla_host_t *, struct msg_echo_lb *, struct fc_bsg_job *);
+int qla84xx_reset_chip(scsi_qla_host_t *, uint16_t, uint16_t *);
+static int qla84xx_mgmt_cmd(scsi_qla_host_t *, struct msg_echo_lb *, struct fc_bsg_job *);
 /* SYSFS attributes --------------------------------------------------------- */
 
 static ssize_t
@@ -232,6 +235,9 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
        if (off)
                return 0;
 
+       if (unlikely(pci_channel_offline(ha->pdev)))
+               return 0;
+
        if (sscanf(buf, "%d:%x:%x", &val, &start, &size) < 1)
                return -EINVAL;
        if (start > ha->optrom_size)
@@ -379,6 +385,9 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,
            struct device, kobj)));
        struct qla_hw_data *ha = vha->hw;
 
+       if (unlikely(pci_channel_offline(ha->pdev)))
+               return 0;
+
        if (!capable(CAP_SYS_ADMIN))
                return 0;
 
@@ -398,6 +407,9 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj,
        struct qla_hw_data *ha = vha->hw;
        uint8_t *tmp_data;
 
+       if (unlikely(pci_channel_offline(ha->pdev)))
+               return 0;
+
        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->vpd_size ||
            !ha->isp_ops->write_nvram)
                return 0;
@@ -1159,6 +1171,28 @@ qla2x00_total_isp_aborts_show(struct device *dev,
 }
 
 static ssize_t
+qla24xx_84xx_fw_version_show(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+       int rval = QLA_SUCCESS;
+       uint16_t status[2] = {0, 0};
+       scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+       struct qla_hw_data *ha = vha->hw;
+
+       if (IS_QLA84XX(ha) && ha->cs84xx) {
+               if (ha->cs84xx->op_fw_version == 0) {
+                       rval = qla84xx_verify_chip(vha, status);
+       }
+
+       if ((rval == QLA_SUCCESS) && (status[0] == 0))
+               return snprintf(buf, PAGE_SIZE, "%u\n",
+                       (uint32_t)ha->cs84xx->op_fw_version);
+       }
+
+       return snprintf(buf, PAGE_SIZE, "\n");
+}
+
+static ssize_t
 qla2x00_mpi_version_show(struct device *dev, struct device_attribute *attr,
     char *buf)
 {
@@ -1233,6 +1267,27 @@ qla2x00_fabric_param_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%d\n", vha->hw->switch_cap);
 }
 
+static ssize_t
+qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
+    char *buf)
+{
+       scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+       int rval = QLA_FUNCTION_FAILED;
+       uint16_t state[5];
+
+       if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
+               test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
+               DEBUG2_3_11(printk("%s(%ld): isp reset in progress.\n",
+                       __func__, vha->host_no));
+       else if (!vha->hw->flags.eeh_busy)
+               rval = qla2x00_get_firmware_state(vha, state);
+       if (rval != QLA_SUCCESS)
+               memset(state, -1, sizeof(state));
+
+       return snprintf(buf, PAGE_SIZE, "0x%x 0x%x 0x%x 0x%x 0x%x\n", state[0],
+           state[1], state[2], state[3], state[4]);
+}
+
 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);
@@ -1255,6 +1310,8 @@ static DEVICE_ATTR(optrom_fcode_version, S_IRUGO,
                   qla2x00_optrom_fcode_version_show, NULL);
 static DEVICE_ATTR(optrom_fw_version, S_IRUGO, qla2x00_optrom_fw_version_show,
                   NULL);
+static DEVICE_ATTR(84xx_fw_version, S_IRUGO, qla24xx_84xx_fw_version_show,
+                  NULL);
 static DEVICE_ATTR(total_isp_aborts, S_IRUGO, qla2x00_total_isp_aborts_show,
                   NULL);
 static DEVICE_ATTR(mpi_version, S_IRUGO, qla2x00_mpi_version_show, NULL);
@@ -1265,6 +1322,7 @@ static DEVICE_ATTR(vlan_id, S_IRUGO, qla2x00_vlan_id_show, NULL);
 static DEVICE_ATTR(vn_port_mac_address, S_IRUGO,
                   qla2x00_vn_port_mac_address_show, NULL);
 static DEVICE_ATTR(fabric_param, S_IRUGO, qla2x00_fabric_param_show, NULL);
+static DEVICE_ATTR(fw_state, S_IRUGO, qla2x00_fw_state_show, NULL);
 
 struct device_attribute *qla2x00_host_attrs[] = {
        &dev_attr_driver_version,
@@ -1283,6 +1341,7 @@ struct device_attribute *qla2x00_host_attrs[] = {
        &dev_attr_optrom_efi_version,
        &dev_attr_optrom_fcode_version,
        &dev_attr_optrom_fw_version,
+       &dev_attr_84xx_fw_version,
        &dev_attr_total_isp_aborts,
        &dev_attr_mpi_version,
        &dev_attr_phy_version,
@@ -1290,6 +1349,7 @@ struct device_attribute *qla2x00_host_attrs[] = {
        &dev_attr_vlan_id,
        &dev_attr_vn_port_mac_address,
        &dev_attr_fabric_param,
+       &dev_attr_fw_state,
        NULL,
 };
 
@@ -1434,10 +1494,13 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
        if (!fcport)
                return;
 
-       if (unlikely(pci_channel_offline(fcport->vha->hw->pdev)))
+       if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
+               return;
+
+       if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
                qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
-       else
-               qla2x00_abort_fcport_cmds(fcport);
+               return;
+       }
 
        /*
         * Transport has effectively 'deleted' the rport, clear
@@ -1457,6 +1520,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
        if (!fcport)
                return;
 
+       if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
+               return;
+
        if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
                qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
                return;
@@ -1465,12 +1531,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 (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);
-
-       qla2x00_abort_fcport_cmds(fcport);
 }
 
 static int
@@ -1496,6 +1561,12 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
        pfc_host_stat = &ha->fc_host_stat;
        memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
 
+       if (test_bit(UNLOADING, &vha->dpc_flags))
+               goto done;
+
+       if (unlikely(pci_channel_offline(ha->pdev)))
+               goto done;
+
        stats = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &stats_dma);
        if (stats == NULL) {
                DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n",
@@ -1595,6 +1666,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
        struct qla_hw_data *ha = base_vha->hw;
        uint16_t options = 0;
        int     cnt;
+       struct req_que *req = ha->req_q_map[0];
 
        ret = qla24xx_vport_create_req_sanity_check(fc_vport);
        if (ret) {
@@ -1634,7 +1706,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                        fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN);
        }
 
-       if (scsi_add_host(vha->host, &fc_vport->dev)) {
+       if (scsi_add_host_with_dma(vha->host, &fc_vport->dev,
+                                  &ha->pdev->dev)) {
                DEBUG15(printk("scsi(%ld): scsi_add_host failure for VP[%d].\n",
                        vha->host_no, vha->vp_idx));
                goto vport_create_failed_2;
@@ -1650,14 +1723,16 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
        qla24xx_vport_disable(fc_vport, disable);
 
-       ret = 0;
-       if (ql2xmaxqueues == 1 || ql2xmultique_tag || !ha->npiv_info)
+       if (ha->flags.cpu_affinity_enabled) {
+               req = ha->req_q_map[1];
+               goto vport_queue;
+       } else if (ql2xmaxqueues == 1 || !ha->npiv_info)
                goto vport_queue;
        /* Create a request queue in QoS mode for the vport */
        for (cnt = 0; cnt < ha->nvram_npiv_size; cnt++) {
                if (memcmp(ha->npiv_info[cnt].port_name, vha->port_name, 8) == 0
                        && memcmp(ha->npiv_info[cnt].node_name, vha->node_name,
-                       8) == 0) {
+                                       8) == 0) {
                        qos = ha->npiv_info[cnt].q_qos;
                        break;
                }
@@ -1669,14 +1744,16 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                        qla_printk(KERN_WARNING, ha,
                        "Can't create request queue for vp_idx:%d\n",
                        vha->vp_idx);
-               else
+               else {
                        DEBUG2(qla_printk(KERN_INFO, ha,
                        "Request Que:%d (QoS: %d) created for vp_idx:%d\n",
                        ret, qos, vha->vp_idx));
+                       req = ha->req_q_map[ret];
+               }
        }
 
 vport_queue:
-       vha->req = ha->req_q_map[ret];
+       vha->req = req;
        return 0;
 
 vport_create_failed_2:
@@ -1712,6 +1789,11 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 
        qla24xx_deallocate_vp_id(vha);
 
+       mutex_lock(&ha->vport_lock);
+       ha->cur_vport_count--;
+       clear_bit(vha->vp_idx, ha->vp_idx_map);
+       mutex_unlock(&ha->vport_lock);
+
        if (vha->timer_active) {
                qla2x00_vp_stop_timer(vha);
                DEBUG15(printk ("scsi(%ld): timer for the vport[%d] = %p "
@@ -1719,7 +1801,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
                    vha->host_no, vha->vp_idx, vha));
         }
 
-       if (vha->req->id && !ql2xmultique_tag) {
+       if (vha->req->id && !ha->flags.cpu_affinity_enabled) {
                if (qla25xx_delete_req_que(vha, vha->req) != QLA_SUCCESS)
                        qla_printk(KERN_WARNING, ha,
                                "Queue delete failed.\n");
@@ -1743,6 +1825,582 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
        return 0;
 }
 
+/* BSG support for ELS/CT pass through */
+inline srb_t *
+qla2x00_get_ctx_bsg_sp(scsi_qla_host_t *vha, fc_port_t *fcport, size_t size)
+{
+       srb_t *sp;
+       struct qla_hw_data *ha = vha->hw;
+       struct srb_bsg_ctx *ctx;
+
+       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);
+               goto done;
+       }
+
+       memset(sp, 0, sizeof(*sp));
+       sp->fcport = fcport;
+       sp->ctx = ctx;
+done:
+       return sp;
+}
+
+static int
+qla2x00_process_els(struct fc_bsg_job *bsg_job)
+{
+       struct fc_rport *rport;
+       fc_port_t *fcport;
+       struct Scsi_Host *host;
+       scsi_qla_host_t *vha;
+       struct qla_hw_data *ha;
+       srb_t *sp;
+       const char *type;
+       int req_sg_cnt, rsp_sg_cnt;
+       int rval =  (DRIVER_ERROR << 16);
+       uint16_t nextlid = 0;
+       struct srb_bsg *els;
+
+       /*  Multiple SG's are not supported for ELS requests */
+        if (bsg_job->request_payload.sg_cnt > 1 ||
+               bsg_job->reply_payload.sg_cnt > 1) {
+               DEBUG2(printk(KERN_INFO
+                   "multiple SG's are not supported for ELS requests"
+                   " [request_sg_cnt: %x reply_sg_cnt: %x]\n",
+                   bsg_job->request_payload.sg_cnt,
+                   bsg_job->reply_payload.sg_cnt));
+               rval = -EPERM;
+               goto done;
+        }
+
+       /* ELS request for rport */
+       if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
+               rport = bsg_job->rport;
+               fcport = *(fc_port_t **) rport->dd_data;
+               host = rport_to_shost(rport);
+               vha = shost_priv(host);
+               ha = vha->hw;
+               type = "FC_BSG_RPT_ELS";
+
+               /* make sure the rport is logged in,
+                * if not perform fabric login
+                */
+               if (qla2x00_fabric_login(vha, fcport, &nextlid)) {
+                       DEBUG2(qla_printk(KERN_WARNING, ha,
+                           "failed to login port %06X for ELS passthru\n",
+                           fcport->d_id.b24));
+                       rval = -EIO;
+                       goto done;
+               }
+       } else {
+               host = bsg_job->shost;
+               vha = shost_priv(host);
+               ha = vha->hw;
+               type = "FC_BSG_HST_ELS_NOLOGIN";
+
+               /* Allocate a dummy fcport structure, since functions
+                * preparing the IOCB and mailbox command retrieves port
+                * specific information from fcport structure. For Host based
+                * ELS commands there will be no fcport structure allocated
+                */
+               fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
+               if (!fcport) {
+                       rval = -ENOMEM;
+                       goto done;
+               }
+
+               /* 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 =
+                   bsg_job->request->rqst_data.h_els.port_id[1];
+               fcport->d_id.b.domain =
+                   bsg_job->request->rqst_data.h_els.port_id[2];
+               fcport->loop_id =
+                   (fcport->d_id.b.al_pa == 0xFD) ?
+                   NPH_FABRIC_CONTROLLER : NPH_F_PORT;
+       }
+
+       if (!vha->flags.online) {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                   "host not online\n"));
+               rval = -EIO;
+               goto done;
+       }
+
+        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 = -ENOMEM;
+               goto done_free_fcport;
+       }
+        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 = -ENOMEM;
+                goto done_free_fcport;
+       }
+
+       if ((req_sg_cnt !=  bsg_job->request_payload.sg_cnt) ||
+           (rsp_sg_cnt != bsg_job->reply_payload.sg_cnt))
+       {
+               DEBUG2(printk(KERN_INFO
+                   "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 = -EAGAIN;
+                goto done_unmap_sg;
+       }
+
+       /* Alloc SRB structure */
+       sp = qla2x00_get_ctx_bsg_sp(vha, fcport, sizeof(struct srb_bsg));
+       if (!sp) {
+               rval = -ENOMEM;
+                goto done_unmap_sg;
+       }
+
+       els = sp->ctx;
+       els->ctx.type =
+           (bsg_job->request->msgcode == FC_BSG_RPT_ELS ?
+           SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST);
+       els->bsg_job = bsg_job;
+
+       DEBUG2(qla_printk(KERN_INFO, ha,
+           "scsi(%ld:%x): bsg rqst type: %s els type: %x - loop-id=%x "
+           "portid=%02x%02x%02x.\n", vha->host_no, sp->handle, type,
+           bsg_job->request->rqst_data.h_els.command_code,
+           fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+           fcport->d_id.b.al_pa));
+
+       rval = qla2x00_start_sp(sp);
+       if (rval != QLA_SUCCESS) {
+               kfree(sp->ctx);
+               mempool_free(sp, ha->srb_mempool);
+               rval = -EIO;
+               goto done_unmap_sg;
+       }
+       return rval;
+
+done_unmap_sg:
+       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);
+       goto done_free_fcport;
+
+done_free_fcport:
+       if (bsg_job->request->msgcode == FC_BSG_HST_ELS_NOLOGIN)
+               kfree(fcport);
+done:
+       return rval;
+}
+
+static int
+qla2x00_process_ct(struct fc_bsg_job *bsg_job)
+{
+       srb_t *sp;
+       struct Scsi_Host *host = bsg_job->shost;
+       scsi_qla_host_t *vha = shost_priv(host);
+       struct qla_hw_data *ha = vha->hw;
+       int rval = (DRIVER_ERROR << 16);
+       int req_sg_cnt, rsp_sg_cnt;
+       uint16_t loop_id;
+       struct fc_port *fcport;
+       char  *type = "FC_BSG_HST_CT";
+       struct srb_bsg *ct;
+
+       /* pass through is supported only for ISP 4Gb or higher */
+        if (!IS_FWI2_CAPABLE(ha)) {
+               DEBUG2(qla_printk(KERN_INFO, ha,
+                   "scsi(%ld):Firmware is not capable to support FC "
+                   "CT pass thru\n", vha->host_no));
+               rval = -EPERM;
+                goto done;
+       }
+
+        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 = -ENOMEM;
+               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 = -ENOMEM;
+                goto done;
+       }
+
+       if ((req_sg_cnt !=  bsg_job->request_payload.sg_cnt) ||
+               (rsp_sg_cnt != bsg_job->reply_payload.sg_cnt))
+       {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                   "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 = -EAGAIN;
+                goto done_unmap_sg;
+       }
+
+       if (!vha->flags.online) {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                   "host not online\n"));
+               rval = -EIO;
+                goto done_unmap_sg;
+       }
+
+       loop_id =
+           (bsg_job->request->rqst_data.h_ct.preamble_word1 & 0xFF000000)
+           >> 24;
+       switch (loop_id) {
+               case 0xFC:
+                       loop_id = cpu_to_le16(NPH_SNS);
+                       break;
+               case 0xFA:
+                       loop_id = vha->mgmt_svr_loop_id;
+                       break;
+               default:
+                       DEBUG2(qla_printk(KERN_INFO, ha,
+                           "Unknown loop id: %x\n", loop_id));
+                       rval = -EINVAL;
+                       goto done_unmap_sg;
+       }
+
+       /* Allocate a dummy fcport structure, since functions preparing the
+        * IOCB and mailbox command retrieves port specific information
+        * from fcport structure. For Host based ELS commands there will be
+        * no fcport structure allocated
+        */
+       fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
+       if (!fcport)
+       {
+               rval = -ENOMEM;
+               goto  done_unmap_sg;
+       }
+
+       /* 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_ctx_bsg_sp(vha, fcport, sizeof(struct srb_bsg));
+       if (!sp) {
+               rval = -ENOMEM;
+               goto done_free_fcport;
+       }
+
+       ct = sp->ctx;
+       ct->ctx.type = SRB_CT_CMD;
+       ct->bsg_job = bsg_job;
+
+       DEBUG2(qla_printk(KERN_INFO, ha,
+           "scsi(%ld:%x): bsg rqst type: %s els type: %x - loop-id=%x "
+           "portid=%02x%02x%02x.\n", vha->host_no, sp->handle, type,
+           (bsg_job->request->rqst_data.h_ct.preamble_word2 >> 16),
+           fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
+           fcport->d_id.b.al_pa));
+
+       rval = qla2x00_start_sp(sp);
+       if (rval != QLA_SUCCESS) {
+               kfree(sp->ctx);
+               mempool_free(sp, ha->srb_mempool);
+               rval = -EIO;
+               goto done_free_fcport;
+       }
+       return rval;
+
+done_free_fcport:
+       kfree(fcport);
+done_unmap_sg:
+       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);
+done:
+       return rval;
+}
+
+static int
+qla2x00_process_vendor_specific(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;
+       uint8_t command_sent;
+       uint32_t vendor_cmd;
+       char *type;
+       struct msg_echo_lb elreq;
+       uint16_t response[MAILBOX_REGISTER_COUNT];
+       uint8_t* fw_sts_ptr;
+       uint8_t *req_data;
+       dma_addr_t req_data_dma;
+       uint32_t req_data_len;
+       uint8_t *rsp_data;
+       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)) {
+               rval = -EBUSY;
+               goto done;
+       }
+
+       if (!vha->flags.online) {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                   "host not online\n"));
+               rval = -EIO;
+                goto done;
+       }
+
+        elreq.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 (!elreq.req_sg_cnt) {
+               rval = -ENOMEM;
+               goto done;
+       }
+        elreq.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 (!elreq.rsp_sg_cnt) {
+               rval = -ENOMEM;
+                goto done;
+       }
+
+       if ((elreq.req_sg_cnt !=  bsg_job->request_payload.sg_cnt) ||
+           (elreq.rsp_sg_cnt != bsg_job->reply_payload.sg_cnt))
+       {
+               DEBUG2(printk(KERN_INFO
+                   "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, elreq.req_sg_cnt,
+                   bsg_job->reply_payload.sg_cnt, elreq.rsp_sg_cnt));
+               rval = -EAGAIN;
+                goto done_unmap_sg;
+       }
+       req_data_len = rsp_data_len = bsg_job->request_payload.payload_len;
+       req_data = dma_alloc_coherent(&ha->pdev->dev, req_data_len,
+           &req_data_dma, GFP_KERNEL);
+
+       rsp_data = dma_alloc_coherent(&ha->pdev->dev, rsp_data_len,
+           &rsp_data_dma, GFP_KERNEL);
+
+       /* Copy the request buffer in req_data now */
+       sg_copy_to_buffer(bsg_job->request_payload.sg_list,
+           bsg_job->request_payload.sg_cnt, req_data,
+           req_data_len);
+
+       elreq.send_dma = req_data_dma;
+       elreq.rcv_dma = rsp_data_dma;
+       elreq.transfer_size = req_data_len;
+
+       /* Vendor cmd : loopback or ECHO diagnostic
+        * Options:
+        *      Loopback : Either internal or external loopback
+        *      ECHO: ECHO ELS or Vendor specific FC4  link data
+        */
+       vendor_cmd = bsg_job->request->rqst_data.h_vendor.vendor_cmd[0];
+       elreq.options =
+           *(((uint32_t *)bsg_job->request->rqst_data.h_vendor.vendor_cmd)
+           + 1);
+
+       switch (bsg_job->request->rqst_data.h_vendor.vendor_cmd[0]) {
+       case QL_VND_LOOPBACK:
+               if (ha->current_topology != ISP_CFG_F) {
+                       type = "FC_BSG_HST_VENDOR_LOOPBACK";
+
+                       DEBUG2(qla_printk(KERN_INFO, ha,
+                               "scsi(%ld) bsg rqst type: %s vendor rqst type: %x options: %x.\n",
+                               vha->host_no, type, vendor_cmd, elreq.options));
+
+                       command_sent = INT_DEF_LB_LOOPBACK_CMD;
+                       rval = qla2x00_loopback_test(vha, &elreq, response);
+                       if (IS_QLA81XX(ha)) {
+                               if (response[0] == MBS_COMMAND_ERROR && response[1] == MBS_LB_RESET) {
+                                       DEBUG2(printk(KERN_ERR "%s(%ld): ABORTing "
+                                               "ISP\n", __func__, vha->host_no));
+                                       set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                                       qla2xxx_wake_dpc(vha);
+                                }
+                       }
+               } else {
+                       type = "FC_BSG_HST_VENDOR_ECHO_DIAG";
+                       DEBUG2(qla_printk(KERN_INFO, ha,
+                               "scsi(%ld) bsg rqst type: %s vendor rqst type: %x options: %x.\n",
+                               vha->host_no, type, vendor_cmd, elreq.options));
+
+                       command_sent = INT_DEF_LB_ECHO_CMD;
+                       rval = qla2x00_echo_test(vha, &elreq, response);
+               }
+               break;
+       case QLA84_RESET:
+               if (!IS_QLA84XX(vha->hw)) {
+                       rval = -EINVAL;
+                       DEBUG16(printk(
+                               "%s(%ld): 8xxx exiting.\n",
+                               __func__, vha->host_no));
+                       return rval;
+               }
+               rval = qla84xx_reset(vha, &elreq, bsg_job);
+               break;
+       case QLA84_MGMT_CMD:
+               if (!IS_QLA84XX(vha->hw)) {
+                       rval = -EINVAL;
+                       DEBUG16(printk(
+                               "%s(%ld): 8xxx exiting.\n",
+                               __func__, vha->host_no));
+                       return rval;
+               }
+               rval = qla84xx_mgmt_cmd(vha, &elreq, bsg_job);
+               break;
+       default:
+               rval = -ENOSYS;
+       }
+
+       if (rval != QLA_SUCCESS) {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                       "scsi(%ld) Vendor request %s failed\n", vha->host_no, type));
+               rval = 0;
+               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, response, sizeof(response));
+               fw_sts_ptr += sizeof(response);
+                *fw_sts_ptr = command_sent;
+       } else {
+               DEBUG2(qla_printk(KERN_WARNING, ha,
+                       "scsi(%ld) Vendor request %s completed\n", vha->host_no, type));
+               rval = bsg_job->reply->result = 0;
+               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;
+               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);
+
+done_unmap_sg:
+
+       if(req_data)
+               dma_free_coherent(&ha->pdev->dev, req_data_len,
+                       req_data, req_data_dma);
+       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);
+
+done:
+        return rval;
+}
+
+static int
+qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
+{
+        int ret = -EINVAL;
+
+        switch (bsg_job->request->msgcode) {
+               case FC_BSG_RPT_ELS:
+               case FC_BSG_HST_ELS_NOLOGIN:
+                       ret = qla2x00_process_els(bsg_job);
+                       break;
+               case FC_BSG_HST_CT:
+                       ret = qla2x00_process_ct(bsg_job);
+                       break;
+               case FC_BSG_HST_VENDOR:
+                       ret = qla2x00_process_vendor_specific(bsg_job);
+                       break;
+               case FC_BSG_HST_ADD_RPORT:
+               case FC_BSG_HST_DEL_RPORT:
+               case FC_BSG_RPT_CT:
+               default:
+                       DEBUG2(printk("qla2xxx: unsupported BSG request\n"));
+                       break;
+        }
+       return ret;
+}
+
+static int
+qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
+{
+        scsi_qla_host_t *vha = shost_priv(bsg_job->shost);
+        struct qla_hw_data *ha = vha->hw;
+        srb_t *sp;
+        int cnt, que;
+        unsigned long flags;
+        struct req_que *req;
+       struct srb_bsg *sp_bsg;
+
+       /* find the bsg job from the active list of commands */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+       for (que = 0; que < ha->max_req_queues; que++) {
+               req = ha->req_q_map[que];
+               if (!req)
+                       continue;
+
+               for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++ ) {
+                       sp = req->outstanding_cmds[cnt];
+
+                       if (sp) {
+                               sp_bsg = (struct srb_bsg*)sp->ctx;
+
+                               if (((sp_bsg->ctx.type == SRB_CT_CMD) ||
+                                   (sp_bsg->ctx.type == SRB_ELS_CMD_RPT)
+                                   || ( sp_bsg->ctx.type == SRB_ELS_CMD_HST)) &&
+                                   (sp_bsg->bsg_job == bsg_job)) {
+                                       if (ha->isp_ops->abort_command(sp)) {
+                                               DEBUG2(qla_printk(KERN_INFO, ha,
+                                               "scsi(%ld): mbx abort_command failed\n", vha->host_no));
+                                               bsg_job->req->errors = bsg_job->reply->result = -EIO;
+                                       } else {
+                                               DEBUG2(qla_printk(KERN_INFO, ha,
+                                               "scsi(%ld): mbx abort_command success\n", vha->host_no));
+                                               bsg_job->req->errors = bsg_job->reply->result = 0;
+                                       }
+                                       goto done;
+                               }
+                       }
+               }
+       }
+       spin_unlock_irqrestore(&ha->hardware_lock, flags);
+       DEBUG2(qla_printk(KERN_INFO, ha,
+               "scsi(%ld) SRB not found to abort\n", vha->host_no));
+       bsg_job->req->errors = bsg_job->reply->result = -ENXIO;
+       return 0;
+
+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;
+}
+
 struct fc_function_template qla2xxx_transport_functions = {
 
        .show_host_node_name = 1,
@@ -1786,6 +2444,8 @@ struct fc_function_template qla2xxx_transport_functions = {
        .vport_create = qla24xx_vport_create,
        .vport_disable = qla24xx_vport_disable,
        .vport_delete = qla24xx_vport_delete,
+       .bsg_request = qla24xx_bsg_request,
+       .bsg_timeout = qla24xx_bsg_timeout,
 };
 
 struct fc_function_template qla2xxx_transport_vport_functions = {
@@ -1826,6 +2486,8 @@ struct fc_function_template qla2xxx_transport_vport_functions = {
        .dev_loss_tmo_callbk = qla2x00_dev_loss_tmo_callbk,
        .terminate_rport_io = qla2x00_terminate_rport_io,
        .get_fc_host_stats = qla2x00_get_fc_host_stats,
+       .bsg_request = qla24xx_bsg_request,
+       .bsg_timeout = qla24xx_bsg_timeout,
 };
 
 void
@@ -1854,3 +2516,125 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
                speed = FC_PORTSPEED_1GBIT;
        fc_host_supported_speeds(vha->host) = speed;
 }
+static int
+qla84xx_reset(scsi_qla_host_t *ha, struct msg_echo_lb *mreq, struct fc_bsg_job *bsg_job)
+{
+       int             ret = 0;
+       int             cmd;
+       uint16_t        cmd_status;
+
+       DEBUG16(printk("%s(%ld): entered.\n", __func__, ha->host_no));
+
+       cmd = (*((bsg_job->request->rqst_data.h_vendor.vendor_cmd) + 2))
+                       == A84_RESET_FLAG_ENABLE_DIAG_FW ?
+                               A84_ISSUE_RESET_DIAG_FW : A84_ISSUE_RESET_OP_FW;
+       ret = qla84xx_reset_chip(ha, cmd == A84_ISSUE_RESET_DIAG_FW,
+       &cmd_status);
+       return ret;
+}
+
+static int
+qla84xx_mgmt_cmd(scsi_qla_host_t *ha, struct msg_echo_lb *mreq, struct fc_bsg_job *bsg_job)
+{
+       struct access_chip_84xx *mn;
+       dma_addr_t mn_dma, mgmt_dma;
+       void *mgmt_b = NULL;
+       int ret = 0;
+       int rsp_hdr_len, len = 0;
+       struct qla84_msg_mgmt *ql84_mgmt;
+
+       ql84_mgmt = (struct qla84_msg_mgmt *) vmalloc(sizeof(struct qla84_msg_mgmt));
+       ql84_mgmt->cmd =
+               *((uint16_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 2));
+       ql84_mgmt->mgmtp.u.mem.start_addr =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 3));
+       ql84_mgmt->len =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 4));
+       ql84_mgmt->mgmtp.u.config.id =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 5));
+       ql84_mgmt->mgmtp.u.config.param0 =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 6));
+       ql84_mgmt->mgmtp.u.config.param1 =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 7));
+       ql84_mgmt->mgmtp.u.info.type =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 8));
+       ql84_mgmt->mgmtp.u.info.context =
+               *((uint32_t *)(bsg_job->request->rqst_data.h_vendor.vendor_cmd + 9));
+
+       rsp_hdr_len = bsg_job->request_payload.payload_len;
+
+       mn = dma_pool_alloc(ha->hw->s_dma_pool, GFP_KERNEL, &mn_dma);
+       if (mn == NULL) {
+               DEBUG2(printk(KERN_ERR "%s: dma alloc for fw buffer "
+               "failed%lu\n", __func__, ha->host_no));
+               return -ENOMEM;
+       }
+
+       memset(mn, 0, sizeof (struct access_chip_84xx));
+
+       mn->entry_type = ACCESS_CHIP_IOCB_TYPE;
+       mn->entry_count = 1;
+
+       switch (ql84_mgmt->cmd) {
+       case QLA84_MGMT_READ_MEM:
+               mn->options = cpu_to_le16(ACO_DUMP_MEMORY);
+               mn->parameter1 = cpu_to_le32(ql84_mgmt->mgmtp.u.mem.start_addr);
+               break;
+       case QLA84_MGMT_WRITE_MEM:
+               mn->options = cpu_to_le16(ACO_LOAD_MEMORY);
+               mn->parameter1 = cpu_to_le32(ql84_mgmt->mgmtp.u.mem.start_addr);
+               break;
+       case QLA84_MGMT_CHNG_CONFIG:
+               mn->options = cpu_to_le16(ACO_CHANGE_CONFIG_PARAM);
+               mn->parameter1 = cpu_to_le32(ql84_mgmt->mgmtp.u.config.id);
+               mn->parameter2 = cpu_to_le32(ql84_mgmt->mgmtp.u.config.param0);
+               mn->parameter3 = cpu_to_le32(ql84_mgmt->mgmtp.u.config.param1);
+               break;
+       case QLA84_MGMT_GET_INFO:
+               mn->options = cpu_to_le16(ACO_REQUEST_INFO);
+               mn->parameter1 = cpu_to_le32(ql84_mgmt->mgmtp.u.info.type);
+               mn->parameter2 = cpu_to_le32(ql84_mgmt->mgmtp.u.info.context);
+               break;
+       default:
+               ret = -EIO;
+               goto exit_mgmt0;
+       }
+
+       if ((len == ql84_mgmt->len) &&
+               ql84_mgmt->cmd != QLA84_MGMT_CHNG_CONFIG) {
+               mgmt_b = dma_alloc_coherent(&ha->hw->pdev->dev, len,
+                               &mgmt_dma, GFP_KERNEL);
+               if (mgmt_b == NULL) {
+                       DEBUG2(printk(KERN_ERR "%s: dma alloc mgmt_b "
+                       "failed%lu\n", __func__, ha->host_no));
+                       ret = -ENOMEM;
+                       goto exit_mgmt0;
+               }
+               mn->total_byte_cnt = cpu_to_le32(ql84_mgmt->len);
+               mn->dseg_count = cpu_to_le16(1);
+               mn->dseg_address[0] = cpu_to_le32(LSD(mgmt_dma));
+               mn->dseg_address[1] = cpu_to_le32(MSD(mgmt_dma));
+               mn->dseg_length = cpu_to_le32(len);
+
+               if (ql84_mgmt->cmd == QLA84_MGMT_WRITE_MEM) {
+                       memcpy(mgmt_b, ql84_mgmt->payload, len);
+               }
+       }
+
+       ret = qla2x00_issue_iocb(ha, mn, mn_dma, 0);
+       if ((ret != QLA_SUCCESS) || (ql84_mgmt->cmd == QLA84_MGMT_WRITE_MEM)
+               || (ql84_mgmt->cmd == QLA84_MGMT_CHNG_CONFIG)) {
+                       if (ret != QLA_SUCCESS)
+                               DEBUG2(printk(KERN_ERR "%s(%lu): failed\n",
+                                       __func__, ha->host_no));
+       } else if ((ql84_mgmt->cmd == QLA84_MGMT_READ_MEM) ||
+                       (ql84_mgmt->cmd == QLA84_MGMT_GET_INFO)) {
+       }
+
+       if (mgmt_b)
+               dma_free_coherent(&ha->hw->pdev->dev, len, mgmt_b, mgmt_dma);
+
+exit_mgmt0:
+       dma_pool_free(ha->hw->s_dma_pool, mn, mn_dma);
+       return ret;
+}