From 85a4f5412689ab8b2d60af510a501eb865fc7ef9 Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

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

Subject: [PATCH 130/155] [scsi] scsi: qla2xxx: Make qla24xx_async_abort_cmd()

 static

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

Patchwork-id: 287869

O-Subject: [RHLE 7.8 e-stor PATCH v3 05/26] scsi: qla2xxx: Make qla24xx_async_abort_cmd() static

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

Since qla24xx_async_abort_cmd() is only called from inside qla_init.c,

declare that function static. Reorder a few functions to avoid that any

forward declarations are needed.

Cc: Himanshu Madhani <hmadhani@marvell.com>

Cc: Giridhar Malavali <gmalavali@marvell.com>

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

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

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

(cherry picked from commit 1956eee58872e622cfe03f060a5d8a20d24afe47)

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

Conflicts:

	drivers/scsi/qla2xxx/qla_init.c

[ hmadhani: RHEL 7.8 submission via bz1729270 included commit ]

[           0c6df59061b23c7a951836d23977be34e896d3da earlier  ]

[           than this patch which moves qla24xx_abort_iocb_timeout() ]

[	    to make it static. This patch preserves changes and ]

[ 	    moves the function. No change in acutal source due to ]

[ 	    this patch is introduced. ]

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

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

---

 drivers/scsi/qla2xxx/qla_gbl.h  |   1 -

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

 2 files changed, 87 insertions(+), 91 deletions(-)

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

index 5075d447c69e..6d59359e0d21 100644

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

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

@@ -219,7 +219,6 @@ extern void qla24xx_sched_upd_fcport(fc_port_t *);

 void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,

 	uint16_t *);

 int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *);

-int qla24xx_async_abort_cmd(srb_t *, bool);

 int qla24xx_post_relogin_work(struct scsi_qla_host *vha);

 void qla2x00_wait_for_sess_deletion(scsi_qla_host_t *);

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

index 3eecb873a84e..8da5ef9e19f5 100644

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

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

@@ -95,6 +95,93 @@ qla2x00_get_async_timeout(struct scsi_qla_host *vha)

 	return tmo;

 }

+static void qla24xx_abort_iocb_timeout(void *data)

+{

+	srb_t *sp = data;

+	struct srb_iocb *abt = &sp->u.iocb_cmd;

+	struct qla_qpair *qpair = sp->qpair;

+	u32 handle;

+	unsigned long flags;

+

+	spin_lock_irqsave(qpair->qp_lock_ptr, flags);

+	for (handle = 1; handle < qpair->req->num_outstanding_cmds; handle++) {

+		/* removing the abort */

+		if (qpair->req->outstanding_cmds[handle] == sp) {

+			qpair->req->outstanding_cmds[handle] = NULL;

+			break;

+		}

+	}

+	spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);

+

+	abt->u.abt.comp_status = CS_TIMEOUT;

+	sp->done(sp, QLA_OS_TIMER_EXPIRED);

+}

+

+static void qla24xx_abort_sp_done(void *ptr, int res)

+{

+	srb_t *sp = ptr;

+	struct srb_iocb *abt = &sp->u.iocb_cmd;

+

+	if ((res == QLA_OS_TIMER_EXPIRED) ||

+	    del_timer(&sp->u.iocb_cmd.timer)) {

+		if (sp->flags & SRB_WAKEUP_ON_COMP)

+			complete(&abt->u.abt.comp);

+		else

+			sp->free(sp);

+	}

+}

+

+static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

+{

+	scsi_qla_host_t *vha = cmd_sp->vha;

+	struct srb_iocb *abt_iocb;

+	srb_t *sp;

+	int rval = QLA_FUNCTION_FAILED;

+

+	sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,

+	    GFP_ATOMIC);

+	if (!sp)

+		goto done;

+

+	abt_iocb = &sp->u.iocb_cmd;

+	sp->type = SRB_ABT_CMD;

+	sp->name = "abort";

+	sp->qpair = cmd_sp->qpair;

+	if (wait)

+		sp->flags = SRB_WAKEUP_ON_COMP;

+

+	abt_iocb->timeout = qla24xx_abort_iocb_timeout;

+	init_completion(&abt_iocb->u.abt.comp);

