Commit c22fa50b authored by Satish Kharat's avatar Satish Kharat Committed by Martin K. Petersen
Browse files

scsi: fnic: correct speed display and add support for 25,40 and 100G 



Setting speed based on the vinc device parameter read during
linkup. Also adding support to display 25,40 and 100G

Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 43caa03f

drivers/scsi/fnic/fnic_fcs.c

+24 −0
Original line number Diff line number Diff line
@@ -65,6 +65,30 @@ void fnic_handle_link(struct work_struct *work) 
	fnic->link_status = vnic_dev_link_status(fnic->vdev);

	fnic->link_down_cnt = vnic_dev_link_down_cnt(fnic->vdev);



	switch (vnic_dev_port_speed(fnic->vdev)) {

	case DCEM_PORTSPEED_10G:

		fc_host_speed(fnic->lport->host)   = FC_PORTSPEED_10GBIT;

		fnic->lport->link_supported_speeds = FC_PORTSPEED_10GBIT;

		break;

	case DCEM_PORTSPEED_25G:

		fc_host_speed(fnic->lport->host)   = FC_PORTSPEED_25GBIT;

		fnic->lport->link_supported_speeds = FC_PORTSPEED_25GBIT;

		break;

	case DCEM_PORTSPEED_40G:

	case DCEM_PORTSPEED_4x10G:

		fc_host_speed(fnic->lport->host)   = FC_PORTSPEED_40GBIT;

		fnic->lport->link_supported_speeds = FC_PORTSPEED_40GBIT;

		break;

	case DCEM_PORTSPEED_100G:

		fc_host_speed(fnic->lport->host)   = FC_PORTSPEED_100GBIT;

		fnic->lport->link_supported_speeds = FC_PORTSPEED_100GBIT;

		break;

	default:

		fc_host_speed(fnic->lport->host)   = FC_PORTSPEED_UNKNOWN;

		fnic->lport->link_supported_speeds = FC_PORTSPEED_UNKNOWN;

		break;

	}



	if (old_link_status == fnic->link_status) {

		if (!fnic->link_status) {

			/* DOWN -> DOWN */

drivers/scsi/fnic/fnic_io.h

+9 −0
Original line number Diff line number Diff line
@@ -66,4 +66,13 @@ struct fnic_io_req { 
	struct completion *dr_done; /* completion for device reset */

};



enum fnic_port_speeds {

	DCEM_PORTSPEED_NONE = 0,

	DCEM_PORTSPEED_1G    = 1000,

	DCEM_PORTSPEED_10G   = 10000,

	DCEM_PORTSPEED_40G   = 40000,

	DCEM_PORTSPEED_4x10G = 41000,

	DCEM_PORTSPEED_25G   = 25000,

	DCEM_PORTSPEED_100G  = 100000,

};

#endif /* _FNIC_IO_H_ */

drivers/scsi/fnic/fnic_main.c

+12 −2
Original line number Diff line number Diff line
@@ -176,11 +176,21 @@ static void fnic_get_host_speed(struct Scsi_Host *shost) 


	/* Add in other values as they get defined in fw */

	switch (port_speed) {

	case 10000:

	case DCEM_PORTSPEED_10G:

		fc_host_speed(shost) = FC_PORTSPEED_10GBIT;

		break;

	case DCEM_PORTSPEED_25G:

		fc_host_speed(shost) = FC_PORTSPEED_25GBIT;

		break;

	case DCEM_PORTSPEED_40G:

	case DCEM_PORTSPEED_4x10G:

		fc_host_speed(shost) = FC_PORTSPEED_40GBIT;

		break;

	case DCEM_PORTSPEED_100G:

		fc_host_speed(shost) = FC_PORTSPEED_100GBIT;

		break;

	default:

		fc_host_speed(shost) = FC_PORTSPEED_10GBIT;

		fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE