Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly updates of the usual suspects: lpfc, qla2xxx, bnx2fc,
  qedf, hpsa, hisi_sas, smartpqi, cxlflash, aacraid, csiostor along with
  a host of minor and miscellaneous changes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (276 commits)
  qla2xxx: Fix NVMe entry_type for iocb packet on BE system
  scsi: qla2xxx: avoid unused-function warning
  scsi: snic: fix a couple of spelling mistakes/typos
  scsi: qla2xxx: fix a bunch of typos and spelling mistakes
  scsi: lpfc: don't double count abort errors
  scsi: lpfc: spin_lock_irq() is not nestable
  scsi: hisi_sas: optimise DMA slot memory
  scsi: ibmvfc: constify dev_pm_ops structures.
  scsi: ibmvscsi: constify dev_pm_ops structures.
  scsi: cxlflash: Update debug prints in reset handlers
  scsi: cxlflash: Update send_tmf() parameters
  scsi: cxlflash: Avoid double free of character device
  scsi: Add STARGET_CREATED_REMOVE state to scsi_target_state
  scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
  scsi: ufs: flush eh_work when eh_work scheduled.
  scsi: qla2xxx: Protect access to qpair members with qpair->qp_lock
  scsi: sun_esp: fix device reference leaks
  scsi: fnic: changing queue command to return result DID_IMM_RETRY when rport is init
  scsi: fnic: correct speed display and add support for 25,40 and 100G
  scsi: fnic: added timestamp reporting in fnic debug stats
  ...

7 files changed, 92 insertions, 4 deletions

diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index d6498fabe628..5e3d909cfc53 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -632,6 +632,7 @@ static ssize_t fnic_reset_stats_write(struct file *file,
                         sizeof(struct io_path_stats) - sizeof(u64));
                 memset(fw_stats_p+1, 0,
                         sizeof(struct fw_stats) - sizeof(u64));
+                getnstimeofday(&stats->stats_timestamps.last_reset_time);
         }
 
         (*ppos)++;
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index e72becaad8a5..999fc7547560 100644
--- 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 c35b8f1889ea..e0bc659ed71f 100644
--- 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 ba58b7953263..aacadbf20b69 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -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;
         }
 }
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index d048f3b5006f..6c0646d62dfb 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -466,15 +466,27 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
         }
 
         rp = rport->dd_data;
-        if (!rp || rp->rp_state != RPORT_ST_READY) {
+        if (!rp || rp->rp_state == RPORT_ST_DELETE) {
                 FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
-                                "returning DID_NO_CONNECT for IO as rport is removed\n");
+                        "rport 0x%x removed, returning DID_NO_CONNECT\n",
+                        rport->port_id);
+
                 atomic64_inc(&fnic_stats->misc_stats.rport_not_ready);
                 sc->result = DID_NO_CONNECT<<16;
                 done(sc);
                 return 0;
         }
 
+        if (rp->rp_state != RPORT_ST_READY) {
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                        "rport 0x%x in state 0x%x, returning DID_IMM_RETRY\n",
+                        rport->port_id, rp->rp_state);
+
+                sc->result = DID_IMM_RETRY << 16;
+                done(sc);
+                return 0;
+        }
+
         if (lp->state != LPORT_ST_READY || !(lp->link_up))
                 return SCSI_MLQUEUE_HOST_BUSY;
 
@@ -633,6 +645,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic,
 
         atomic64_set(&fnic->fnic_stats.fw_stats.active_fw_reqs, 0);
         atomic64_set(&fnic->fnic_stats.io_stats.active_ios, 0);
+        atomic64_set(&fnic->io_cmpl_skip, 0);
 
         spin_lock_irqsave(&fnic->fnic_lock, flags);
 
diff --git a/drivers/scsi/fnic/fnic_stats.h b/drivers/scsi/fnic/fnic_stats.h
index 88c73cccb015..e007feedbf72 100644
--- a/drivers/scsi/fnic/fnic_stats.h
+++ b/drivers/scsi/fnic/fnic_stats.h
@@ -16,6 +16,12 @@
  */
 #ifndef _FNIC_STATS_H_
 #define _FNIC_STATS_H_
+
+struct stats_timestamps {
+        struct timespec last_reset_time;
+        struct timespec last_read_time;
+};
+
 struct io_path_stats {
         atomic64_t active_ios;
         atomic64_t max_active_ios;
@@ -110,6 +116,7 @@ struct misc_stats {
 };
 
 struct fnic_stats {
+        struct stats_timestamps stats_timestamps;
         struct io_path_stats io_stats;
         struct abort_stats abts_stats;
         struct terminate_stats term_stats;
diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c
index b5ac5381a0d7..4826f596cb31 100644
--- a/drivers/scsi/fnic/fnic_trace.c
+++ b/drivers/scsi/fnic/fnic_trace.c
@@ -219,7 +219,31 @@ int fnic_get_stats_data(struct stats_debug_info *debug,
         int buf_size = debug->buf_size;
         struct timespec val1, val2;
 
+        getnstimeofday(&val1);
         len = snprintf(debug->debug_buffer + len, buf_size - len,
+                "------------------------------------------\n"
+                 "\t\tTime\n"
+                "------------------------------------------\n");
+
+        len += snprintf(debug->debug_buffer + len, buf_size - len,
+                "Current time :          [%ld:%ld]\n"
+                "Last stats reset time:  [%ld:%ld]\n"
+                "Last stats read time:   [%ld:%ld]\n"
+                "delta since last reset: [%ld:%ld]\n"
+                "delta since last read:  [%ld:%ld]\n",
+        val1.tv_sec, val1.tv_nsec,
+        stats->stats_timestamps.last_reset_time.tv_sec,
+        stats->stats_timestamps.last_reset_time.tv_nsec,
+        stats->stats_timestamps.last_read_time.tv_sec,
+        stats->stats_timestamps.last_read_time.tv_nsec,
+        timespec_sub(val1, stats->stats_timestamps.last_reset_time).tv_sec,
+        timespec_sub(val1, stats->stats_timestamps.last_reset_time).tv_nsec,
+        timespec_sub(val1, stats->stats_timestamps.last_read_time).tv_sec,
+        timespec_sub(val1, stats->stats_timestamps.last_read_time).tv_nsec);
+
+        stats->stats_timestamps.last_read_time = val1;
+
+        len += snprintf(debug->debug_buffer + len, buf_size - len,
                   "------------------------------------------\n"
                   "\t\tIO Statistics\n"
                   "------------------------------------------\n");