1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index b9440deaad45..08d156a9094f 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -3122,6 +3122,13 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
                 case IOERR_SEQUENCE_TIMEOUT:
                 case IOERR_INVALID_RPI:
+                        if (cmd == ELS_CMD_PLOGI &&
+                            did == NameServer_DID) {
+                                /* Continue forever if plogi to */
+                                /* the nameserver fails */
+                                maxretry = 0;
+                                delay = 100;
+                        }
                         retry = 1;
                         break;
                 }
@@ -6517,7 +6524,8 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         struct lpfc_nodelist *ndlp;
         struct ls_rjt stat;
         uint32_t *payload;
-        uint32_t cmd, did, newnode, rjt_err = 0;
+        uint32_t cmd, did, newnode;
+        uint8_t rjt_exp, rjt_err = 0;
         IOCB_t *icmd = &elsiocb->iocb;
 
         if (!vport || !(elsiocb->context2))
@@ -6606,12 +6614,14 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 /* If Nport discovery is delayed, reject PLOGIs */
                 if (vport->fc_flag & FC_DISC_DELAYED) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         if (!(phba->pport->fc_flag & FC_PT2PT) ||
                                 (phba->pport->fc_flag & FC_PT2PT_PLOGI)) {
                                 rjt_err = LSRJT_UNABLE_TPC;
+                                rjt_exp = LSEXP_NOTHING_MORE;
                                 break;
                         }
                         /* We get here, and drop thru, if we are PT2PT with
@@ -6648,6 +6658,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 lpfc_send_els_event(vport, ndlp, payload);
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_LOGO);
@@ -6661,6 +6672,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 lpfc_send_els_event(vport, ndlp, payload);
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_PRLO);
@@ -6680,6 +6692,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 phba->fc_stat.elsRcvADISC++;
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 lpfc_disc_state_machine(vport, ndlp, elsiocb,
@@ -6693,6 +6706,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 phba->fc_stat.elsRcvPDISC++;
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 lpfc_disc_state_machine(vport, ndlp, elsiocb,
@@ -6730,6 +6744,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 phba->fc_stat.elsRcvPRLI++;
                 if (vport->port_state < LPFC_DISC_AUTH) {
                         rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_NOTHING_MORE;
                         break;
                 }
                 lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_PRLI);
@@ -6813,6 +6828,11 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 if (newnode)
                         lpfc_nlp_put(ndlp);
                 break;
+        case ELS_CMD_REC:
+                        /* receive this due to exchange closed */
+                        rjt_err = LSRJT_UNABLE_TPC;
+                        rjt_exp = LSEXP_INVALID_OX_RX;
+                break;
         default:
                 lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_UNSOL,
                         "RCV ELS cmd:     cmd:x%x did:x%x/ste:x%x",
@@ -6820,6 +6840,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
                 /* Unsupported ELS command, reject */
                 rjt_err = LSRJT_CMD_UNSUPPORTED;
+                rjt_exp = LSEXP_NOTHING_MORE;
 
                 /* Unknown ELS command <elsCmd> received from NPORT <did> */
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
@@ -6834,7 +6855,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         if (rjt_err) {
                 memset(&stat, 0, sizeof(stat));
                 stat.un.b.lsRjtRsnCode = rjt_err;
-                stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
+                stat.un.b.lsRjtRsnCodeExp = rjt_exp;
                 lpfc_els_rsp_reject(vport, stat.un.lsRjtError, elsiocb, ndlp,
                         NULL);
         }