From 453f1d71efe9b3c00293d2812c3903ceac9935e2 Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 21 Nov 2019 16:36:48 -0500

Subject: [PATCH 138/155] [scsi] scsi: qla2xxx: Inline the

 qla2x00_fcport_event_handler() function

Message-id: <20191121163701.43688-14-hmadhani@redhat.com>

Patchwork-id: 287859

O-Subject: [RHLE 7.8 e-stor PATCH v3 13/26] scsi: qla2xxx: Inline the qla2x00_fcport_event_handler() function

Bugzilla: 1731581

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Ewan Milne <emilne@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Bart Van Assche <bvanassche@acm.org>

Bugzilla 1731581

Instead of calling qla2x00_fcport_event_handler() and letting the switch

statement inside that function decide which other function to call, call

the latter function directly. Remove the event member from the event_arg

structure because it is no longer needed. Remove the

qla_handle_els_plogi_done() function because it is never called.

Cc: Himanshu Madhani <hmadhani@marvell.com>

Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Tested-by: Himanshu Madhani <hmadhani@marvell.com>

Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>

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

(cherry picked from commit 897def2004213636ffe2e9ee6a75660c5b53b03d)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

---

 drivers/scsi/qla2xxx/qla_def.h  |  17 ------

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

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

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

 drivers/scsi/qla2xxx/qla_iocb.c |   3 +-

 drivers/scsi/qla2xxx/qla_isr.c  |   3 +-

 drivers/scsi/qla2xxx/qla_os.c   |   3 +-

 7 files changed, 45 insertions(+), 133 deletions(-)

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

index fc3ef1d6902b..61c67c99e0c3 100644

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

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

@@ -2330,22 +2330,6 @@ enum login_state {	/* FW control Target side */

 	DSC_LS_LOGO_PEND,

 };

-enum fcport_mgt_event {

-	FCME_RELOGIN = 1,

-	FCME_RSCN,

-	FCME_PLOGI_DONE,	/* Initiator side sent LLIOCB */

-	FCME_PRLI_DONE,

-	FCME_GNL_DONE,

-	FCME_GPSC_DONE,

-	FCME_GPDB_DONE,

-	FCME_GPNID_DONE,

-	FCME_GFFID_DONE,

-	FCME_ADISC_DONE,

-	FCME_GNNID_DONE,

-	FCME_GFPNID_DONE,

-	FCME_ELS_PLOGI_DONE,

-};

-

 enum rscn_addr_format {

 	RSCN_PORT_ADDR,

 	RSCN_AREA_ADDR,

@@ -2466,7 +2450,6 @@ typedef struct fc_port {

 #define QLA_FCPORT_FOUND	2

 struct event_arg {

-	enum fcport_mgt_event	event;

 	fc_port_t		*fcport;

 	srb_t			*sp;

 	port_id_t		id;

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

index 6d59359e0d21..e0b1f0652403 100644

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

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

@@ -96,7 +96,11 @@ extern int qla2x00_init_rings(scsi_qla_host_t *);

 extern struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *,

 	int, int, bool);

 extern int qla2xxx_delete_qpair(struct scsi_qla_host *, struct qla_qpair *);

-void qla2x00_fcport_event_handler(scsi_qla_host_t *, struct event_arg *);

+void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea);

+void qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha,

+				     struct event_arg *ea);

+void qla24xx_handle_relogin_event(scsi_qla_host_t *vha,

+				  struct event_arg *ea);

 int qla24xx_async_gpdb(struct scsi_qla_host *, fc_port_t *, u8);

 int qla24xx_async_prli(struct scsi_qla_host *, fc_port_t *);

 int qla24xx_async_notify_ack(scsi_qla_host_t *, fc_port_t *,

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

index 38c7fb787d80..592ae70a4abd 100644

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

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

@@ -3069,11 +3069,10 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)

 		    be16_to_cpu(ct_rsp->rsp.gpsc.speed));

 	}

 	memset(&ea, 0, sizeof(ea));

-	ea.event = FCME_GPSC_DONE;

 	ea.rc = res;

 	ea.fcport = fcport;

 	ea.sp = sp;

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gpsc_event(vha, &ea);

 done:

 	sp->free(sp);

@@ -3324,7 +3323,6 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res)

 	ea.id.b.area = ct_req->req.port_id.port_id[1];

 	ea.id.b.al_pa = ct_req->req.port_id.port_id[2];

 	ea.rc = res;

-	ea.event = FCME_GPNID_DONE;

 	spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);

 	list_del(&sp->elem);

@@ -3343,7 +3341,7 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res)

 		return;

 	}

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gpnid_event(vha, &ea);

 	e = qla2x00_alloc_work(vha, QLA_EVT_UNMAP);

 	if (!e) {

@@ -3528,9 +3526,8 @@ void qla24xx_async_gffid_sp_done(void *s, int res)

 	ea.sp = sp;

 	ea.fcport = sp->fcport;

 	ea.rc = res;

-	ea.event = FCME_GFFID_DONE;

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gffid_event(vha, &ea);

 	sp->free(sp);

 }

@@ -4294,13 +4291,12 @@ static void qla2x00_async_gnnid_sp_done(void *s, int res)

 	ea.fcport = fcport;

 	ea.sp = sp;

 	ea.rc = res;

-	ea.event = FCME_GNNID_DONE;

 	ql_dbg(ql_dbg_disc, vha, 0x204f,

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

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

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gnnid_event(vha, &ea);

 	sp->free(sp);

 }

@@ -4428,13 +4424,12 @@ static void qla2x00_async_gfpnid_sp_done(void *s, int res)

 	ea.fcport = fcport;

 	ea.sp = sp;

 	ea.rc = res;

-	ea.event = FCME_GFPNID_DONE;

 	ql_dbg(ql_dbg_disc, vha, 0x204f,

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

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

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gfpnid_event(vha, &ea);

 	sp->free(sp);

 }

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

index 0b694da58017..9584da53e715 100644

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

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

@@ -37,8 +37,8 @@ static struct qla_chip_state_84xx *qla84xx_get_chip(struct scsi_qla_host *);

 static int qla84xx_init_chip(scsi_qla_host_t *);

 static int qla25xx_init_queues(struct qla_hw_data *);

 static int qla24xx_post_prli_work(struct scsi_qla_host*, fc_port_t *);

-static void qla24xx_handle_plogi_done_event(struct scsi_qla_host *,

-    struct event_arg *);

+static void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha,

+				      struct event_arg *ea);

 static void qla24xx_handle_prli_done_event(struct scsi_qla_host *,

     struct event_arg *);

 static void __qla24xx_handle_gpdb_event(scsi_qla_host_t *, struct event_arg *);

@@ -266,14 +266,13 @@ qla2x00_async_login_sp_done(void *ptr, int res)

 	if (!test_bit(UNLOADING, &vha->dpc_flags)) {

 		memset(&ea, 0, sizeof(ea));

-		ea.event = FCME_PLOGI_DONE;

 		ea.fcport = sp->fcport;

 		ea.data[0] = lio->u.logio.data[0];

 		ea.data[1] = lio->u.logio.data[1];

 		ea.iop[0] = lio->u.logio.iop[0];

 		ea.iop[1] = lio->u.logio.iop[1];

 		ea.sp = sp;

-		qla2x00_fcport_event_handler(vha, &ea);

+		qla24xx_handle_plogi_done_event(vha, &ea);

 	}

 	sp->free(sp);

@@ -542,7 +541,6 @@ qla2x00_async_adisc_sp_done(void *ptr, int res)

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

 	memset(&ea, 0, sizeof(ea));

-	ea.event = FCME_ADISC_DONE;

 	ea.rc = res;

 	ea.data[0] = lio->u.logio.data[0];

 	ea.data[1] = lio->u.logio.data[1];

@@ -551,7 +549,7 @@ qla2x00_async_adisc_sp_done(void *ptr, int res)

 	ea.fcport = sp->fcport;

 	ea.sp = sp;

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_adisc_event(vha, &ea);

 	sp->free(sp);

 }

@@ -971,7 +969,6 @@ qla24xx_async_gnl_sp_done(void *s, int res)

 	memset(&ea, 0, sizeof(ea));

 	ea.sp = sp;

 	ea.rc = res;

-	ea.event = FCME_GNL_DONE;

 	if (sp->u.iocb_cmd.u.mbx.in_mb[1] >=

 	    sizeof(struct get_name_list_extended)) {

@@ -1010,7 +1007,7 @@ qla24xx_async_gnl_sp_done(void *s, int res)

 		spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);

 		ea.fcport = fcport;

-		qla2x00_fcport_event_handler(vha, &ea);

+		qla24xx_handle_gnl_done_event(vha, &ea);

 	}

 	/* create new fcport if fw has knowledge of new sessions */

@@ -1157,11 +1154,10 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)

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

 	memset(&ea, 0, sizeof(ea));

-	ea.event = FCME_GPDB_DONE;

 	ea.fcport = fcport;

 	ea.sp = sp;

-	qla2x00_fcport_event_handler(vha, &ea);

+	qla24xx_handle_gpdb_event(vha, &ea);

 	dma_pool_free(ha->s_dma_pool, sp->u.iocb_cmd.u.mbx.in,

 		sp->u.iocb_cmd.u.mbx.in_dma);

@@ -1198,7 +1194,6 @@ qla2x00_async_prli_sp_done(void *ptr, int res)

 	if (!test_bit(UNLOADING, &vha->dpc_flags)) {

 		memset(&ea, 0, sizeof(ea));

-		ea.event = FCME_PRLI_DONE;

 		ea.fcport = sp->fcport;

 		ea.data[0] = lio->u.logio.data[0];

 		ea.data[1] = lio->u.logio.data[1];

@@ -1206,7 +1201,7 @@ qla2x00_async_prli_sp_done(void *ptr, int res)

 		ea.iop[1] = lio->u.logio.iop[1];

 		ea.sp = sp;

-		qla2x00_fcport_event_handler(vha, &ea);

+		qla24xx_handle_prli_done_event(vha, &ea);

 	}

 	sp->free(sp);

@@ -1673,12 +1668,34 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id,

 	return qla2x00_post_work(vha, e);

 }

-static

+void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)

+{

+	fc_port_t *fcport;

+	unsigned long flags;

+

+	fcport = qla2x00_find_fcport_by_nportid(vha, &ea->id, 1);

+	if (fcport) {

+		fcport->scan_needed = 1;

+		fcport->rscn_gen++;

+	}

+

+	spin_lock_irqsave(&vha->work_lock, flags);

+	if (vha->scan.scan_flags == 0) {

+		ql_dbg(ql_dbg_disc, vha, 0xffff, "%s: schedule\n", __func__);

+		vha->scan.scan_flags |= SF_QUEUED;

+		schedule_delayed_work(&vha->scan.scan_work, 5);

+	}

+	spin_unlock_irqrestore(&vha->work_lock, flags);

+}

+

 void qla24xx_handle_relogin_event(scsi_qla_host_t *vha,

 	struct event_arg *ea)

 {

 	fc_port_t *fcport = ea->fcport;

+	if (test_bit(UNLOADING, &vha->dpc_flags))

+		return;

+

 	ql_dbg(ql_dbg_disc, vha, 0x2102,

 	    "%s %8phC DS %d LS %d P %d del %d cnfl %p rscn %d|%d login %d|%d fl %x\n",

 	    __func__, fcport->port_name, fcport->disc_state,

@@ -1698,89 +1715,6 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha,

 	qla24xx_fcport_handle_login(vha, fcport);

 }

-

-static void qla_handle_els_plogi_done(scsi_qla_host_t *vha,

-				      struct event_arg *ea)

-{

-	ql_dbg(ql_dbg_disc, vha, 0x2118,

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

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

-	qla24xx_post_prli_work(vha, ea->fcport);

-}

-

-void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)

-{

-	fc_port_t *fcport;

-

-	switch (ea->event) {

-	case FCME_RELOGIN:

-		if (test_bit(UNLOADING, &vha->dpc_flags))

-			return;

-

-		qla24xx_handle_relogin_event(vha, ea);

-		break;

-	case FCME_RSCN:

-		if (test_bit(UNLOADING, &vha->dpc_flags))

-			return;

-		{

-			unsigned long flags;

-

-			fcport = qla2x00_find_fcport_by_nportid

-				(vha, &ea->id, 1);

-			if (fcport) {

-				fcport->scan_needed = 1;

-				fcport->rscn_gen++;

-			}

-

-			spin_lock_irqsave(&vha->work_lock, flags);

-			if (vha->scan.scan_flags == 0) {

-				ql_dbg(ql_dbg_disc, vha, 0xffff,

-				    "%s: schedule\n", __func__);

-				vha->scan.scan_flags |= SF_QUEUED;

-				schedule_delayed_work(&vha->scan.scan_work, 5);

-			}

-			spin_unlock_irqrestore(&vha->work_lock, flags);

-		}

-		break;

-	case FCME_GNL_DONE:

-		qla24xx_handle_gnl_done_event(vha, ea);

-		break;

-	case FCME_GPSC_DONE:

-		qla24xx_handle_gpsc_event(vha, ea);

-		break;

-	case FCME_PLOGI_DONE:	/* Initiator side sent LLIOCB */

-		qla24xx_handle_plogi_done_event(vha, ea);

-		break;

-	case FCME_PRLI_DONE:

-		qla24xx_handle_prli_done_event(vha, ea);

-		break;

-	case FCME_GPDB_DONE:

-		qla24xx_handle_gpdb_event(vha, ea);

-		break;

-	case FCME_GPNID_DONE:

-		qla24xx_handle_gpnid_event(vha, ea);

-		break;

-	case FCME_GFFID_DONE:

-		qla24xx_handle_gffid_event(vha, ea);

-		break;

-	case FCME_ADISC_DONE:

-		qla24xx_handle_adisc_event(vha, ea);

-		break;

-	case FCME_GNNID_DONE:

-		qla24xx_handle_gnnid_event(vha, ea);

-		break;

-	case FCME_GFPNID_DONE:

-		qla24xx_handle_gfpnid_event(vha, ea);

-		break;

-	case FCME_ELS_PLOGI_DONE:

-		qla_handle_els_plogi_done(vha, ea);

-		break;

-	default:

-		BUG_ON(1);

-		break;

-	}

-}

-

 /*

  * RSCN(s) came in for this fcport, but the RSCN(s) was not able

  * to be consumed by the fcport

@@ -1798,10 +1732,9 @@ void qla_rscn_replay(fc_port_t *fcport)

 	if (fcport->scan_needed) {

 		memset(&ea, 0, sizeof(ea));

-		ea.event = FCME_RSCN;

 		ea.id = fcport->d_id;

 		ea.id.b.rsvd_1 = RSCN_PORT_ADDR;

-		qla2x00_fcport_event_handler(fcport->vha, &ea);

+		qla2x00_handle_rscn(fcport->vha, &ea);

 	}

 }

@@ -1985,7 +1918,7 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea)

 	}

 }

-static void

+void

 qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)

 {

 	port_id_t cid;	/* conflict Nport id */

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

index 4498cf78e156..702c72fe439b 100644

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

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

@@ -2853,8 +2853,7 @@ qla2x00_els_dcmd2_sp_done(void *ptr, int res)

 			memset(&ea, 0, sizeof(ea));

 			ea.fcport = fcport;

 			ea.rc = res;

-			ea.event = FCME_ELS_PLOGI_DONE;

-			qla2x00_fcport_event_handler(vha, &ea);

+			qla24xx_handle_plogi_done_event(vha, &ea);

 		}

 		e = qla2x00_alloc_work(vha, QLA_EVT_UNMAP);

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

index 7c58e04c5d70..873fcffb5dd7 100644

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

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

@@ -1118,10 +1118,9 @@ global_port_update:

 			struct event_arg ea;

 			memset(&ea, 0, sizeof(ea));

-			ea.event = FCME_RSCN;

 			ea.id.b24 = rscn_entry;

 			ea.id.b.rsvd_1 = rscn_entry >> 24;

-			qla2x00_fcport_event_handler(vha, &ea);

+			qla2x00_handle_rscn(vha, &ea);

 			qla2x00_post_aen_work(vha, FCH_EVT_RSCN, rscn_entry);

 		}

 		break;

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

index 371070eea2d1..95d54bbc48c0 100644

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

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

@@ -5434,9 +5434,8 @@ void qla2x00_relogin(struct scsi_qla_host *vha)

 			} else {

 				if (vha->hw->current_topology != ISP_CFG_NL) {

 					memset(&ea, 0, sizeof(ea));

-					ea.event = FCME_RELOGIN;

 					ea.fcport = fcport;

-					qla2x00_fcport_event_handler(vha, &ea);

+					qla24xx_handle_relogin_event(vha, &ea);

 				} else if (vha->hw->current_topology ==

 				    ISP_CFG_NL) {

 					fcport->login_retry--;

-- 

2.13.6