scsi: lpfc: Fix pt2pt connection does not recover after LOGO

On a pt2pt setup, between 2 initiators, if one side issues a a LOGO, there
is no relogin attempt. The FC specs are grey in this area on which port
(higher wwn or not) is to re-login.

As there is no spec guidance, unconditionally re-PLOGI after the logout to
ensure a login is re-established.

Link: https://lore.kernel.org/r/20210301171821.3427-8-jsmart2021@gmail.com
Co-developed-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 135d8e8a42ba2dba46b6c36cafa3036991a81d87..4918423960d6301879965b5549286e4b0e0d2c62 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -913,9 +913,14 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                }
        } else if ((!(ndlp->nlp_type & NLP_FABRIC) &&
                ((ndlp->nlp_type & NLP_FCP_TARGET) ||
-               !(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||
+               (ndlp->nlp_type & NLP_NVME_TARGET) ||
+               (vport->fc_flag & FC_PT2PT))) ||
                (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
-               /* Only try to re-login if this is NOT a Fabric Node */
+               /* Only try to re-login if this is NOT a Fabric Node
+                * AND the remote NPORT is a FCP/NVME Target or we
+                * are in pt2pt mode. NLP_STE_ADISC_ISSUE is a special
+                * case for LOGO as a response to ADISC behavior.
+                */
                mod_timer(&ndlp->nlp_delayfunc,
                          jiffies + msecs_to_jiffies(1000 * 1));
                spin_lock_irq(&ndlp->lock);