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

Commit 82de802a authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Preparation for Target MQ. 



In Current code, Req Q 0, RespQ 0 & hardware_lock are the main resources
for sending and process completion of Target IO. These resources are now
referenced behind a new qpair/"struct qla_qpair base_qpair".  Main path
IO handle will access those resources via the qpair pointer in
preparation for Target MQ.

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 c5419e26

drivers/scsi/qla2xxx/qla_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) 
	}



	if (qos) {

		qpair = qla2xxx_create_qpair(vha, qos, vha->vp_idx);

		qpair = qla2xxx_create_qpair(vha, qos, vha->vp_idx, true);

		if (!qpair)

			ql_log(ql_log_warn, vha, 0x7084,

			    "Can't create qpair for VP[%d]\n",

drivers/scsi/qla2xxx/qla_def.h

+13 −4
Original line number Diff line number Diff line
@@ -3182,6 +3182,9 @@ struct qla_tc_param { 
#define QLA_PRECONFIG_VPORTS 32

#define QLA_MAX_VPORTS_QLA24XX	128

#define QLA_MAX_VPORTS_QLA25XX	256



struct qla_qpair;



/* Response queue data structure */

struct rsp_que {

	dma_addr_t  dma;
@@ -3201,6 +3204,7 @@ struct rsp_que { 
	struct qla_msix_entry *msix;

	struct req_que *req;

	srb_t *status_srb; /* status continuation entry */

	struct qla_qpair *qpair;



	dma_addr_t  dma_fx00;

	response_t *ring_fx00;
@@ -3241,6 +3245,14 @@ struct req_que { 
struct qla_qpair {

	spinlock_t qp_lock;

	atomic_t ref_count;



	/*

	 * For qpair 0, qp_lock_ptr will point at hardware_lock due to

	 * legacy code. For other Qpair(s), it will point at qp_lock.

	 */

	spinlock_t *qp_lock_ptr;

	struct scsi_qla_host *vha;



	/* distill these fields down to 'online=0/1'

	 * ha->flags.eeh_busy

	 * ha->flags.pci_channel_io_perm_failure
@@ -3252,10 +3264,7 @@ struct qla_qpair { 
	uint32_t delete_in_progress:1;



	uint16_t id;			/* qp number used with FW */

	uint16_t num_active_cmd;	/* cmds down at firmware */

	cpumask_t cpu_mask; /* CPU mask for cpu affinity operation */

	uint16_t vp_idx;		/* vport ID */



	mempool_t *srb_mempool;



	/* to do: New driver: move queues to here instead of pointers */
@@ -3266,7 +3275,7 @@ struct qla_qpair { 
	struct qla_hw_data *hw;

	struct work_struct q_work;

	struct list_head qp_list_elem; /* vha->qp_list */

	struct scsi_qla_host *vha;

	uint16_t cpuid;

};



/* Place holder for FW buffer parameters */

drivers/scsi/qla2xxx/qla_gbl.h

+8 −7
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ struct qla_work_evt *qla2x00_alloc_work(struct scsi_qla_host *, 
    enum qla_work_type);

extern int qla24xx_async_gnl(struct scsi_qla_host *, fc_port_t *);

int qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e);

extern void *qla2x00_alloc_iocbs(struct scsi_qla_host *, srb_t *);

extern void *qla2x00_alloc_iocbs_ready(struct scsi_qla_host *, srb_t *);

extern void *qla2x00_alloc_iocbs_ready(struct qla_qpair *, srb_t *);

extern int qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *, fc_port_t *);



extern fc_port_t *
@@ -96,7 +95,7 @@ qla2x00_alloc_outstanding_cmds(struct qla_hw_data *, struct req_que *); 
extern int qla2x00_init_rings(scsi_qla_host_t *);

extern uint8_t qla27xx_find_valid_image(struct scsi_qla_host *);

extern struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *,

	int, int);

	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 *);

int qla24xx_async_gpdb(struct scsi_qla_host *, fc_port_t *, u8);
@@ -255,7 +254,8 @@ extern int qla2x00_start_bidir(srb_t *, struct scsi_qla_host *, uint32_t); 
extern int qla2xxx_dif_start_scsi_mq(srb_t *);

extern unsigned long qla2x00_get_async_timeout(struct scsi_qla_host *);



extern void *qla2x00_alloc_iocbs(scsi_qla_host_t *, srb_t *);

extern void *qla2x00_alloc_iocbs(struct scsi_qla_host *, srb_t *);

extern void *__qla2x00_alloc_iocbs(struct qla_qpair *, srb_t *);

extern int qla2x00_issue_marker(scsi_qla_host_t *, int);

extern int qla24xx_walk_and_build_sglist_no_difb(struct qla_hw_data *, srb_t *,

	uint32_t *, uint16_t, struct qla_tc_param *);
@@ -663,9 +663,9 @@ extern int qla25xx_request_irq(struct qla_hw_data *, struct qla_qpair *, 
extern int qla25xx_init_req_que(struct scsi_qla_host *, struct req_que *);

extern int qla25xx_init_rsp_que(struct scsi_qla_host *, struct rsp_que *);

extern int qla25xx_create_req_que(struct qla_hw_data *, uint16_t, uint8_t,

	uint16_t, int, uint8_t);

	uint16_t, int, uint8_t, bool);

extern int qla25xx_create_rsp_que(struct qla_hw_data *, uint16_t, uint8_t,

	uint16_t, struct qla_qpair *);

	uint16_t, struct qla_qpair *, bool);



extern void qla2x00_init_response_q_entries(struct rsp_que *);

extern int qla25xx_delete_req_que(struct scsi_qla_host *, struct req_que *);
@@ -839,7 +839,8 @@ extern int qla_get_exlogin_status(scsi_qla_host_t *, uint16_t *, 
extern int qla_set_exlogin_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr);

extern int qla_get_exchoffld_status(scsi_qla_host_t *, uint16_t *, uint16_t *);

extern int qla_set_exchoffld_mem_cfg(scsi_qla_host_t *);

extern void qlt_handle_abts_recv(struct scsi_qla_host *, response_t *);

extern void qlt_handle_abts_recv(struct scsi_qla_host *, struct rsp_que *,

	response_t *);



int qla24xx_async_notify_ack(scsi_qla_host_t *, fc_port_t *,

	struct imm_ntfy_from_isp *, int);

drivers/scsi/qla2xxx/qla_init.c

+8 −3
Original line number Diff line number Diff line
@@ -7578,7 +7578,8 @@ qla24xx_update_all_fcp_prio(scsi_qla_host_t *vha) 
	return ret;

}



struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int vp_idx)

struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,

	int vp_idx, bool startqp)

{

	int rsp_id = 0;

	int  req_id = 0;
@@ -7605,6 +7606,8 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v 


		qpair->hw = vha->hw;

		qpair->vha = vha;

		qpair->qp_lock_ptr = &qpair->qp_lock;

		spin_lock_init(&qpair->qp_lock);



		/* Assign available que pair id */

		mutex_lock(&ha->mq_lock);
@@ -7642,7 +7645,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v 
		mutex_unlock(&ha->mq_lock);



		/* Create response queue first */

		rsp_id = qla25xx_create_rsp_que(ha, 0, 0, 0, qpair);

		rsp_id = qla25xx_create_rsp_que(ha, 0, 0, 0, qpair, startqp);

		if (!rsp_id) {

			ql_log(ql_log_warn, vha, 0x0185,

			    "Failed to create response queue.\n");
@@ -7652,7 +7655,8 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v 
		qpair->rsp = ha->rsp_q_map[rsp_id];



		/* Create request queue */

		req_id = qla25xx_create_req_que(ha, 0, vp_idx, 0, rsp_id, qos);

		req_id = qla25xx_create_req_que(ha, 0, vp_idx, 0, rsp_id, qos,

		    startqp);

		if (!req_id) {

			ql_log(ql_log_warn, vha, 0x0186,

			    "Failed to create request queue.\n");
@@ -7661,6 +7665,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v 


		qpair->req = ha->req_q_map[req_id];

		qpair->rsp->req = qpair->req;

		qpair->rsp->qpair = qpair;



		if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {

			if (ha->fw_attributes & BIT_4)

drivers/scsi/qla2xxx/qla_iocb.c

+20 −10
Original line number Diff line number Diff line
@@ -2109,20 +2109,13 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) 
/* Generic Control-SRB manipulation functions. */



/* hardware_lock assumed to be held. */

void *

qla2x00_alloc_iocbs_ready(scsi_qla_host_t *vha, srb_t *sp)

{

	if (qla2x00_reset_active(vha))

		return NULL;



	return qla2x00_alloc_iocbs(vha, sp);

}



void *

qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp)

__qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp)

{

	scsi_qla_host_t *vha = qpair->vha;

	struct qla_hw_data *ha = vha->hw;

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

	struct req_que *req = qpair->req;

	device_reg_t *reg = ISP_QUE_REG(ha, req->id);

	uint32_t index, handle;

	request_t *pkt;
@@ -2200,6 +2193,23 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp) 
	return pkt;

}



void *

qla2x00_alloc_iocbs_ready(struct qla_qpair *qpair, srb_t *sp)

{

	scsi_qla_host_t *vha = qpair->vha;



	if (qla2x00_reset_active(vha))

		return NULL;



	return __qla2x00_alloc_iocbs(qpair, sp);

}



void *

qla2x00_alloc_iocbs(struct scsi_qla_host *vha, srb_t *sp)

{

	return __qla2x00_alloc_iocbs(vha->hw->base_qpair, sp);

}



static void

qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)

{