Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a629468 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Move {get|rel}_sp to base_qpair struct 



Currently, qla2x00_[get_sp|rel_sp] routines does {get|release} of srb
resource/srb_mempool directly from qla_hw_data.  qla2x00_start_sp() is used to
issue management commands through the default Request Q 0 & Response Q 0 or
base_qpair. This patch moves access of these resources through
base_qpair. Instead of having knowledge of specific Q number and lock to
rsp/req queue, this change will key off the qpair that is assigned to the srb
resource. This lays the ground work for other routines to see this resource
through the qpair.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8b4673ba

drivers/scsi/qla2xxx/qla_gs.c

+0 −1
Original line number Diff line number Diff line
@@ -4157,7 +4157,6 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) 
		if (rc) {

			/* Cleanup here to prevent memory leak */

			qla24xx_sp_unmap(vha, sp);

			sp->free(sp);

		}



		spin_lock_irqsave(&vha->work_lock, flags);

drivers/scsi/qla2xxx/qla_init.c

+2 −1
Original line number Diff line number Diff line
@@ -1761,7 +1761,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) 
	srb_t *sp;

	int rval = QLA_FUNCTION_FAILED;



	sp = qla2xxx_get_qpair_sp(cmd_sp->qpair, cmd_sp->fcport, GFP_KERNEL);

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

	    GFP_KERNEL);

	if (!sp)

		goto done;

drivers/scsi/qla2xxx/qla_inline.h

+9 −8
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ qla2x00_chip_is_down(scsi_qla_host_t *vha) 
}



static inline srb_t *

qla2xxx_get_qpair_sp(struct qla_qpair *qpair, fc_port_t *fcport, gfp_t flag)

qla2xxx_get_qpair_sp(scsi_qla_host_t *vha, struct qla_qpair *qpair,

    fc_port_t *fcport, gfp_t flag)

{

	srb_t *sp = NULL;

	uint8_t bail;
@@ -225,7 +226,9 @@ qla2xxx_get_qpair_sp(struct qla_qpair *qpair, fc_port_t *fcport, gfp_t flag) 
	memset(sp, 0, sizeof(*sp));

	sp->fcport = fcport;

	sp->iocbs = 1;

	sp->vha = qpair->vha;

	sp->vha = vha;

	sp->qpair = qpair;

	sp->cmd_type = TYPE_SRB;

	INIT_LIST_HEAD(&sp->elem);



done:
@@ -246,19 +249,17 @@ qla2x00_get_sp(scsi_qla_host_t *vha, fc_port_t *fcport, gfp_t flag) 
{

	srb_t *sp = NULL;

	uint8_t bail;

	struct qla_qpair *qpair;



	QLA_VHA_MARK_BUSY(vha, bail);

	if (unlikely(bail))

		return NULL;



	sp = mempool_alloc(vha->hw->srb_mempool, flag);

	qpair = vha->hw->base_qpair;

	sp = qla2xxx_get_qpair_sp(vha, qpair, fcport, flag);

	if (!sp)

		goto done;



	memset(sp, 0, sizeof(*sp));

	sp->fcport = fcport;

	sp->cmd_type = TYPE_SRB;

	sp->iocbs = 1;

	sp->vha = vha;

done:

	if (!sp)
@@ -270,7 +271,7 @@ static inline void 
qla2x00_rel_sp(srb_t *sp)

{

	QLA_VHA_MARK_NOT_BUSY(sp->vha);

	mempool_free(sp, sp->vha->hw->srb_mempool);

	qla2xxx_rel_qpair_sp(sp->qpair, sp);

}



static inline void

drivers/scsi/qla2xxx/qla_iocb.c

+5 −4
Original line number Diff line number Diff line
@@ -3440,12 +3440,13 @@ qla2x00_start_sp(srb_t *sp) 
	int rval;

	scsi_qla_host_t *vha = sp->vha;

	struct qla_hw_data *ha = vha->hw;

	struct qla_qpair *qp = sp->qpair;

	void *pkt;

	unsigned long flags;



	rval = QLA_FUNCTION_FAILED;

	spin_lock_irqsave(&ha->hardware_lock, flags);

	pkt = qla2x00_alloc_iocbs(vha, sp);

	spin_lock_irqsave(qp->qp_lock_ptr, flags);

	pkt = __qla2x00_alloc_iocbs(sp->qpair, sp);

	if (!pkt) {

		ql_log(ql_log_warn, vha, 0x700c,

		    "qla2x00_alloc_iocbs failed.\n");
@@ -3523,9 +3524,9 @@ qla2x00_start_sp(srb_t *sp) 
	}



	wmb();

	qla2x00_start_iocbs(vha, ha->req_q_map[0]);

	qla2x00_start_iocbs(vha, qp->req);

done:

	spin_unlock_irqrestore(&ha->hardware_lock, flags);

	spin_unlock_irqrestore(qp->qp_lock_ptr, flags);

	return rval;

}

drivers/scsi/qla2xxx/qla_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, 
		return -EBUSY;



	/* Alloc SRB structure */

	sp = qla2xxx_get_qpair_sp(qpair, fcport, GFP_ATOMIC);

	sp = qla2xxx_get_qpair_sp(vha, qpair, fcport, GFP_ATOMIC);

	if (!sp)

		return -EBUSY;