From: Quinn Tran <qutran@marvell.com>

Date: Wed, 8 Jun 2022 04:58:45 -0700

Subject: scsi: qla2xxx: edif: Fix session thrash

Patch-mainline: v5.20-rc1

Git-commit: a8fdfb0b39c2b31722c70bdf2272b949d5af4b7b

References: bsc#1201958

Current code prematurely sends out PRLI before authentication application

has given the OK to do so. This causes PRLI failure and session teardown.

Prevents PRLI from going out before authentication app gives the OK.

Link: https://lore.kernel.org/r/20220608115849.16693-7-njavali@marvell.com

Fixes: 91f6f5fbe87b ("scsi: qla2xxx: edif: Reduce connection thrash")

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

Signed-off-by: Quinn Tran <qutran@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_edif.c |    2 +-

 drivers/scsi/qla2xxx/qla_edif.h |    4 ++++

 drivers/scsi/qla2xxx/qla_init.c |   10 +++++++++-

 3 files changed, 14 insertions(+), 2 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_edif.c

+++ b/drivers/scsi/qla2xxx/qla_edif.c

@@ -3517,7 +3517,7 @@ int qla_edif_process_els(scsi_qla_host_t

 	if (qla_bsg_check(vha, bsg_job, fcport))

 		return 0;

-	if (fcport->loop_id == FC_NO_LOOP_ID) {

+	if (EDIF_SESS_DELETE(fcport)) {

 		ql_dbg(ql_dbg_edif, vha, 0x910d,

 		    "%s ELS code %x, no loop id.\n", __func__,

 		    bsg_request->rqst_data.r_els.els_code);

--- a/drivers/scsi/qla2xxx/qla_edif.h

+++ b/drivers/scsi/qla2xxx/qla_edif.h

@@ -141,4 +141,8 @@ struct enode {

 	(DBELL_ACTIVE(_fcport->vha) && \

 	 (_fcport->disc_state == DSC_LOGIN_AUTH_PEND))

+#define EDIF_SESS_DELETE(_s) \

+	(qla_ini_mode_enabled(_s->vha) && (_s->disc_state == DSC_DELETE_PEND || \

+	 _s->disc_state == DSC_DELETED))

+

 #endif	/* __QLA_EDIF_H */

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -1765,8 +1765,16 @@ int qla24xx_fcport_handle_login(struct s

 		break;

 	case DSC_LOGIN_PEND:

-		if (fcport->fw_login_state == DSC_LS_PLOGI_COMP)

+		if (vha->hw->flags.edif_enabled)

+			break;

+

+		if (fcport->fw_login_state == DSC_LS_PLOGI_COMP) {

+			ql_dbg(ql_dbg_disc, vha, 0x2118,

+			       "%s %d %8phC post %s PRLI\n",

+			       __func__, __LINE__, fcport->port_name,

+			       NVME_TARGET(vha->hw, fcport) ? "NVME" : "FC");

 			qla24xx_post_prli_work(vha, fcport);

+		}

 		break;

 	case DSC_UPD_FCPORT: