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

Commit 0f2d962f authored by Madhuranath Iyengar's avatar Madhuranath Iyengar Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Check for golden firmware and show version if available 



Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e8c72ba5

drivers/scsi/qla2xxx/qla_attr.c

+18 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,21 @@ qla2x00_optrom_fw_version_show(struct device *dev, 
	    ha->fw_revision[3]);

}



static ssize_t

qla2x00_optrom_gold_fw_version_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;



	if (!IS_QLA81XX(ha))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",

	    ha->gold_fw_version[0], ha->gold_fw_version[1],

	    ha->gold_fw_version[2], ha->gold_fw_version[3]);

}



static ssize_t

qla2x00_total_isp_aborts_show(struct device *dev,

			      struct device_attribute *attr, char *buf)
@@ -1336,6 +1351,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(optrom_gold_fw_version, S_IRUGO,

    qla2x00_optrom_gold_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,
@@ -1376,6 +1393,7 @@ struct device_attribute *qla2x00_host_attrs[] = { 
	&dev_attr_vn_port_mac_address,

	&dev_attr_fabric_param,

	&dev_attr_fw_state,

	&dev_attr_optrom_gold_fw_version,

	NULL,

};

drivers/scsi/qla2xxx/qla_def.h

+2 −0
Original line number Diff line number Diff line
@@ -2714,6 +2714,8 @@ struct qla_hw_data { 
	uint8_t 	fcode_revision[16];

	uint32_t	fw_revision[4];



	uint32_t	gold_fw_version[4];



	/* Offsets for flash/nvram access (set to ~0 if not used). */

	uint32_t	flash_conf_off;

	uint32_t	flash_data_off;

drivers/scsi/qla2xxx/qla_sup.c

+22 −0
Original line number Diff line number Diff line
@@ -2759,6 +2759,28 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf) 
		ha->fw_revision[3] = dcode[3];

	}



	/* Check for golden firmware and get version if available */

	if (!IS_QLA81XX(ha)) {

		/* Golden firmware is not present in non 81XX adapters */

		return ret;

	}



	memset(ha->gold_fw_version, 0, sizeof(ha->gold_fw_version));

	dcode = mbuf;

	ha->isp_ops->read_optrom(vha, (uint8_t *)dcode,

	    ha->flt_region_gold_fw << 2, 32);



	if (dcode[4] == 0xFFFFFFFF && dcode[5] == 0xFFFFFFFF &&

	    dcode[6] == 0xFFFFFFFF && dcode[7] == 0xFFFFFFFF) {

		DEBUG2(qla_printk(KERN_INFO, ha,

		    "%s(%ld): Unrecognized golden fw at 0x%x.\n",

		    __func__, vha->host_no, ha->flt_region_gold_fw * 4));

		return ret;

	}



	for (i = 4; i < 8; i++)

		ha->gold_fw_version[i-4] = be32_to_cpu(dcode[i]);



	return ret;

}