+	/* FW can send 2 x ABTS's timeout/20s */

+	qla2x00_init_timer(sp, 42);

+

+	abt_iocb->u.abt.cmd_hndl = cmd_sp->handle;

+	abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id);

+

+	sp->done = qla24xx_abort_sp_done;

+

+	ql_dbg(ql_dbg_async, vha, 0x507c,

+	    "Abort command issued - hdl=%x, type=%x\n",

+	    cmd_sp->handle, cmd_sp->type);

+

+	rval = qla2x00_start_sp(sp);

+	if (rval != QLA_SUCCESS)

+		goto done_free_sp;

+

+	if (wait) {

+		wait_for_completion(&abt_iocb->u.abt.comp);

+		rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ?

+			QLA_SUCCESS : QLA_FUNCTION_FAILED;

+	} else {

+		goto done;

+	}

+

+done_free_sp:

+	sp->free(sp);

+done:

+	return rval;

+}

+

 void

 qla2x00_async_iocb_timeout(void *data)

 {

@@ -1791,96 +1878,6 @@ done:

 	return rval;

 }

-static void

-qla24xx_abort_iocb_timeout(void *data)

-{

-	srb_t *sp = data;

-	struct srb_iocb *abt = &sp->u.iocb_cmd;

-	struct qla_qpair *qpair = sp->qpair;

-	u32 handle;

-	unsigned long flags;

-

-	spin_lock_irqsave(qpair->qp_lock_ptr, flags);

-	for (handle = 1; handle < qpair->req->num_outstanding_cmds; handle++) {

-		/* removing the abort */

-		if (qpair->req->outstanding_cmds[handle] == sp) {

-			qpair->req->outstanding_cmds[handle] = NULL;

-			break;

-		}

-	}

-	spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);

-

-	abt->u.abt.comp_status = CS_TIMEOUT;

-	sp->done(sp, QLA_OS_TIMER_EXPIRED);

-}

-

-static void

-qla24xx_abort_sp_done(void *ptr, int res)

-{

-	srb_t *sp = ptr;

-	struct srb_iocb *abt = &sp->u.iocb_cmd;

-

-	if ((res == QLA_OS_TIMER_EXPIRED) ||

-	    del_timer(&sp->u.iocb_cmd.timer)) {

-		if (sp->flags & SRB_WAKEUP_ON_COMP)

-			complete(&abt->u.abt.comp);

-		else

-			sp->free(sp);

-	}

-}

-

-int

-qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

-{

-	scsi_qla_host_t *vha = cmd_sp->vha;

-	struct srb_iocb *abt_iocb;

-	srb_t *sp;

-	int rval = QLA_FUNCTION_FAILED;

-

-	sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,

-	    GFP_ATOMIC);

-	if (!sp)

-		goto done;

-

-	abt_iocb = &sp->u.iocb_cmd;

-	sp->type = SRB_ABT_CMD;

-	sp->name = "abort";

-	sp->qpair = cmd_sp->qpair;

-	if (wait)

-		sp->flags = SRB_WAKEUP_ON_COMP;

-

-	abt_iocb->timeout = qla24xx_abort_iocb_timeout;

-	init_completion(&abt_iocb->u.abt.comp);

-	/* FW can send 2 x ABTS's timeout/20s */

-	qla2x00_init_timer(sp, 42);

-

-	abt_iocb->u.abt.cmd_hndl = cmd_sp->handle;

-	abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id);

-

-	sp->done = qla24xx_abort_sp_done;

-

-	ql_dbg(ql_dbg_async, vha, 0x507c,

-	    "Abort command issued - hdl=%x, type=%x\n",

-	    cmd_sp->handle, cmd_sp->type);

-

-	rval = qla2x00_start_sp(sp);

-	if (rval != QLA_SUCCESS)

-		goto done_free_sp;

-

-	if (wait) {

-		wait_for_completion(&abt_iocb->u.abt.comp);

-		rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ?

-			QLA_SUCCESS : QLA_FUNCTION_FAILED;

-	} else {

-		goto done;

-	}

-

-done_free_sp:

-	sp->free(sp);

-done:

-	return rval;

-}

-

 int

 qla24xx_async_abort_command(srb_t *sp)

 {

-- 

2.13.6