From f0679c28288d4f52ef463ae395c74349d81af824 Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 1 Aug 2019 15:54:43 -0400

Subject: [PATCH 023/124] [scsi] scsi: qla2xxx: Move marker request behind

 QPair

Message-id: <20190801155618.12650-24-hmadhani@redhat.com>

Patchwork-id: 267797

O-Subject: [RHEL 7.8 e-stor PATCH 023/118] scsi: qla2xxx: Move marker request behind QPair

Bugzilla: 1729270

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

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

From: Quinn Tran <qtran@marvell.com>

Bugzilla 1729270

Current code hard codes marker request to use request and response queue

0. This patch make use of the qpair as the path to access the

request/response queues.  It allows marker to be place on any hardware

queue.

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

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

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

(cherry picked from commit 9eb9c6dc3ab06cf80d2c15cab39cbcd38816bde0)

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

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

---

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

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

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

 drivers/scsi/qla2xxx/qla_mbx.c  | 18 +++------------

 4 files changed, 33 insertions(+), 69 deletions(-)

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

index 522865df61cc..3b97724d27ec 100644

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

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

@@ -269,8 +269,8 @@ extern void qla24xx_build_scsi_iocbs(srb_t *, struct cmd_type_7 *,

 	uint16_t, struct req_que *);

 extern int qla2x00_start_scsi(srb_t *sp);

 extern int qla24xx_start_scsi(srb_t *sp);

-int qla2x00_marker(struct scsi_qla_host *, struct req_que *, struct rsp_que *,

-						uint16_t, uint16_t, uint8_t);

+int qla2x00_marker(struct scsi_qla_host *, struct qla_qpair *,

+    uint16_t, uint64_t, uint8_t);

 extern int qla2x00_start_sp(srb_t *);

 extern int qla24xx_dif_start_scsi(srb_t *);

 extern int qla2x00_start_bidir(srb_t *, struct scsi_qla_host *, uint32_t);

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

index 04d38d0dfb69..29eb7174a719 100644

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

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

@@ -1705,8 +1705,8 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,

 		lun = (uint16_t)tm_iocb->u.tmf.lun;

 		/* Issue Marker IOCB */

-		qla2x00_marker(vha, vha->hw->req_q_map[0],

-		    vha->hw->rsp_q_map[0], sp->fcport->loop_id, lun,

+		qla2x00_marker(vha, vha->hw->base_qpair,

+		    sp->fcport->loop_id, lun,

 		    flags == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);

 	}

@@ -6055,11 +6055,6 @@ qla2x00_loop_resync(scsi_qla_host_t *vha)

 {

 	int rval = QLA_SUCCESS;

 	uint32_t wait_time;

-	struct req_que *req;

-	struct rsp_que *rsp;

-

-	req = vha->req;

-	rsp = req->rsp;

 	clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);

 	if (vha->flags.online) {

@@ -6072,8 +6067,8 @@ qla2x00_loop_resync(scsi_qla_host_t *vha)

 					 * Issue a marker after FW becomes

 					 * ready.

 					 */

-					qla2x00_marker(vha, req, rsp, 0, 0,

-						MK_SYNC_ALL);

+					qla2x00_marker(vha, vha->hw->base_qpair,

+					    0, 0, MK_SYNC_ALL);

 					vha->marker_needed = 0;

 				}

@@ -6811,8 +6806,6 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)

 {

 	int status = 0;

 	struct qla_hw_data *ha = vha->hw;

-	struct req_que *req = ha->req_q_map[0];

-	struct rsp_que *rsp = ha->rsp_q_map[0];

 	/* If firmware needs to be loaded */

 	if (qla2x00_isp_firmware(vha)) {

@@ -6832,7 +6825,7 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)

 		status = qla2x00_fw_ready(vha);

 		if (!status) {

 			/* Issue a marker after FW becomes ready. */

-			qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);

+			qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL);

 			set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);

 		}

