Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

5 files changed, 24 insertions, 4 deletions

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index d9e15210b110..5caf5f3ff642 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -64,9 +64,9 @@ int		max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS;
 u32     bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;
 u32     *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2;
 
-#define BFAD_FW_FILE_CB         "cbfw-3.2.3.0.bin"
-#define BFAD_FW_FILE_CT         "ctfw-3.2.3.0.bin"
-#define BFAD_FW_FILE_CT2        "ct2fw-3.2.3.0.bin"
+#define BFAD_FW_FILE_CB         "cbfw-3.2.5.1.bin"
+#define BFAD_FW_FILE_CT         "ctfw-3.2.5.1.bin"
+#define BFAD_FW_FILE_CT2        "ct2fw-3.2.5.1.bin"
 
 static u32 *bfad_load_fwimg(struct pci_dev *pdev);
 static void bfad_free_fwimg(void);
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h
index f9e862093a25..cfcfff48e8e1 100644
--- a/drivers/scsi/bfa/bfad_drv.h
+++ b/drivers/scsi/bfa/bfad_drv.h
@@ -58,7 +58,7 @@
 #ifdef BFA_DRIVER_VERSION
 #define BFAD_DRIVER_VERSION    BFA_DRIVER_VERSION
 #else
-#define BFAD_DRIVER_VERSION    "3.2.25.0"
+#define BFAD_DRIVER_VERSION    "3.2.25.1"
 #endif
 
 #define BFAD_PROTO_NAME FCPI_NAME
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 9ddc9200e0a4..9e4b7709043e 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -248,6 +248,7 @@ struct fnic {
         struct completion *remove_wait; /* device remove thread blocks */
 
         atomic_t in_flight;             /* io counter */
+        bool internal_reset_inprogress;
         u32 _reserved;                  /* fill hole */
         unsigned long state_flags;      /* protected by host lock */
         enum fnic_state state;
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 2544a37ece0a..adb3d5871e74 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -2581,6 +2581,19 @@ int fnic_host_reset(struct scsi_cmnd *sc)
         unsigned long wait_host_tmo;
         struct Scsi_Host *shost = sc->device->host;
         struct fc_lport *lp = shost_priv(shost);
+        struct fnic *fnic = lport_priv(lp);
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        if (fnic->internal_reset_inprogress == 0) {
+                fnic->internal_reset_inprogress = 1;
+        } else {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                        "host reset in progress skipping another host reset\n");
+                return SUCCESS;
+        }
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
 
         /*
          * If fnic_reset is successful, wait for fabric login to complete
@@ -2601,6 +2614,9 @@ int fnic_host_reset(struct scsi_cmnd *sc)
                 }
         }
 
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->internal_reset_inprogress = 0;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
         return ret;
 }
 
diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c
index 396b32dca074..7cf70aaec0ba 100644
--- a/drivers/scsi/snic/snic_main.c
+++ b/drivers/scsi/snic/snic_main.c
@@ -591,6 +591,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!pool) {
                 SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n");
 
+                ret = -ENOMEM;
                 goto err_free_res;
         }
 
@@ -601,6 +602,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!pool) {
                 SNIC_HOST_ERR(shost, "max sgl pool creation failed\n");
 
+                ret = -ENOMEM;
                 goto err_free_dflt_sgl_pool;
         }
 
@@ -611,6 +613,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!pool) {
                 SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n");
 
+                ret = -ENOMEM;
                 goto err_free_max_sgl_pool;
         }