Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ae6d9c7 authored Mar 28, 2013 by Giridhar Malavali Committed by James Bottomley Apr 11, 2013

[SCSI] qla2xxx: Enhancements to support ISPFx00.



[jejb: fix up checkpatch issues]
Signed-off-by: Andrew Vazquez <andrew.vasquez@qlogic.com>
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 0ce2d534

drivers/scsi/qla2xxx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		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 qla_mr.o qla_target.o

		obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
		obj-$(CONFIG_TCM_QLA2XXX) += tcm_qla2xxx.o

drivers/scsi/qla2xxx/qla_attr.c

+34 −1

Original line number	Diff line number	Diff line
		@@ -888,7 +888,10 @@ qla2x00_serial_num_show(struct device dev, struct device_attribute attr,
		struct qla_hw_data *ha = vha->hw;
		uint32_t sn;

		if (IS_FWI2_CAPABLE(ha)) {
		if (IS_QLAFX00(vha->hw)) {
		return snprintf(buf, PAGE_SIZE, "%s\n",
		vha->hw->mr.serial_num);
		} else if (IS_FWI2_CAPABLE(ha)) {
		qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE);
		return snprintf(buf, PAGE_SIZE, "%s\n", buf);
		}
		@@ -912,6 +915,11 @@ qla2x00_isp_id_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_QLAFX00(vha->hw))
		return snprintf(buf, PAGE_SIZE, "%s\n",
		vha->hw->mr.hw_version);

		return snprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
		ha->product_id[0], ha->product_id[1], ha->product_id[2],
		ha->product_id[3]);
		@@ -922,6 +930,11 @@ qla2x00_model_name_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		if (IS_QLAFX00(vha->hw))
		return snprintf(buf, PAGE_SIZE, "%s\n",
		vha->hw->mr.product_name);

		return snprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_number);
		}

		@@ -1304,6 +1317,12 @@ qla2x00_fw_state_show(struct device dev, struct device_attribute attr,
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		int rval = QLA_FUNCTION_FAILED;
		uint16_t state[5];
		uint32_t pstate;

		if (IS_QLAFX00(vha->hw)) {
		pstate = qlafx00_fw_state_show(dev, attr, buf);
		return snprintf(buf, PAGE_SIZE, "0x%x\n", pstate);
		}

		if (qla2x00_reset_active(vha))
		ql_log(ql_log_warn, vha, 0x707c,
		@@ -1454,6 +1473,11 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)
		(shost_priv(shost)))->hw;
		u32 speed = FC_PORTSPEED_UNKNOWN;

		if (IS_QLAFX00(ha)) {
		qlafx00_get_host_speed(shost);
		return;
		}

		switch (ha->link_data_rate) {
		case PORT_SPEED_1GB:
		speed = FC_PORTSPEED_1GBIT;
		@@ -1637,6 +1661,9 @@ qla2x00_issue_lip(struct Scsi_Host *shost)
		{
		scsi_qla_host_t *vha = shost_priv(shost);

		if (IS_QLAFX00(vha->hw))
		return 0;

		qla2x00_loop_reset(vha);
		return 0;
		}
		@@ -1655,6 +1682,9 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
		pfc_host_stat = &vha->fc_host_stat;
		memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));

		if (IS_QLAFX00(vha->hw))
		goto done;

		if (test_bit(UNLOADING, &vha->dpc_flags))
		goto done;

		@@ -2087,6 +2117,9 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
		FC_PORTSPEED_1GBIT;
		else if (IS_QLA23XX(ha))
		speed = FC_PORTSPEED_2GBIT \| FC_PORTSPEED_1GBIT;
		else if (IS_QLAFX00(ha))
		speed = FC_PORTSPEED_8GBIT \| FC_PORTSPEED_4GBIT \|
		FC_PORTSPEED_2GBIT \| FC_PORTSPEED_1GBIT;
		else
		speed = FC_PORTSPEED_1GBIT;
		fc_host_supported_speeds(vha->host) = speed;

drivers/scsi/qla2xxx/qla_bsg.c

+147 −5

Original line number	Diff line number	Diff line
		@@ -30,14 +30,31 @@ qla2x00_bsg_sp_free(void data, void ptr)
		struct scsi_qla_host *vha = sp->fcport->vha;
		struct fc_bsg_job *bsg_job = sp->u.bsg_job;
		struct qla_hw_data *ha = vha->hw;
		struct qla_mt_iocb_rqst_fx00 *piocb_rqst;

		if (sp->type == SRB_FXIOCB_BCMD) {
		piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
		&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];

		if (piocb_rqst->flags & SRB_FXDISC_REQ_DMA_VALID)
		dma_unmap_sg(&ha->pdev->dev,
		bsg_job->request_payload.sg_list,
		bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);

		if (piocb_rqst->flags & SRB_FXDISC_RESP_DMA_VALID)
		dma_unmap_sg(&ha->pdev->dev,
		bsg_job->reply_payload.sg_list,
		bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
		} else {
		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->type == SRB_CT_CMD \|\|
		sp->type == SRB_FXIOCB_BCMD \|\|
		sp->type == SRB_ELS_CMD_HST)
		kfree(sp->fcport);
		qla2x00_rel_sp(vha, sp);
		@@ -1882,6 +1899,128 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
		return 0;
		}

		static int
		qlafx00_mgmt_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;
		int rval = (DRIVER_ERROR << 16);
		struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
		srb_t *sp;
		int req_sg_cnt = 0, rsp_sg_cnt = 0;
		struct fc_port *fcport;
		char *type = "FC_BSG_HST_FX_MGMT";

		/* Copy the IOCB specific information */
		piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
		&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];

		/* Dump the vendor information */
		ql_dump_buffer(ql_dbg_user + ql_dbg_verbose , vha, 0x70cf,
		(uint8_t *)piocb_rqst, sizeof(struct qla_mt_iocb_rqst_fx00));

		if (!vha->flags.online) {
		ql_log(ql_log_warn, vha, 0x70d0,
		"Host is not online.\n");
		rval = -EIO;
		goto done;
		}

		if (piocb_rqst->flags & SRB_FXDISC_REQ_DMA_VALID) {
		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) {
		ql_log(ql_log_warn, vha, 0x70c7,
		"dma_map_sg return %d for request\n", req_sg_cnt);
		rval = -ENOMEM;
		goto done;
		}
		}

		if (piocb_rqst->flags & SRB_FXDISC_RESP_DMA_VALID) {
		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) {
		ql_log(ql_log_warn, vha, 0x70c8,
		"dma_map_sg return %d for reply\n", rsp_sg_cnt);
		rval = -ENOMEM;
		goto done_unmap_req_sg;
		}
		}

		ql_dbg(ql_dbg_user, vha, 0x70c9,
		"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);

		/* 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) {
		ql_log(ql_log_warn, vha, 0x70ca,
		"Failed to allocate fcport.\n");
		rval = -ENOMEM;
		goto done_unmap_rsp_sg;
		}

		/* Alloc SRB structure */
		sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
		if (!sp) {
		ql_log(ql_log_warn, vha, 0x70cb,
		"qla2x00_get_sp failed.\n");
		rval = -ENOMEM;
		goto done_free_fcport;
		}

		/* Initialize all required fields of fcport */
		fcport->vha = vha;
		fcport->loop_id = piocb_rqst->dataword;

		sp->type = SRB_FXIOCB_BCMD;
		sp->name = "bsg_fx_mgmt";
		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;

		ql_dbg(ql_dbg_user, vha, 0x70cc,
		"bsg rqst type: %s fx_mgmt_type: %x id=%x\n",
		type, piocb_rqst->func_type, fcport->loop_id);

		rval = qla2x00_start_sp(sp);
		if (rval != QLA_SUCCESS) {
		ql_log(ql_log_warn, vha, 0x70cd,
		"qla2x00_start_sp failed=%d.\n", rval);
		mempool_free(sp, ha->srb_mempool);
		rval = -EIO;
		goto done_free_fcport;
		}
		return rval;

		done_free_fcport:
		kfree(fcport);

		done_unmap_rsp_sg:
		if (piocb_rqst->flags & SRB_FXDISC_RESP_DMA_VALID)
		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:
		if (piocb_rqst->flags & SRB_FXDISC_REQ_DMA_VALID)
		dma_unmap_sg(&ha->pdev->dev,
		bsg_job->request_payload.sg_list,
		bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);

		done:
		return rval;
		}

		static int
		qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
		{
		@@ -1928,6 +2067,8 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
		case QL_VND_DIAG_IO_CMD:
		return qla24xx_process_bidir_cmd(bsg_job);

		case QL_VND_FX00_MGMT_CMD:
		return qlafx00_mgmt_cmd(bsg_job);
		default:
		return -ENOSYS;
		}
		@@ -2007,7 +2148,8 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
		sp = req->outstanding_cmds[cnt];
		if (sp) {
		if (((sp->type == SRB_CT_CMD) \|\|
		(sp->type == SRB_ELS_CMD_HST))
		(sp->type == SRB_ELS_CMD_HST) \|\|
		(sp->type == SRB_FXIOCB_BCMD))
		&& (sp->u.bsg_job == bsg_job)) {
		spin_unlock_irqrestore(&ha->hardware_lock, flags);
		if (ha->isp_ops->abort_command(sp)) {

drivers/scsi/qla2xxx/qla_bsg.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#define QL_VND_DIAG_IO_CMD 0x0A
		#define QL_VND_WRITE_I2C 0x10
		#define QL_VND_READ_I2C 0x11
		#define QL_VND_FX00_MGMT_CMD 0x12

		/* BSG Vendor specific subcode returns */
		#define EXT_STATUS_OK 0

drivers/scsi/qla2xxx/qla_dbg.c

+15 −12

Original line number	Diff line number	Diff line
		@@ -11,28 +11,31 @@
		* ----------------------------------------------------------------------
		* \| Level \| Last Value Used \| Holes \|
		* ----------------------------------------------------------------------
		* \| Module Init and Probe \| 0x0126 \| 0x4b,0xba,0xfa \|
		* \| Mailbox commands \| 0x115b \| 0x111a-0x111b \|
		* \| \| \| 0x112c-0x112e \|
		* \| \| \| 0x113a \|
		* \| Module Init and Probe \| 0x014f \| 0x4b,0xba,0xfa \|
		* \| Mailbox commands \| 0x1179 \| 0x111a-0x111b \|
		* \| \| \| 0x1155-0x1158 \|
		* \| Device Discovery \| 0x2087 \| 0x2020-0x2022, \|
		* \| Device Discovery \| 0x2095 \| 0x2020-0x2022, \|
		* \| \| \| 0x2016 \|
		* \| Queue Command and IO tracing \| 0x3031 \| 0x3006-0x300b \|
		* \| Queue Command and IO tracing \| 0x3058 \| 0x3006-0x300b \|
		* \| \| \| 0x3027-0x3028 \|
		* \| \| \| 0x302d-0x302e \|
		* \| DPC Thread \| 0x401d \| 0x4002,0x4013 \|
		* \| Async Events \| 0x5071 \| 0x502b-0x502f \|
		* \| \| \| 0x303d-0x3041 \|
		* \| \| \| 0x302d,0x3033 \|
		* \| \| \| 0x3036,0x3038 \|
		* \| \| \| 0x303a \|
		* \| DPC Thread \| 0x4022 \| 0x4002,0x4013 \|
		* \| Async Events \| 0x5081 \| 0x502b-0x502f \|
		* \| \| \| 0x5047,0x5052 \|
		* \| \| \| 0x5040,0x5075 \|
		* \| Timer Routines \| 0x6011 \| \|
		* \| User Space Interactions \| 0x70c4 \| 0x7018,0x702e, \|
		* \| User Space Interactions \| 0x70dd \| 0x7018,0x702e, \|
		* \| \| \| 0x7020,0x7024, \|
		* \| \| \| 0x7039,0x7045, \|
		* \| \| \| 0x7073-0x7075, \|
		* \| \| \| 0x708c, \|
		* \| \| \| 0x707b,0x708c, \|
		* \| \| \| 0x70a5,0x70a6, \|
		* \| \| \| 0x70a8,0x70ab, \|
		* \| \| \| 0x70ad-0x70ae \|
		* \| \| \| 0x70ad-0x70ae, \|
		* \| \| \| 0x70d1-0x70da \|
		* \| Task Management \| 0x803c \| 0x8025-0x8026 \|
		* \| \| \| 0x800b,0x8039 \|
		* \| AER/EEH \| 0x9011 \| \|