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

Commit 22661e25 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Fix displaying the FW Version from driver. 



The mgmt_hba_attributes structure declared was not proper and
because of that the FW response returned for the MBX_CMD was not
matching. This issue went unnoticed as mgmt_hba_attribs structure
members were never used in the code path.

This fix of displaying the FW version had to change the mgmt_hba_attrib
structure also. The latest driver will also work with the older FW as
the issue was in the driver declaration.

Signed-off-by: default avatarJohn Soni Jose <sony.john-n@emulex.com>
Signed-off-by: default avatarJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ef9e1b9b

drivers/scsi/be2iscsi/be_main.c

+2 −0
Original line number Diff line number Diff line
@@ -153,10 +153,12 @@ BEISCSI_RW_ATTR(log_enable, 0x00, 


DEVICE_ATTR(beiscsi_drvr_ver, S_IRUGO, beiscsi_drvr_ver_disp, NULL);

DEVICE_ATTR(beiscsi_adapter_family, S_IRUGO, beiscsi_adap_family_disp, NULL);

DEVICE_ATTR(beiscsi_fw_ver, S_IRUGO, beiscsi_fw_ver_disp, NULL);

struct device_attribute *beiscsi_attrs[] = {

	&dev_attr_beiscsi_log_enable,

	&dev_attr_beiscsi_drvr_ver,

	&dev_attr_beiscsi_adapter_family,

	&dev_attr_beiscsi_fw_ver,

	NULL,

};

drivers/scsi/be2iscsi/be_main.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define BEISCSI_MAX_NUM_CPUS	7

#define OC_SKH_MAX_NUM_CPUS	31



#define BEISCSI_VER_STRLEN 32



#define BEISCSI_SGLIST_ELEMENTS	30
@@ -341,6 +342,7 @@ struct beiscsi_hba { 
	struct delayed_work beiscsi_hw_check_task;



	u8 mac_address[ETH_ALEN];

	char fw_ver_str[BEISCSI_VER_STRLEN];

	char wq_name[20];

	struct workqueue_struct *wq;	/* The actuak work queue */

	struct be_ctrl_info ctrl;

drivers/scsi/be2iscsi/be_mgmt.c

+21 −0
Original line number Diff line number Diff line
@@ -368,6 +368,8 @@ int mgmt_check_supported_fw(struct be_ctrl_info *ctrl, 
		beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,

			    "BM_%d : phba->fw_config.iscsi_features = %d\n",

			    phba->fw_config.iscsi_features);

		memcpy(phba->fw_ver_str, resp->params.hba_attribs.

		       firmware_version_string, BEISCSI_VER_STRLEN);

	} else

		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

			    "BG_%d :  Failed in mgmt_check_supported_fw\n");
@@ -1259,6 +1261,25 @@ beiscsi_drvr_ver_disp(struct device *dev, struct device_attribute *attr, 
	return snprintf(buf, PAGE_SIZE, BE_NAME "\n");

}



/**

 * beiscsi_fw_ver_disp()- Display Firmware Version

 * @dev: ptr to device not used.

 * @attr: device attribute, not used.

 * @buf: contains formatted text Firmware version

 *

 * return

 * size of the formatted string

 **/

ssize_t

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

		     char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct beiscsi_hba *phba = iscsi_host_priv(shost);



	return snprintf(buf, PAGE_SIZE, "%s\n", phba->fw_ver_str);

}



/**

 * beiscsi_adap_family_disp()- Display adapter family.

 * @dev: ptr to device to get priv structure

drivers/scsi/be2iscsi/be_mgmt.h

+17 −13
Original line number Diff line number Diff line
@@ -156,25 +156,25 @@ union invalidate_commands_params { 
} __packed;



struct mgmt_hba_attributes {

	u8 flashrom_version_string[32];

	u8 manufacturer_name[32];

	u8 flashrom_version_string[BEISCSI_VER_STRLEN];

	u8 manufacturer_name[BEISCSI_VER_STRLEN];

	u32 supported_modes;

	u8 seeprom_version_lo;

	u8 seeprom_version_hi;

	u8 rsvd0[2];

	u32 fw_cmd_data_struct_version;

	u32 ep_fw_data_struct_version;

	u32 future_reserved[12];

	u8 ncsi_version_string[12];

	u32 default_extended_timeout;

	u8 controller_model_number[32];

	u8 controller_model_number[BEISCSI_VER_STRLEN];

	u8 controller_description[64];

	u8 controller_serial_number[32];

	u8 ip_version_string[32];

	u8 firmware_version_string[32];

	u8 bios_version_string[32];

	u8 redboot_version_string[32];

	u8 driver_version_string[32];

	u8 fw_on_flash_version_string[32];

	u8 controller_serial_number[BEISCSI_VER_STRLEN];

	u8 ip_version_string[BEISCSI_VER_STRLEN];

	u8 firmware_version_string[BEISCSI_VER_STRLEN];

	u8 bios_version_string[BEISCSI_VER_STRLEN];

	u8 redboot_version_string[BEISCSI_VER_STRLEN];

	u8 driver_version_string[BEISCSI_VER_STRLEN];

	u8 fw_on_flash_version_string[BEISCSI_VER_STRLEN];

	u32 functionalities_supported;

	u16 max_cdblength;

	u8 asic_revision;
@@ -190,7 +190,8 @@ struct mgmt_hba_attributes { 
	u32 firmware_post_status;

	u32 hba_mtu[8];

	u8 iscsi_features;

	u8 future_u8[3];

	u8 asic_generation;

	u8 future_u8[2];

	u32 future_u32[3];

} __packed;
@@ -207,7 +208,7 @@ struct mgmt_controller_attributes { 
	u64 unique_identifier;

	u8 netfilters;

	u8 rsvd0[3];

	u8 future_u32[4];

	u32 future_u32[4];

} __packed;



struct be_mgmt_controller_attributes {
@@ -311,6 +312,9 @@ int mgmt_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag); 
ssize_t beiscsi_drvr_ver_disp(struct device *dev,

			       struct device_attribute *attr, char *buf);



ssize_t beiscsi_fw_ver_disp(struct device *dev,

			     struct device_attribute *attr, char *buf);



ssize_t beiscsi_adap_family_disp(struct device *dev,

				  struct device_attribute *attr, char *buf);