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

Commit 30c47662 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Export OptionROM boot-codes version information. 



This includes BIOS, EFI, FCODE and firmware versions.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d88021a6

drivers/scsi/qla2xxx/qla_attr.c

+49 −0
Original line number Diff line number Diff line
@@ -653,6 +653,43 @@ qla2x00_beacon_store(struct class_device *cdev, const char *buf, 
	return count;

}



static ssize_t

qla2x00_optrom_bios_version_show(struct class_device *cdev, char *buf)

{

	scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));



	return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],

	    ha->bios_revision[0]);

}



static ssize_t

qla2x00_optrom_efi_version_show(struct class_device *cdev, char *buf)

{

	scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));



	return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],

	    ha->efi_revision[0]);

}



static ssize_t

qla2x00_optrom_fcode_version_show(struct class_device *cdev, char *buf)

{

	scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));



	return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],

	    ha->fcode_revision[0]);

}



static ssize_t

qla2x00_optrom_fw_version_show(struct class_device *cdev, char *buf)

{

	scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));



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

	    ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],

	    ha->fw_revision[3]);

}



static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show,

	NULL);

static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
@@ -669,6 +706,14 @@ static CLASS_DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show, 
    qla2x00_zio_timer_store);

static CLASS_DEVICE_ATTR(beacon, S_IRUGO | S_IWUSR, qla2x00_beacon_show,

    qla2x00_beacon_store);

static CLASS_DEVICE_ATTR(optrom_bios_version, S_IRUGO,

    qla2x00_optrom_bios_version_show, NULL);

static CLASS_DEVICE_ATTR(optrom_efi_version, S_IRUGO,

    qla2x00_optrom_efi_version_show, NULL);

static CLASS_DEVICE_ATTR(optrom_fcode_version, S_IRUGO,

    qla2x00_optrom_fcode_version_show, NULL);

static CLASS_DEVICE_ATTR(optrom_fw_version, S_IRUGO,

    qla2x00_optrom_fw_version_show, NULL);



struct class_device_attribute *qla2x00_host_attrs[] = {

	&class_device_attr_driver_version,
@@ -683,6 +728,10 @@ struct class_device_attribute *qla2x00_host_attrs[] = { 
	&class_device_attr_zio,

	&class_device_attr_zio_timer,

	&class_device_attr_beacon,

	&class_device_attr_optrom_bios_version,

	&class_device_attr_optrom_efi_version,

	&class_device_attr_optrom_fcode_version,

	&class_device_attr_optrom_fw_version,

	NULL,

};

drivers/scsi/qla2xxx/qla_def.h

+11 −0
Original line number Diff line number Diff line
@@ -2044,6 +2044,8 @@ struct isp_operations { 
		uint32_t, uint32_t);

	int (*write_optrom) (struct scsi_qla_host *, uint8_t *, uint32_t,

		uint32_t);



	int (*get_flash_version) (struct scsi_qla_host *, void *);

};



/* MSI-X Support *************************************************************/
@@ -2400,6 +2402,15 @@ typedef struct scsi_qla_host { 
#define QLA_SREADING	1

#define QLA_SWRITING	2



        /* PCI expansion ROM image information. */

#define ROM_CODE_TYPE_BIOS	0

#define ROM_CODE_TYPE_FCODE	1

#define ROM_CODE_TYPE_EFI	3

	uint8_t		bios_revision[2];

	uint8_t		efi_revision[2];

	uint8_t		fcode_revision[16];

	uint32_t	fw_revision[4];



	/* Needed for BEACON */

	uint16_t	beacon_blink_led;

	uint8_t		beacon_color_state;

drivers/scsi/qla2xxx/qla_gbl.h

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ extern uint8_t *qla24xx_read_optrom_data(struct scsi_qla_host *, uint8_t *, 
extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,

    uint32_t, uint32_t);



extern int qla2x00_get_flash_version(scsi_qla_host_t *, void *);

extern int qla24xx_get_flash_version(scsi_qla_host_t *, void *);



/*

 * Global Function Prototypes in qla_dbg.c source file.

 */

drivers/scsi/qla2xxx/qla_init.c

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha) 


	ha->isp_ops.reset_chip(ha);



	ha->isp_ops.get_flash_version(ha, ha->request_ring);



	qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");



	ha->isp_ops.nvram_config(ha);
@@ -3109,6 +3111,8 @@ qla2x00_abort_isp(scsi_qla_host_t *ha) 
		}

		spin_unlock_irqrestore(&ha->hardware_lock, flags);



		ha->isp_ops.get_flash_version(ha, ha->request_ring);



		ha->isp_ops.nvram_config(ha);



		if (!qla2x00_restart_isp(ha)) {

drivers/scsi/qla2xxx/qla_os.c

+2 −0
Original line number Diff line number Diff line
@@ -1482,6 +1482,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	ha->isp_ops.fw_dump		= qla2100_fw_dump;

	ha->isp_ops.read_optrom		= qla2x00_read_optrom_data;

	ha->isp_ops.write_optrom	= qla2x00_write_optrom_data;

	ha->isp_ops.get_flash_version	= qla2x00_get_flash_version;

	if (IS_QLA2100(ha)) {

		host->max_id = MAX_TARGETS_2100;

		ha->mbx_count = MAILBOX_REGISTER_COUNT_2100;
@@ -1547,6 +1548,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		ha->isp_ops.beacon_on = qla24xx_beacon_on;

		ha->isp_ops.beacon_off = qla24xx_beacon_off;

		ha->isp_ops.beacon_blink = qla24xx_beacon_blink;

		ha->isp_ops.get_flash_version = qla24xx_get_flash_version;

		ha->gid_list_info_size = 8;

		ha->optrom_size = OPTROM_SIZE_24XX;

	}