From: Quinn Tran <quinn.tran@cavium.com>

Date: Tue, 1 May 2018 09:01:48 -0700

Subject: [PATCH] scsi: qla2xxx: Move GPSC and GFPNID out of session management

References: bsc#1086327,FATE#324903

Git-commit: cc28e0ace97c5615cc2333d98827751cd0d794d1

Patch-mainline: v4.18-rc1

Move GPSC & GFPNID commands out of session management to reduce time lag

in reporting the session state to remote port. These commands are not

essential when it comes to maintaining the rport state. Delay sending

these commands after rport state is set to Online.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>

Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>

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

Signed-off-by: Hannes Reinecke <hare@suse.de>

---

 drivers/scsi/qla2xxx/qla_def.h    |  3 +-

 drivers/scsi/qla2xxx/qla_gbl.h    |  3 +-

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

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

 drivers/scsi/qla2xxx/qla_os.c     |  4 ++

 drivers/scsi/qla2xxx/qla_target.c |  1 -

 6 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h

index 5c433b3d728f..bb7e7cf3689c 100644

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

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

@@ -2283,8 +2283,6 @@ enum discovery_state {

 	DSC_LOGIN_PEND,

 	DSC_LOGIN_FAILED,

 	DSC_GPDB,

-	DSC_GFPN_ID,

-	DSC_GPSC,

 	DSC_UPD_FCPORT,

 	DSC_LOGIN_COMPLETE,

 	DSC_ADISC,

@@ -3230,6 +3228,7 @@ enum qla_work_type {

 	QLA_EVT_GNNID,

 	QLA_EVT_GFPNID,

 	QLA_EVT_SP_RETRY,

+	QLA_EVT_IIDMA,

 };

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h

index 7373e63d13ad..04776fbb4a6f 100644

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

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

@@ -116,7 +116,8 @@ extern int qla2x00_post_async_prlo_work(struct scsi_qla_host *, fc_port_t *,

     uint16_t *);

 extern int qla2x00_post_async_prlo_done_work(struct scsi_qla_host *,

     fc_port_t *, uint16_t *);

-

+int qla_post_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);

+void qla_do_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);

 /*

  * Global Data in qla_os.c source file.

  */

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c

index fdc9b8f475c0..f77fff7bad29 100644

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

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

@@ -3185,7 +3185,6 @@ int qla24xx_async_gidpn(scsi_qla_host_t *vha, fc_port_t *fcport)

 done_free_sp:

 	sp->free(sp);

-	fcport->flags &= ~FCF_ASYNC_SENT;

 done:

 	fcport->flags &= ~FCF_ASYNC_ACTIVE;

 	return rval;

@@ -3249,7 +3248,7 @@ void qla24xx_handle_gpsc_event(scsi_qla_host_t *vha, struct event_arg *ea)

 		return;

 	}

-	qla24xx_post_upd_fcport_work(vha, ea->fcport);

+	qla_post_iidma_work(vha, fcport);

 }

 static void qla24xx_async_gpsc_sp_done(void *s, int res)

@@ -3267,8 +3266,6 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)

 	    "Async done-%s res %x, WWPN %8phC \n",

 	    sp->name, res, fcport->port_name);

-	fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

-

 	if (res == (DID_ERROR << 16)) {

 		/* entry status error */

 		goto done;

@@ -3337,7 +3334,6 @@ int qla24xx_async_gpsc(scsi_qla_host_t *vha, fc_port_t *fcport)

 	if (!sp)

 		goto done;

-	fcport->flags |= FCF_ASYNC_SENT;

 	sp->type = SRB_CT_PTHRU_CMD;

 	sp->name = "gpsc";

 	sp->gen1 = fcport->rscn_gen;

@@ -4554,7 +4550,6 @@ int qla24xx_async_gnnid(scsi_qla_host_t *vha, fc_port_t *fcport)

 done_free_sp:

 	sp->free(sp);

-	fcport->flags &= ~FCF_ASYNC_SENT;

 done:

 	return rval;

 }

@@ -4616,7 +4611,6 @@ static void qla2x00_async_gfpnid_sp_done(void *s, int res)

 	struct event_arg ea;

 	u64 wwn;

-	fcport->flags &= ~FCF_ASYNC_SENT;

 	wwn = wwn_to_u64(fpn);

 	if (wwn)

 		memcpy(fcport->fabric_port_name, fpn, WWN_SIZE);

@@ -4645,12 +4639,10 @@ int qla24xx_async_gfpnid(scsi_qla_host_t *vha, fc_port_t *fcport)

 	if (!vha->flags.online || (fcport->flags & FCF_ASYNC_SENT))

 		return rval;

-	fcport->disc_state = DSC_GFPN_ID;

 	sp = qla2x00_get_sp(vha, fcport, GFP_ATOMIC);

 	if (!sp)

 		goto done;

-	fcport->flags |= FCF_ASYNC_SENT;

 	sp->type = SRB_CT_PTHRU_CMD;

 	sp->name = "gfpnid";

 	sp->gen1 = fcport->rscn_gen;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c

index 83ab15bf5e23..f9e7a96b6ef3 100644

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

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

@@ -1023,30 +1023,11 @@ void __qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)

 		vha->fcport_count++;

 		ea->fcport->login_succ = 1;

-		if (!IS_IIDMA_CAPABLE(vha->hw) ||

-		    !vha->hw->flags.gpsc_supported) {

-			ql_dbg(ql_dbg_disc, vha, 0x20d6,

-			    "%s %d %8phC post upd_fcport fcp_cnt %d\n",

-			    __func__, __LINE__,  ea->fcport->port_name,

-			    vha->fcport_count);

-

-			qla24xx_post_upd_fcport_work(vha, ea->fcport);

-		} else {

-			if (ea->fcport->id_changed) {

-				ea->fcport->id_changed = 0;

-				ql_dbg(ql_dbg_disc, vha, 0x20d7,

-				    "%s %d %8phC post gfpnid fcp_cnt %d\n",

-				    __func__, __LINE__, ea->fcport->port_name,

-				    vha->fcport_count);

-				qla24xx_post_gfpnid_work(vha, ea->fcport);

-			} else {

-				ql_dbg(ql_dbg_disc, vha, 0x20d7,

-				    "%s %d %8phC post gpsc fcp_cnt %d\n",

-				    __func__, __LINE__, ea->fcport->port_name,

-				    vha->fcport_count);

-				qla24xx_post_gpsc_work(vha, ea->fcport);

-			}

-		}

+		ql_dbg(ql_dbg_disc, vha, 0x20d6,

+		    "%s %d %8phC post upd_fcport fcp_cnt %d\n",

+		    __func__, __LINE__,  ea->fcport->port_name,

+		    vha->fcport_count);

+		qla24xx_post_upd_fcport_work(vha, ea->fcport);

 	} else if (ea->fcport->login_succ) {

 		/*

 		 * We have an existing session. A late RSCN delivery

@@ -5052,6 +5033,24 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)

 	}

 }

+void qla_do_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport)

+{

+	qla2x00_iidma_fcport(vha, fcport);

+	qla24xx_update_fcport_fcp_prio(vha, fcport);

+}

+

+int qla_post_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport)

+{

+	struct qla_work_evt *e;

+

+	e = qla2x00_alloc_work(vha, QLA_EVT_IIDMA);

+	if (!e)

+		return QLA_FUNCTION_FAILED;

+

+	e->u.fcport.fcport = fcport;

+	return qla2x00_post_work(vha, e);

+}

+

 /* qla2x00_reg_remote_port is reserved for Initiator Mode only.*/

 static void

 qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)

@@ -5120,13 +5119,14 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)

 	if (IS_QLAFX00(vha->hw)) {

 		qla2x00_set_fcport_state(fcport, FCS_ONLINE);

-		goto reg_port;

+	} else {

+		fcport->login_retry = 0;

+		fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);

+		fcport->disc_state = DSC_LOGIN_COMPLETE;

+		fcport->deleted = 0;

+		fcport->logout_on_delete = 1;

+		qla2x00_set_fcport_state(fcport, FCS_ONLINE);

 	}

-	fcport->login_retry = 0;

-	fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);

-	fcport->disc_state = DSC_LOGIN_COMPLETE;

-	fcport->deleted = 0;

-	fcport->logout_on_delete = 1;

 	qla2x00_set_fcport_state(fcport, FCS_ONLINE);

 	qla2x00_iidma_fcport(vha, fcport);

@@ -5138,7 +5138,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)

 	qla24xx_update_fcport_fcp_prio(vha, fcport);

-reg_port:

 	switch (vha->host->active_mode) {

 	case MODE_INITIATOR:

 		qla2x00_reg_remote_port(vha, fcport);

@@ -5157,6 +5156,23 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)

 	default:

 		break;

 	}

+

+	if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {

+		if (fcport->id_changed) {

+			fcport->id_changed = 0;

+			ql_dbg(ql_dbg_disc, vha, 0x20d7,

+			    "%s %d %8phC post gfpnid fcp_cnt %d\n",

+			    __func__, __LINE__, fcport->port_name,

+			    vha->fcport_count);

+			qla24xx_post_gfpnid_work(vha, fcport);

+		} else {

+			ql_dbg(ql_dbg_disc, vha, 0x20d7,

+			    "%s %d %8phC post gpsc fcp_cnt %d\n",

+			    __func__, __LINE__, fcport->port_name,

+			    vha->fcport_count);

+			qla24xx_post_gpsc_work(vha, fcport);

+		}

+	}

 }

 /*

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c

index 85ee085f03af..4ff9c074cf76 100644

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

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

@@ -5036,6 +5036,10 @@ qla2x00_do_work(struct scsi_qla_host *vha)

 			break;

 		case QLA_EVT_SP_RETRY:

 			qla_sp_retry(vha, e);

+			break;

+		case QLA_EVT_IIDMA:

+			qla_do_iidma_work(vha, e->u.fcport.fcport);

+			break;

 		}

 		if (e->flags & QLA_EVT_FLAG_FREE)

 			kfree(e);

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c

index b65480efb516..531ed219ba6c 100644

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

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

@@ -4840,7 +4840,6 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,

 			switch (sess->disc_state) {

 			case DSC_LOGIN_PEND:

 			case DSC_GPDB:

-			case DSC_GPSC:

 			case DSC_UPD_FCPORT:

 			case DSC_LOGIN_COMPLETE:

 			case DSC_ADISC:

-- 

2.12.3