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

Commit 7ad633c0 authored by Harish Zunjarrao's avatar Harish Zunjarrao Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Added vendor specific sysfs attributes 



Added fw_version, serial_num, iscsi version and boot loader version
sysfs attributes.

Signed-off-by: default avatarHarish Zunjarrao <harish.zunjarrao@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
parent 8f0722ca

drivers/scsi/qla4xxx/Makefile

+1 −1
Original line number Diff line number Diff line 
qla4xxx-y := ql4_os.o ql4_init.o ql4_mbx.o ql4_iocb.o ql4_isr.o \

		ql4_nx.o ql4_nvram.o ql4_dbg.o

		ql4_nx.o ql4_nvram.o ql4_dbg.o ql4_attr.o



obj-$(CONFIG_SCSI_QLA_ISCSI) += qla4xxx.o

drivers/scsi/qla4xxx/ql4_attr.c

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * QLogic iSCSI HBA Driver

 * Copyright (c)  2003-2011 QLogic Corporation

 *

 * See LICENSE.qla4xxx for copyright and licensing details.

 */



#include "ql4_def.h"

#include "ql4_glbl.h"

#include "ql4_dbg.h"



/* Scsi_Host attributes. */

static ssize_t

qla4xxx_fw_version_show(struct device *dev,

			struct device_attribute *attr, char *buf)

{

	struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));



	if (is_qla8022(ha))

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

				ha->firmware_version[0],

				ha->firmware_version[1],

				ha->patch_number, ha->build_number);

	else

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

				ha->firmware_version[0],

				ha->firmware_version[1],

				ha->patch_number, ha->build_number);

}



static ssize_t

qla4xxx_serial_num_show(struct device *dev, struct device_attribute *attr,

			char *buf)

{

	struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));

	return snprintf(buf, PAGE_SIZE, "%s\n", ha->serial_number);

}



static ssize_t

qla4xxx_iscsi_version_show(struct device *dev, struct device_attribute *attr,

			   char *buf)

{

	struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));

	return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->iscsi_major,

			ha->iscsi_minor);

}



static ssize_t

qla4xxx_optrom_version_show(struct device *dev, struct device_attribute *attr,

			    char *buf)

{

	struct scsi_qla_host *ha = to_qla_host(class_to_shost(dev));

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

			ha->bootload_major, ha->bootload_minor,

			ha->bootload_patch, ha->bootload_build);

}



static DEVICE_ATTR(fw_version, S_IRUGO, qla4xxx_fw_version_show, NULL);

static DEVICE_ATTR(serial_num, S_IRUGO, qla4xxx_serial_num_show, NULL);

static DEVICE_ATTR(iscsi_version, S_IRUGO, qla4xxx_iscsi_version_show, NULL);

static DEVICE_ATTR(optrom_version, S_IRUGO, qla4xxx_optrom_version_show, NULL);



struct device_attribute *qla4xxx_host_attrs[] = {

	&dev_attr_fw_version,

	&dev_attr_serial_num,

	&dev_attr_iscsi_version,

	&dev_attr_optrom_version,

	NULL,

};

drivers/scsi/qla4xxx/ql4_def.h

+8 −0
Original line number Diff line number Diff line
@@ -583,6 +583,14 @@ struct scsi_qla_host { 
	uint32_t nx_reset_timeout;



	struct completion mbx_intr_comp;



	/* --- From About Firmware --- */

	uint16_t iscsi_major;

	uint16_t iscsi_minor;

	uint16_t bootload_major;

	uint16_t bootload_minor;

	uint16_t bootload_patch;

	uint16_t bootload_build;

};



static inline int is_ipv4_enabled(struct scsi_qla_host *ha)

drivers/scsi/qla4xxx/ql4_fw.h

+23 −0
Original line number Diff line number Diff line
@@ -690,6 +690,29 @@ struct mbx_sys_info { 
	uint8_t reserved[12];		  /* 34-3f */

};



struct about_fw_info {

	uint16_t fw_major;		/* 00 - 01 */

	uint16_t fw_minor;		/* 02 - 03 */

	uint16_t fw_patch;		/* 04 - 05 */

	uint16_t fw_build;		/* 06 - 07 */

	uint8_t fw_build_date[16];	/* 08 - 17 ASCII String */

	uint8_t fw_build_time[16];	/* 18 - 27 ASCII String */

	uint8_t fw_build_user[16];	/* 28 - 37 ASCII String */

	uint16_t fw_load_source;	/* 38 - 39 */

					/* 1 = Flash Primary,

					   2 = Flash Secondary,

					   3 = Host Download

					*/

	uint8_t reserved1[6];		/* 3A - 3F */

	uint16_t iscsi_major;		/* 40 - 41 */

	uint16_t iscsi_minor;		/* 42 - 43 */

	uint16_t bootload_major;	/* 44 - 45 */

	uint16_t bootload_minor;	/* 46 - 47 */

	uint16_t bootload_patch;	/* 48 - 49 */

	uint16_t bootload_build;	/* 4A - 4B */

	uint8_t reserved2[180];		/* 4C - FF */

};



struct crash_record {

	uint16_t fw_major_version;	/* 00 - 01 */

	uint16_t fw_minor_version;	/* 02 - 03 */

drivers/scsi/qla4xxx/ql4_glbl.h

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct ddb_entry *qla4xxx_alloc_sess(struct scsi_qla_host *ha); 
int qla4xxx_add_sess(struct ddb_entry *);

void qla4xxx_destroy_sess(struct ddb_entry *ddb_entry);

int qla4xxx_is_nvram_configuration_valid(struct scsi_qla_host *ha);

int qla4xxx_get_fw_version(struct scsi_qla_host * ha);

int qla4xxx_about_firmware(struct scsi_qla_host *ha);

void qla4xxx_interrupt_service_routine(struct scsi_qla_host *ha,

				       uint32_t intr_status);

int qla4xxx_init_rings(struct scsi_qla_host *ha);
@@ -139,4 +139,5 @@ extern int ql4xextended_error_logging; 
extern int ql4xdontresethba;

extern int ql4xenablemsix;



extern struct device_attribute *qla4xxx_host_attrs[];

#endif /* _QLA4x_GBL_H */