evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] qla2xxx: Submit all chained IOCBs for passthrough commands on request queue 0.

Browse source 
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Giridhar Malavali 2011-11-18 09:02:21 -08:00 • committed by James Bottomley
parent 49e85c23be
commit 0d2aa38ee9
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/qla2xxx/qla_iocb.c
View file

@ -120,11 +120,10 @@ qla2x00_prep_cont_type0_iocb(struct scsi_qla_host *vha)
* Returns a pointer to the continuation type 1 IOCB packet. * Returns a pointer to the continuation type 1 IOCB packet.
*/ */
static inline cont_a64_entry_t * static inline cont_a64_entry_t *
qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha) qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha, struct req_que *req)
{ {
cont_a64_entry_t *cont_pkt; cont_a64_entry_t *cont_pkt;
struct req_que *req = vha->req;
/* Adjust ring index. */ /* Adjust ring index. */
req->ring_index++; req->ring_index++;
if (req->ring_index == req->length) { if (req->ring_index == req->length) {
@ -292,7 +291,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
* Five DSDs are available in the Continuation * Five DSDs are available in the Continuation
* Type 1 IOCB. * Type 1 IOCB.
*/ */
cont_pkt = qla2x00_prep_cont_type1_iocb(vha); cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
cur_dsd = (uint32_t *)cont_pkt->dseg_0_address; cur_dsd = (uint32_t *)cont_pkt->dseg_0_address;
avail_dsds = 5; avail_dsds = 5;
} }
@ -684,7 +683,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
* Five DSDs are available in the Continuation * Five DSDs are available in the Continuation
* Type 1 IOCB. * Type 1 IOCB.
*/ */
cont_pkt = qla2x00_prep_cont_type1_iocb(vha); cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha->req);
cur_dsd = (uint32_t *)cont_pkt->dseg_0_address; cur_dsd = (uint32_t *)cont_pkt->dseg_0_address;
avail_dsds = 5; avail_dsds = 5;
} }
@ -2070,7 +2069,8 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)
* Five DSDs are available in the Cont. * Five DSDs are available in the Cont.
* Type 1 IOCB. * Type 1 IOCB.
*/ */
cont_pkt = qla2x00_prep_cont_type1_iocb(vha); cont_pkt = qla2x00_prep_cont_type1_iocb(vha,
vha->hw->req_q_map[0]);
cur_dsd = (uint32_t *) cont_pkt->dseg_0_address; cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
avail_dsds = 5; avail_dsds = 5;
cont_iocb_prsnt = 1; cont_iocb_prsnt = 1;
@ -2096,6 +2096,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
int index; int index;
uint16_t tot_dsds; uint16_t tot_dsds;
scsi_qla_host_t *vha = sp->fcport->vha; scsi_qla_host_t *vha = sp->fcport->vha;
struct qla_hw_data *ha = vha->hw;
struct fc_bsg_job *bsg_job = ((struct srb_ctx *)sp->ctx)->u.bsg_job; struct fc_bsg_job *bsg_job = ((struct srb_ctx *)sp->ctx)->u.bsg_job;
int loop_iterartion = 0; int loop_iterartion = 0;
int cont_iocb_prsnt = 0; int cont_iocb_prsnt = 0;
@ -2141,7 +2142,8 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
* Five DSDs are available in the Cont. * Five DSDs are available in the Cont.
* Type 1 IOCB. * Type 1 IOCB.
*/ */
cont_pkt = qla2x00_prep_cont_type1_iocb(vha); cont_pkt = qla2x00_prep_cont_type1_iocb(vha,
ha->req_q_map[0]);
cur_dsd = (uint32_t *) cont_pkt->dseg_0_address; cur_dsd = (uint32_t *) cont_pkt->dseg_0_address;
avail_dsds = 5; avail_dsds = 5;
cont_iocb_prsnt = 1; cont_iocb_prsnt = 1;