@@ -7887,22 +7880,15 @@ qla24xx_configure_vhba(scsi_qla_host_t *vha)

 	uint16_t mb[MAILBOX_REGISTER_COUNT];

 	struct qla_hw_data *ha = vha->hw;

 	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);

-	struct req_que *req;

-	struct rsp_que *rsp;

 	if (!vha->vp_idx)

 		return -EINVAL;

 	rval = qla2x00_fw_ready(base_vha);

-	if (vha->qpair)

-		req = vha->qpair->req;

-	else

-		req = ha->req_q_map[0];

-	rsp = req->rsp;

 	if (rval == QLA_SUCCESS) {

 		clear_bit(RESET_MARKER_NEEDED, &vha->dpc_flags);

-		qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);

+		qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL);

 	}

 	vha->flags.management_server_logged_in = 0;

@@ -8294,8 +8280,6 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)

 {

 	int status, rval;

 	struct qla_hw_data *ha = vha->hw;

-	struct req_que *req = ha->req_q_map[0];

-	struct rsp_que *rsp = ha->rsp_q_map[0];

 	struct scsi_qla_host *vp;

 	unsigned long flags;

@@ -8307,7 +8291,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)

 		status = qla2x00_fw_ready(vha);

 		if (!status) {

 			/* Issue a marker after FW becomes ready. */

-			qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);

+			qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL);

 			vha->flags.online = 1;

 			set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);

 		}

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

index 1acdd4cea6a3..ba64b3746462 100644

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

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

@@ -336,7 +336,7 @@ qla2x00_start_scsi(srb_t *sp)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

+		if (qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL) !=

 		    QLA_SUCCESS) {

 			return (QLA_FUNCTION_FAILED);

 		}

@@ -490,8 +490,7 @@ qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)

 /**

  * qla2x00_marker() - Send a marker IOCB to the firmware.

  * @vha: HA context

- * @req: request queue

- * @rsp: response queue

+ * @qpair: queue pair pointer

  * @loop_id: loop ID

  * @lun: LUN

  * @type: marker modifier

@@ -501,18 +500,16 @@ qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)

  * Returns non-zero if a failure occurred, else zero.

  */

 static int

-__qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,

-			struct rsp_que *rsp, uint16_t loop_id,

-			uint16_t lun, uint8_t type)

+__qla2x00_marker(struct scsi_qla_host *vha, struct qla_qpair *qpair,

+    uint16_t loop_id, uint64_t lun, uint8_t type)

 {

 	mrk_entry_t *mrk;

 	struct mrk_entry_24xx *mrk24 = NULL;

-

+	struct req_que *req = qpair->req;

 	struct qla_hw_data *ha = vha->hw;

 	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);

-	req = ha->req_q_map[0];

-	mrk = (mrk_entry_t *)qla2x00_alloc_iocbs(vha, NULL);

+	mrk = (mrk_entry_t *)__qla2x00_alloc_iocbs(qpair, NULL);

 	if (mrk == NULL) {

 		ql_log(ql_log_warn, base_vha, 0x3026,

 		    "Failed to allocate Marker IOCB.\n");

@@ -544,16 +541,15 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,

 }

 int

-qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,

-		struct rsp_que *rsp, uint16_t loop_id, uint16_t lun,

-		uint8_t type)

+qla2x00_marker(struct scsi_qla_host *vha, struct qla_qpair *qpair,

+    uint16_t loop_id, uint64_t lun, uint8_t type)

 {

 	int ret;

 	unsigned long flags = 0;

-	spin_lock_irqsave(&vha->hw->hardware_lock, flags);

-	ret = __qla2x00_marker(vha, req, rsp, loop_id, lun, type);

-	spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);

+	spin_lock_irqsave(qpair->qp_lock_ptr, flags);

+	ret = __qla2x00_marker(vha, qpair, loop_id, lun, type);

