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: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit c22fa50b2d41f3091d2ab0acf60ffdedb7ccd765)

Orabug: 27587343
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index e47cfbfca087f2f06740411fac98dde02c8c47bb..f1328629049ed7a8e4071b4247e5f56b11b2dc73 100644 (file)
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -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 */

diff --git a/drivers/scsi/fnic/fnic_io.h b/drivers/scsi/fnic/fnic_io.h
index c35b8f1889ea0683328d315b78c838d5947a5fa4..e0bc659ed71fc8faa0326594eac3d786043f34ef 100644 (file)
--- a/drivers/scsi/fnic/fnic_io.h
+++ b/drivers/scsi/fnic/fnic_io.h
@@ -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_ */

diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index c91e1e8fa4a92b358b3ea90466f432ac57b6d215..3a9524866c01304e74389300ade099801ee1f879 100644 (file)
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -177,11 +177,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;
        }
 }