diff options
author | Quinn Tran <quinn.tran@qlogic.com> | 2015-06-10 11:05:21 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-07-24 17:19:18 -0400 |
commit | e5fdee875f7918b37f7c3fce3025197d8f214a27 (patch) | |
tree | 98a56dbef1f78d95c3fc9243eebb7e5f5e5322a0 | |
parent | 810e30bc4658e9c069577bde52394a5af872803c (diff) |
qla2xxx: adjust debug flags
Adjust debug flag to match debug comment.
Signed-off-by: Quinn Tran <quinn.tran@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_target.c | 7 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_target.h | 3 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/tcm_qla2xxx.c | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 49a184d30f1f..cda443462071 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c | |||
@@ -3013,7 +3013,7 @@ qlt_abort_cmd_on_host_reset(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd) | |||
3013 | dump_stack(); | 3013 | dump_stack(); |
3014 | } | 3014 | } |
3015 | 3015 | ||
3016 | cmd->cmd_flags |= BIT_12; | 3016 | cmd->cmd_flags |= BIT_17; |
3017 | ha->tgt.tgt_ops->free_cmd(cmd); | 3017 | ha->tgt.tgt_ops->free_cmd(cmd); |
3018 | } | 3018 | } |
3019 | 3019 | ||
@@ -3175,7 +3175,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, | |||
3175 | skip_term: | 3175 | skip_term: |
3176 | 3176 | ||
3177 | if (cmd->state == QLA_TGT_STATE_PROCESSED) { | 3177 | if (cmd->state == QLA_TGT_STATE_PROCESSED) { |
3178 | ; | 3178 | cmd->cmd_flags |= BIT_12; |
3179 | } else if (cmd->state == QLA_TGT_STATE_NEED_DATA) { | 3179 | } else if (cmd->state == QLA_TGT_STATE_NEED_DATA) { |
3180 | int rx_status = 0; | 3180 | int rx_status = 0; |
3181 | 3181 | ||
@@ -3189,9 +3189,11 @@ skip_term: | |||
3189 | ha->tgt.tgt_ops->handle_data(cmd); | 3189 | ha->tgt.tgt_ops->handle_data(cmd); |
3190 | return; | 3190 | return; |
3191 | } else if (cmd->state == QLA_TGT_STATE_ABORTED) { | 3191 | } else if (cmd->state == QLA_TGT_STATE_ABORTED) { |
3192 | cmd->cmd_flags |= BIT_18; | ||
3192 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e, | 3193 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e, |
3193 | "Aborted command %p (tag %lld) finished\n", cmd, se_cmd->tag); | 3194 | "Aborted command %p (tag %lld) finished\n", cmd, se_cmd->tag); |
3194 | } else { | 3195 | } else { |
3196 | cmd->cmd_flags |= BIT_19; | ||
3195 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c, | 3197 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c, |
3196 | "qla_target(%d): A command in state (%d) should " | 3198 | "qla_target(%d): A command in state (%d) should " |
3197 | "not return a CTIO complete\n", vha->vp_idx, cmd->state); | 3199 | "not return a CTIO complete\n", vha->vp_idx, cmd->state); |
@@ -3203,7 +3205,6 @@ skip_term: | |||
3203 | dump_stack(); | 3205 | dump_stack(); |
3204 | } | 3206 | } |
3205 | 3207 | ||
3206 | |||
3207 | ha->tgt.tgt_ops->free_cmd(cmd); | 3208 | ha->tgt.tgt_ops->free_cmd(cmd); |
3208 | } | 3209 | } |
3209 | 3210 | ||
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 985d76dd706b..dfeeadf92fbb 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h | |||
@@ -961,6 +961,9 @@ struct qla_tgt_cmd { | |||
961 | * BIT_14 - Back end data received/sent. | 961 | * BIT_14 - Back end data received/sent. |
962 | * BIT_15 - SRR prepare ctio | 962 | * BIT_15 - SRR prepare ctio |
963 | * BIT_16 - complete free | 963 | * BIT_16 - complete free |
964 | * BIT_17 - flush - qlt_abort_cmd_on_host_reset | ||
965 | * BIT_18 - completion w/abort status | ||
966 | * BIT_19 - completion w/unknown status | ||
964 | */ | 967 | */ |
965 | uint32_t cmd_flags; | 968 | uint32_t cmd_flags; |
966 | }; | 969 | }; |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 33364b663cc9..32ff9d15e12d 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c | |||
@@ -374,7 +374,7 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) | |||
374 | { | 374 | { |
375 | struct qla_tgt_cmd *cmd = container_of(se_cmd, | 375 | struct qla_tgt_cmd *cmd = container_of(se_cmd, |
376 | struct qla_tgt_cmd, se_cmd); | 376 | struct qla_tgt_cmd, se_cmd); |
377 | 377 | cmd->cmd_flags |= BIT_3; | |
378 | cmd->bufflen = se_cmd->data_length; | 378 | cmd->bufflen = se_cmd->data_length; |
379 | cmd->dma_data_direction = target_reverse_dma_direction(se_cmd); | 379 | cmd->dma_data_direction = target_reverse_dma_direction(se_cmd); |
380 | 380 | ||
@@ -546,7 +546,6 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) | |||
546 | cmd->sg_cnt = se_cmd->t_data_nents; | 546 | cmd->sg_cnt = se_cmd->t_data_nents; |
547 | cmd->sg = se_cmd->t_data_sg; | 547 | cmd->sg = se_cmd->t_data_sg; |
548 | cmd->offset = 0; | 548 | cmd->offset = 0; |
549 | cmd->cmd_flags |= BIT_3; | ||
550 | 549 | ||
551 | cmd->prot_sg_cnt = se_cmd->t_prot_nents; | 550 | cmd->prot_sg_cnt = se_cmd->t_prot_nents; |
552 | cmd->prot_sg = se_cmd->t_prot_sg; | 551 | cmd->prot_sg = se_cmd->t_prot_sg; |