+	spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);

 	return (ret);

 }

@@ -568,11 +564,11 @@ qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,

 int qla2x00_issue_marker(scsi_qla_host_t *vha, int ha_locked)

 {

 	if (ha_locked) {

-		if (__qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,

+		if (__qla2x00_marker(vha, vha->hw->base_qpair, 0, 0,

 					MK_SYNC_ALL) != QLA_SUCCESS)

 			return QLA_FUNCTION_FAILED;

 	} else {

-		if (qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,

+		if (qla2x00_marker(vha, vha->hw->base_qpair, 0, 0,

 					MK_SYNC_ALL) != QLA_SUCCESS)

 			return QLA_FUNCTION_FAILED;

 	}

@@ -1653,7 +1649,6 @@ qla24xx_start_scsi(srb_t *sp)

 	uint16_t	req_cnt;

 	uint16_t	tot_dsds;

 	struct req_que *req = NULL;

-	struct rsp_que *rsp = NULL;

 	struct scsi_cmnd *cmd = GET_CMD_SP(sp);

 	struct scsi_qla_host *vha = sp->vha;

 	struct qla_hw_data *ha = vha->hw;

@@ -1661,14 +1656,13 @@ qla24xx_start_scsi(srb_t *sp)

 	/* Setup device pointers. */

 	req = vha->req;

-	rsp = req->rsp;

 	/* So we know we haven't pci_map'ed anything yet */

 	tot_dsds = 0;

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

+		if (qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL) !=

 		    QLA_SUCCESS)

 			return QLA_FUNCTION_FAILED;

 		vha->marker_needed = 0;

@@ -1836,7 +1830,7 @@ qla24xx_dif_start_scsi(srb_t *sp)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

+		if (qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL) !=

 		    QLA_SUCCESS)

 			return QLA_FUNCTION_FAILED;

 		vha->marker_needed = 0;

@@ -2007,7 +2001,6 @@ qla2xxx_start_scsi_mq(srb_t *sp)

 	uint16_t	req_cnt;

 	uint16_t	tot_dsds;

 	struct req_que *req = NULL;

-	struct rsp_que *rsp = NULL;

 	struct scsi_cmnd *cmd = GET_CMD_SP(sp);

 	struct scsi_qla_host *vha = sp->fcport->vha;

 	struct qla_hw_data *ha = vha->hw;

@@ -2017,7 +2010,6 @@ qla2xxx_start_scsi_mq(srb_t *sp)

 	spin_lock_irqsave(&qpair->qp_lock, flags);

 	/* Setup qpair pointers */

-	rsp = qpair->rsp;

 	req = qpair->req;

 	/* So we know we haven't pci_map'ed anything yet */

@@ -2025,7 +2017,7 @@ qla2xxx_start_scsi_mq(srb_t *sp)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

+		if (__qla2x00_marker(vha, qpair, 0, 0, MK_SYNC_ALL) !=

 		    QLA_SUCCESS) {

 			spin_unlock_irqrestore(&qpair->qp_lock, flags);

 			return QLA_FUNCTION_FAILED;

@@ -2193,7 +2185,7 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

+		if (__qla2x00_marker(vha, qpair, 0, 0, MK_SYNC_ALL) !=

 		    QLA_SUCCESS) {

 			spin_unlock_irqrestore(&qpair->qp_lock, flags);

 			return QLA_FUNCTION_FAILED;

@@ -3246,8 +3238,8 @@ qla82xx_start_scsi(srb_t *sp)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (qla2x00_marker(vha, req,

-			rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {

+		if (qla2x00_marker(vha, ha->base_qpair,

+			0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {

 			ql_log(ql_log_warn, vha, 0x300c,

 			    "qla2x00_marker failed for cmd=%p.\n", cmd);

 			return QLA_FUNCTION_FAILED;

@@ -3930,8 +3922,8 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds)

 	/* Send marker if required */

 	if (vha->marker_needed != 0) {

-		if (qla2x00_marker(vha, req,

-			rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS)

+		if (qla2x00_marker(vha, ha->base_qpair,

+			0, 0, MK_SYNC_ALL) != QLA_SUCCESS)

 			return EXT_STATUS_MAILBOX;

 		vha->marker_needed = 0;

 	}

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

index 3068422cd7a5..d588784c5aa5 100644

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

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

@@ -1515,16 +1515,12 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)

 	mbx_cmd_t  mc;

 	mbx_cmd_t  *mcp = &mc;

 	scsi_qla_host_t *vha;

-	struct req_que *req;

-	struct rsp_que *rsp;

 	vha = fcport->vha;

 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103e,

 	    "Entered %s.\n", __func__);

-	req = vha->hw->req_q_map[0];

-	rsp = req->rsp;

 	mcp->mb[0] = MBC_ABORT_TARGET;

 	mcp->out_mb = MBX_9|MBX_2|MBX_1|MBX_0;

 	if (HAS_EXTENDED_IDS(vha->hw)) {

@@ -1547,7 +1543,7 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)

 	}

 	/* Issue marker IOCB. */

-	rval2 = qla2x00_marker(vha, req, rsp, fcport->loop_id, 0,

+	rval2 = qla2x00_marker(vha, vha->hw->base_qpair, fcport->loop_id, 0,

 							MK_SYNC_ID);

 	if (rval2 != QLA_SUCCESS) {

 		ql_dbg(ql_dbg_mbx, vha, 0x1040,

@@ -1567,16 +1563,12 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)

 	mbx_cmd_t  mc;

 	mbx_cmd_t  *mcp = &mc;

 	scsi_qla_host_t *vha;

-	struct req_que *req;

-	struct rsp_que *rsp;

 	vha = fcport->vha;

 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1042,

 	    "Entered %s.\n", __func__);

-	req = vha->hw->req_q_map[0];

-	rsp = req->rsp;

 	mcp->mb[0] = MBC_LUN_RESET;

 	mcp->out_mb = MBX_9|MBX_3|MBX_2|MBX_1|MBX_0;

 	if (HAS_EXTENDED_IDS(vha->hw))

@@ -1596,7 +1588,7 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)

 	}

 	/* Issue marker IOCB. */

-	rval2 = qla2x00_marker(vha, req, rsp, fcport->loop_id, l,

+	rval2 = qla2x00_marker(vha, vha->hw->base_qpair, fcport->loop_id, l,

 								MK_SYNC_ID_LUN);

 	if (rval2 != QLA_SUCCESS) {

 		ql_dbg(ql_dbg_mbx, vha, 0x1044,

@@ -3188,7 +3180,6 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,

 	scsi_qla_host_t *vha;

 	struct qla_hw_data *ha;

 	struct req_que *req;

-	struct rsp_que *rsp;

 	struct qla_qpair *qpair;

 	vha = fcport->vha;

@@ -3201,10 +3192,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,

 	if (vha->flags.qpairs_available) {

 		/* NPIV port */

 		qpair = vha->qpair;

-		rsp = qpair->rsp;

 		req = qpair->req;

-	} else {

-		rsp = req->rsp;

 	}

 	tsk = dma_pool_zalloc(ha->s_dma_pool, GFP_KERNEL, &tsk_dma);

@@ -3261,7 +3249,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,

 	}

 	/* Issue marker IOCB. */

-	rval2 = qla2x00_marker(vha, req, rsp, fcport->loop_id, l,

+	rval2 = qla2x00_marker(vha, ha->base_qpair, fcport->loop_id, l,

 	    type == TCF_LUN_RESET ? MK_SYNC_ID_LUN: MK_SYNC_ID);

 	if (rval2 != QLA_SUCCESS) {

 		ql_dbg(ql_dbg_mbx, vha, 0x1099,

-- 

2.13.6