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

Commit 26000db7 authored by John Soni Jose's avatar John Soni Jose Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Fix issue of displaying adapter family. 



Fix issue of displaying adapter family through the sysfs
entry for each Scsi_Host created for the adapter.

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 73133261

drivers/scsi/be2iscsi/be_main.c

+2 −0
Original line number Diff line number Diff line
@@ -152,9 +152,11 @@ BEISCSI_RW_ATTR(log_enable, 0x00, 
		"\t\t\t\tConfiguration Path	: 0x20\n");



DEVICE_ATTR(beiscsi_drvr_ver, S_IRUGO, beiscsi_drvr_ver_disp, NULL);

DEVICE_ATTR(beiscsi_adapter_family, S_IRUGO, beiscsi_adap_family_disp, NULL);

struct device_attribute *beiscsi_attrs[] = {

	&dev_attr_beiscsi_log_enable,

	&dev_attr_beiscsi_drvr_ver,

	&dev_attr_beiscsi_adapter_family,

	NULL,

};

drivers/scsi/be2iscsi/be_mgmt.c

+39 −0
Original line number Diff line number Diff line
@@ -1153,6 +1153,45 @@ beiscsi_drvr_ver_disp(struct device *dev, struct device_attribute *attr, 
	return snprintf(buf, PAGE_SIZE, BE_NAME "\n");

}



/**

 * beiscsi_adap_family_disp()- Display adapter family.

 * @dev: ptr to device to get priv structure

 * @attr: device attribute, not used.

 * @buf: contains formatted text driver name and version

 *

 * return

 * size of the formatted string

 **/

ssize_t

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

			  char *buf)

{

	uint16_t dev_id = 0;

	struct Scsi_Host *shost = class_to_shost(dev);

	struct beiscsi_hba *phba = iscsi_host_priv(shost);



	dev_id = phba->pcidev->device;

	switch (dev_id) {

	case BE_DEVICE_ID1:

	case OC_DEVICE_ID1:

	case OC_DEVICE_ID2:

		return snprintf(buf, PAGE_SIZE, "BE2 Adapter Family\n");

		break;

	case BE_DEVICE_ID2:

	case OC_DEVICE_ID3:

		return snprintf(buf, PAGE_SIZE, "BE3-R Adapter Family\n");

		break;

	case OC_SKH_ID1:

		return snprintf(buf, PAGE_SIZE, "Skyhawk-R Adapter Family\n");

		break;

	default:

		return snprintf(buf, PAGE_SIZE,

				"Unkown Adapter Family: 0x%x\n", dev_id);

		break;

	}

}





void beiscsi_offload_cxn_v0(struct beiscsi_offload_params *params,

			     struct wrb_handle *pwrb_handle,

			     struct be_mem_descriptor *mem_descr)

drivers/scsi/be2iscsi/be_mgmt.h

+3 −0
Original line number Diff line number Diff line
@@ -305,6 +305,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_adap_family_disp(struct device *dev,

				  struct device_attribute *attr, char *buf);



void beiscsi_offload_cxn_v0(struct beiscsi_offload_params *params,

			     struct wrb_handle *pwrb_handle,

			     struct be_mem_descriptor *mem_descr);