[SCSI] ibmvfc: Delay NPIV login retry and add retries

Adds a delay prior to retrying a failed NPIV login. This fixes
a scenario if the backing fibre channel adapter is getting reset
due to an EEH event, NPIV login will fail. Currently, ibmvfc
retries three times very quickly, resets the CRQ and tries one
more time. If the adapter is getting reset due to EEH, this isn't
enough time. This adds a delay prior to retrying a failed NPIV
login and also increments the number of retries.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 15 insertions, 6 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 8715a7b140cc..2aa3d695d548 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -561,7 +561,7 @@ static void ibmvfc_init_host(struct ibmvfc_host *vhost, int relogin)
         struct ibmvfc_target *tgt;
 
         if (vhost->action == IBMVFC_HOST_ACTION_INIT_WAIT) {
-                if (++vhost->init_retries > IBMVFC_MAX_INIT_RETRIES) {
+                if (++vhost->init_retries > IBMVFC_MAX_HOST_INIT_RETRIES) {
                         dev_err(vhost->dev,
                                 "Host initialization retries exceeded. Taking adapter offline\n");
                         ibmvfc_link_down(vhost, IBMVFC_HOST_OFFLINE);
@@ -845,11 +845,12 @@ static void ibmvfc_reset_host(struct ibmvfc_host *vhost)
 static void ibmvfc_retry_host_init(struct ibmvfc_host *vhost)
 {
         if (vhost->action == IBMVFC_HOST_ACTION_INIT_WAIT) {
-                if (++vhost->init_retries > IBMVFC_MAX_INIT_RETRIES) {
+                vhost->delay_init = 1;
+                if (++vhost->init_retries > IBMVFC_MAX_HOST_INIT_RETRIES) {
                         dev_err(vhost->dev,
                                 "Host initialization retries exceeded. Taking adapter offline\n");
                         ibmvfc_link_down(vhost, IBMVFC_HOST_OFFLINE);
-                } else if (vhost->init_retries == IBMVFC_MAX_INIT_RETRIES)
+                } else if (vhost->init_retries == IBMVFC_MAX_HOST_INIT_RETRIES)
                         __ibmvfc_reset_host(vhost);
                 else
                         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT);
@@ -2756,7 +2757,7 @@ static void ibmvfc_init_tgt(struct ibmvfc_target *tgt,
 static void ibmvfc_retry_tgt_init(struct ibmvfc_target *tgt,
                                   void (*job_step) (struct ibmvfc_target *))
 {
-        if (++tgt->init_retries > IBMVFC_MAX_INIT_RETRIES) {
+        if (++tgt->init_retries > IBMVFC_MAX_TGT_INIT_RETRIES) {
                 ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
                 wake_up(&tgt->vhost->work_wait_q);
         } else
@@ -3613,7 +3614,13 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                 break;
         case IBMVFC_HOST_ACTION_INIT:
                 BUG_ON(vhost->state != IBMVFC_INITIALIZING);
-                vhost->job_step(vhost);
+                if (vhost->delay_init) {
+                        vhost->delay_init = 0;
+                        spin_unlock_irqrestore(vhost->host->host_lock, flags);
+                        ssleep(5);
+                        return;
+                } else
+                        vhost->job_step(vhost);
                 break;
         case IBMVFC_HOST_ACTION_QUERY:
                 list_for_each_entry(tgt, &vhost->targets, queue)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index d6bae941c566..cf02216dc8db 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -43,7 +43,8 @@
 #define IBMVFC_MAX_DISC_THREADS 4
 #define IBMVFC_TGT_MEMPOOL_SZ           64
 #define IBMVFC_MAX_CMDS_PER_LUN 64
-#define IBMVFC_MAX_INIT_RETRIES 3
+#define IBMVFC_MAX_HOST_INIT_RETRIES    6
+#define IBMVFC_MAX_TGT_INIT_RETRIES             3
 #define IBMVFC_DEV_LOSS_TMO             (5 * 60)
 #define IBMVFC_DEFAULT_LOG_LEVEL        2
 #define IBMVFC_MAX_CDB_LEN              16
@@ -673,6 +674,7 @@ struct ibmvfc_host {
         int discovery_threads;
         int client_migrated;
         int reinit;
+        int delay_init;
         int events_to_log;
 #define IBMVFC_AE_LINKUP        0x0001
 #define IBMVFC_AE_LINKDOWN      0x0002