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

Pull first round of SCSI updates from James Bottomley:
 "This patch consists of the usual driver updates (megaraid_sas,
  scsi_debug, qla2xxx, qla4xxx, lpfc, bnx2fc, be2iscsi, hpsa, ipr) plus
  an assortment of minor fixes and the first precursors of SCSI-MQ (the
  code path simplifications) and the bug fix for the USB oops on remove
  (which involves an infrastructure change, so is sent via the main tree
  with a delayed backport after a cycle in which it is shown to
  introduce no new bugs)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (196 commits)
  [SCSI] sd: Quiesce mode sense error messages
  [SCSI] add support for per-host cmd pools
  [SCSI] simplify command allocation and freeing a bit
  [SCSI] megaraid: simplify internal command handling
  [SCSI] ses: Use vpd information from scsi_device
  [SCSI] Add EVPD page 0x83 and 0x80 to sysfs
  [SCSI] Return VPD page length in scsi_vpd_inquiry()
  [SCSI] scsi_sysfs: Implement 'is_visible' callback
  [SCSI] hpsa: update driver version to 3.4.4-1
  [SCSI] hpsa: fix bad endif placement in RAID 5 mapper code
  [SCSI] qla2xxx: Fix build errors related to invalid print fields on some architectures.
  [SCSI] bfa: Replace large udelay() with mdelay()
  [SCSI] vmw_pvscsi: Some improvements in pvscsi driver.
  [SCSI] vmw_pvscsi: Add support for I/O requests coalescing.
  [SCSI] vmw_pvscsi: Fix pvscsi_abort() function.
  [SCSI] remove deprecated IRQF_DISABLED from SCSI
  [SCSI] bfa: Updating Maintainers email ids
  [SCSI] ipr: Add new CCIN definition for Grand Canyon support
  [SCSI] ipr: Format HCAM overlay ID 0x21
  [SCSI] ipr: Use pci_enable_msi_range() and pci_enable_msix_range()
  ...

4 files changed, 28 insertions, 3 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 1ebf3fb683e6..6a976657b475 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -64,7 +64,7 @@
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
-#define BNX2FC_VERSION          "2.4.1"
+#define BNX2FC_VERSION          "2.4.2"
 
 #define PFX                     "bnx2fc: "
 
@@ -367,6 +367,7 @@ struct bnx2fc_rport {
         atomic_t num_active_ios;
         u32 flush_in_prog;
         unsigned long timestamp;
+        unsigned long retry_delay_timestamp;
         struct list_head free_task_list;
         struct bnx2fc_cmd *pending_queue[BNX2FC_SQ_WQES_MAX+1];
         struct list_head active_cmd_queue;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 9b948505d118..6287f6a8b79d 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
 
 #define DRV_MODULE_NAME         "bnx2fc"
 #define DRV_MODULE_VERSION      BNX2FC_VERSION
-#define DRV_MODULE_RELDATE      "Sep 17, 2013"
+#define DRV_MODULE_RELDATE      "Dec 11, 2013"
 
 
 static char version[] =
@@ -850,6 +850,9 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
                                 __bnx2fc_destroy(interface);
                 }
                 mutex_unlock(&bnx2fc_dev_lock);
+
+                /* Ensure ALL destroy work has been completed before return */
+                flush_workqueue(bnx2fc_wq);
                 return;
 
         default:
@@ -2389,6 +2392,9 @@ static void bnx2fc_ulp_exit(struct cnic_dev *dev)
                         __bnx2fc_destroy(interface);
         mutex_unlock(&bnx2fc_dev_lock);
 
+        /* Ensure ALL destroy work has been completed before return */
+        flush_workqueue(bnx2fc_wq);
+
         bnx2fc_ulp_stop(hba);
         /* unregister cnic device */
         if (test_and_clear_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic))
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index e9279a8c1e1c..32a5e0a2a669 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1871,7 +1871,15 @@ int bnx2fc_queuecommand(struct Scsi_Host *host,
                 rc = SCSI_MLQUEUE_TARGET_BUSY;
                 goto exit_qcmd;
         }
-
+        if (tgt->retry_delay_timestamp) {
+                if (time_after(jiffies, tgt->retry_delay_timestamp)) {
+                        tgt->retry_delay_timestamp = 0;
+                } else {
+                        /* If retry_delay timer is active, flow off the ML */
+                        rc = SCSI_MLQUEUE_TARGET_BUSY;
+                        goto exit_qcmd;
+                }
+        }
         io_req = bnx2fc_cmd_alloc(tgt);
         if (!io_req) {
                 rc = SCSI_MLQUEUE_HOST_BUSY;
@@ -1961,6 +1969,15 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,
                                  " fcp_resid = 0x%x\n",
                                 io_req->cdb_status, io_req->fcp_resid);
                         sc_cmd->result = (DID_OK << 16) | io_req->cdb_status;
+
+                        if (io_req->cdb_status == SAM_STAT_TASK_SET_FULL ||
+                            io_req->cdb_status == SAM_STAT_BUSY) {
+                                /* Set the jiffies + retry_delay_timer * 100ms
+                                   for the rport/tgt */
+                                tgt->retry_delay_timestamp = jiffies +
+                                        fcp_rsp->retry_delay_timer * HZ / 10;
+                        }
+
                 }
                 if (io_req->fcp_resid)
                         scsi_set_resid(sc_cmd, io_req->fcp_resid);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index d9bae5672273..6870cf6781d9 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -386,6 +386,7 @@ static int bnx2fc_init_tgt(struct bnx2fc_rport *tgt,
         tgt->rq_prod_idx = 0x8000;
         tgt->rq_cons_idx = 0;
         atomic_set(&tgt->num_active_ios, 0);
+        tgt->retry_delay_timestamp = 0;
 
         if (rdata->flags & FC_RP_FLAGS_RETRY &&
             rdata->ids.roles & FC_RPORT_ROLE_FCP_TARGET &&