[SCSI] lpfc 8.3.13: FC Discovery Fixes and enhancements.

- Retry PLOGI up to 48 times when LS_RJT reason is
  "Unable to supply requested data."
- When dev loss timeout occures do not change state if there
  is an outstanding REG_LOGIN.
- Add logic to ignore REG_LOGIN completion if discovery is
  restarted while waiting for REG_LOGIN.
- Only change state on REG_LOGIN completion if still in
  state waiting for REG_LOGIN completion.
- Only send ADISCs to FCP-2 Targets (not Initiators).

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index b90820a699fd..9810b3d3cc53 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -626,7 +626,8 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         if (!(vport->fc_flag & FC_PT2PT)) {
                 /* Check config parameter use-adisc or FCP-2 */
                 if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
-                    ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
+                    ((ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) &&
+                     (ndlp->nlp_type & NLP_FCP_TARGET))) {
                         spin_lock_irq(shost->host_lock);
                         ndlp->nlp_flag |= NLP_NPR_ADISC;
                         spin_unlock_irq(shost->host_lock);
@@ -962,6 +963,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_fdmi_reg_login;
                         break;
                 default:
+                        ndlp->nlp_flag |= NLP_REG_LOGIN_SEND;
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
                 }
                 mbox->context2 = lpfc_nlp_get(ndlp);
@@ -972,6 +974,8 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
                                            NLP_STE_REG_LOGIN_ISSUE);
                         return ndlp->nlp_state;
                 }
+                if (ndlp->nlp_flag & NLP_REG_LOGIN_SEND)
+                        ndlp->nlp_flag &= ~NLP_REG_LOGIN_SEND;
                 /* decrement node reference count to the failed mbox
                  * command
                  */
@@ -1458,6 +1462,7 @@ lpfc_device_recov_reglogin_issue(struct lpfc_vport *vport,
         ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(shost->host_lock);
+        ndlp->nlp_flag |= NLP_IGNR_REG_CMPL;
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(shost->host_lock);
         lpfc_disc_set_adisc(vport, ndlp);