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

Commit e428924c authored Jul 19, 2007 by Andrew Vasquez Committed by James Bottomley Jul 20, 2007

[SCSI] qla2xxx: Generalize FW-Interface-2 support.



In preparation for new ISP types.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 80ed71ce

drivers/scsi/qla2xxx/qla_attr.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj,
		return 0;

		/* Checksum NVRAM. */
		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha)) {
		if (IS_FWI2_CAPABLE(ha)) {
		uint32_t *iter;
		uint32_t chksum;

		@@ -410,7 +410,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)
		int ret;

		for (iter = bin_file_entries; iter->name; iter++) {
		if (iter->is4GBp_only && (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)))
		if (iter->is4GBp_only && !IS_FWI2_CAPABLE(ha))
		continue;

		ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
		@@ -429,7 +429,7 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
		struct sysfs_entry *iter;

		for (iter = bin_file_entries; iter->name; iter++) {
		if (iter->is4GBp_only && (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)))
		if (iter->is4GBp_only && !IS_FWI2_CAPABLE(ha))
		continue;

		sysfs_remove_bin_file(&host->shost_gendev.kobj,
		@@ -898,7 +898,7 @@ 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 (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha)) {
		if (IS_FWI2_CAPABLE(ha)) {
		rval = qla24xx_get_isp_stats(ha, (uint32_t *)&stat_buf,
		sizeof(stat_buf) / 4, mb_stat);
		} else if (atomic_read(&ha->loop_state) == LOOP_READY &&

drivers/scsi/qla2xxx/qla_def.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2215,6 +2215,7 @@ typedef struct scsi_qla_host {
		#define DT_ISP5432 BIT_10
		#define DT_ISP_LAST (DT_ISP5432 << 1)

		#define DT_FWI2 BIT_27
		#define DT_ZIO_SUPPORTED BIT_28
		#define DT_OEM_001 BIT_29
		#define DT_ISP2200A BIT_30
		@@ -2238,6 +2239,7 @@ typedef struct scsi_qla_host {
		#define IS_QLA24XX(ha) (IS_QLA2422(ha) \|\| IS_QLA2432(ha))
		#define IS_QLA54XX(ha) (IS_QLA5422(ha) \|\| IS_QLA5432(ha))

		#define IS_FWI2_CAPABLE(ha) ((ha)->device_type & DT_FWI2)
		#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)

drivers/scsi/qla2xxx/qla_gs.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t ha, ms_iocb_entry_t ms_pkt,
		DEBUG2_3(printk("scsi(%ld): %s failed, error status (%x).\n",
		ha->host_no, routine, ms_pkt->entry_status));
		} else {
		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha))
		if (IS_FWI2_CAPABLE(ha))
		comp_status = le16_to_cpu(
		((struct ct_entry_24xx *)ms_pkt)->comp_status);
		else
		@@ -1198,7 +1198,7 @@ qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size)
		ms_iocb_entry_t *ms_pkt = ha->ms_iocb;
		struct ct_entry_24xx ct_pkt = (struct ct_entry_24xx )ha->ms_iocb;

		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha)) {
		if (IS_FWI2_CAPABLE(ha)) {
		ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
		ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
		} else {
		@@ -1562,7 +1562,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
		eiter = (struct ct_fdmi_port_attr *) (entries + size);
		eiter->type = __constant_cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
		eiter->len = __constant_cpu_to_be16(4 + 4);
		max_frame_size = IS_QLA24XX(ha) \|\| IS_QLA54XX(ha) ?
		max_frame_size = IS_FWI2_CAPABLE(ha) ?
		(uint32_t) icb24->frame_payload_size:
		(uint32_t) ha->init_cb->frame_payload_size;
		eiter->a.max_frame_size = cpu_to_be32(max_frame_size);
		@@ -1678,7 +1678,7 @@ qla2x00_gfpn_id(scsi_qla_host_t ha, sw_info_t list)
		struct ct_sns_req *ct_req;
		struct ct_sns_rsp *ct_rsp;

		if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
		if (!IS_FWI2_CAPABLE(ha))
		return QLA_FUNCTION_FAILED;

		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
		@@ -1786,7 +1786,7 @@ qla2x00_gpsc(scsi_qla_host_t ha, sw_info_t list)
		struct ct_sns_req *ct_req;
		struct ct_sns_rsp *ct_rsp;

		if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
		if (!IS_FWI2_CAPABLE(ha))
		return QLA_FUNCTION_FAILED;
		if (!ha->flags.gpsc_supported)
		return QLA_FUNCTION_FAILED;

drivers/scsi/qla2xxx/qla_init.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)
		fixed_size = offsetof(struct qla2300_fw_dump, data_ram);
		mem_size = (ha->fw_memory_size - 0x11000 + 1) *
		sizeof(uint16_t);
		} else if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha)) {
		} else if (IS_FWI2_CAPABLE(ha)) {
		fixed_size = offsetof(struct qla24xx_fw_dump, ext_mem);
		mem_size = (ha->fw_memory_size - 0x100000 + 1) *
		sizeof(uint32_t);
		@@ -2267,7 +2267,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
		scsi_qla_host_t *pha = to_qla_parent(ha);

		/* If FL port exists, then SNS is present */
		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha))
		if (IS_FWI2_CAPABLE(ha))
		loop_id = NPH_F_PORT;
		else
		loop_id = SNS_FL_PORT;
		@@ -2294,7 +2294,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
		qla2x00_fdmi_register(ha);

		/* Ensure we are logged into the SNS. */
		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha))
		if (IS_FWI2_CAPABLE(ha))
		loop_id = NPH_SNS;
		else
		loop_id = SIMPLE_NAME_SERVER;
		@@ -4012,7 +4012,7 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha)
		{
		int ret, retries;

		if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
		if (!IS_FWI2_CAPABLE(ha))
		return;
		if (!ha->fw_major_version)
		return;

drivers/scsi/qla2xxx/qla_inline.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ static inline int qla2x00_is_reserved_id(scsi_qla_host_t *, uint16_t);
		static inline int
		qla2x00_is_reserved_id(scsi_qla_host_t *ha, uint16_t loop_id)
		{
		if (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha))
		if (IS_FWI2_CAPABLE(ha))
		return (loop_id > NPH_LAST_HANDLE);

		return ((loop_id > ha->last_loop_id && loop_id < SNS_FIRST_LOOP_ID) \|\|