scsi: lpfc: Qualify ndlp discovery state when processing RSCN

Conditionalize when to put an ndlp into recovery mode when processing
RSCNs.  As long as an ndlp state is beyond a PLOGI issue and has been
mapped to a transport layer before, the ndlp qualifies to be put into
recovery mode.  Otherwise, treat the ndlp rport normally through the
discovery engine.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20230712180522.112722-5-justintee8345@gmail.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 499849b58ee47ba530adfeaf860e558a85c1a21a..b4303254744ab97324665b1b135a976364f59f52 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -5757,8 +5757,11 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
                             (NLP_FCP_TARGET | NLP_NVME_TARGET)))
                                return NULL;
 
-                       lpfc_disc_state_machine(vport, ndlp, NULL,
-                                               NLP_EVT_DEVICE_RECOVERY);
+                       if (ndlp->nlp_state > NLP_STE_UNUSED_NODE &&
+                           ndlp->nlp_state < NLP_STE_NPR_NODE) {
+                               lpfc_disc_state_machine(vport, ndlp, NULL,
+                                                       NLP_EVT_DEVICE_RECOVERY);
+                       }
 
                        spin_lock_irq(&ndlp->lock);
                        ndlp->nlp_flag |= NLP_NPR_2B_DISC;