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

Commit 6246b8a1 authored Feb 09, 2012 by Giridhar Malavali Committed by James Bottomley Feb 19, 2012

[SCSI] qla2xxx: Enhancements to support ISP83xx.



Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Harish Zunjarrao <harish.zunjarrao@qlogic.com>
Signed-off-by: Nigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 050c9bb1

drivers/scsi/qla2xxx/qla_attr.c

+14 −9

Original line number	Diff line number	Diff line
		@@ -356,7 +356,8 @@ 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_QLA25XX(ha) \|\| IS_QLA8XXX_TYPE(ha))
		else if (IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha)
		\|\| IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7065,
		@@ -898,7 +899,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_QLA8XXX_TYPE(vha->hw)))
		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))
		continue;

		ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
		@@ -926,7 +927,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_QLA8XXX_TYPE(vha->hw)))
		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))
		continue;

		sysfs_remove_bin_file(&host->shost_gendev.kobj,
		@@ -1231,7 +1232,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))
		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
		@@ -1278,7 +1279,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))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
		@@ -1293,7 +1294,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))
		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
		@@ -1316,7 +1317,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_QLA8XXX_TYPE(vha->hw))
		if (!IS_CNA_CAPABLE(vha->hw))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d\n", vha->fcoe_vlan_id);
		@@ -1328,7 +1329,7 @@ qla2x00_vn_port_mac_address_show(struct device *dev,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		if (!IS_QLA8XXX_TYPE(vha->hw))
		if (!IS_CNA_CAPABLE(vha->hw))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
		@@ -1493,6 +1494,9 @@ 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;
		}
		@@ -1889,6 +1893,7 @@ 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);
		@@ -2086,7 +2091,7 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
		fc_host_max_npiv_vports(vha->host) = ha->max_npiv_vports;
		fc_host_npiv_vports_inuse(vha->host) = ha->cur_vport_count;

		if (IS_QLA8XXX_TYPE(ha))
		if (IS_CNA_CAPABLE(ha))
		speed = FC_PORTSPEED_10GBIT;
		else if (IS_QLA25XX(ha))
		speed = FC_PORTSPEED_8GBIT \| FC_PORTSPEED_4GBIT \|

drivers/scsi/qla2xxx/qla_bsg.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t vha, uint16_t config,
		int rval = 0;
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		goto done_set_internal;

		new_config[0] = config[0] \| (ENABLE_INTERNAL_LOOPBACK << 1);
		@@ -582,7 +582,7 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t vha, uint16_t config,
		uint16_t new_config[4];
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		goto done_reset_internal;

		memset(new_config, 0 , sizeof(new_config));
		@@ -707,7 +707,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)

		if ((ha->current_topology == ISP_CFG_F \|\|
		(atomic_read(&vha->loop_state) == LOOP_DOWN) \|\|
		(IS_QLA81XX(ha) &&
		((IS_QLA81XX(ha) \|\| IS_QLA83XX(ha)) &&
		le32_to_cpu((uint32_t )req_data) == ELS_OPCODE_BYTE
		&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
		elreq.options == EXTERNAL_LOOPBACK) {
		@@ -717,7 +717,7 @@ 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)) {
		if (IS_QLA81XX(ha) \|\| IS_QLA8031(ha)) {
		memset(config, 0, sizeof(config));
		memset(new_config, 0, sizeof(new_config));
		if (qla81xx_get_port_config(vha, config)) {
		@@ -1331,7 +1331,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_QLA8XXX_TYPE(ha))
		IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7058,