diff options
| author |   Giridhar Malavali <giridhar.malavali@qlogic.com> | 2010-05-04 15:01:34 -0700 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-05-16 18:22:11 -0400 |
| commit | f1af6208c8cef81e313ec2e64b44e783c3a11c13 (patch) | |
| tree | 73a61ecfb3975df4a5fde3893662ff72b1a4ef4c /drivers/scsi/qla2xxx/qla_init.c | |
| parent | [SCSI] qla2xxx: Optionally disable target reset. (diff) | |
| download | linux-dev-f1af6208c8cef81e313ec2e64b44e783c3a11c13.tar.xz linux-dev-f1af6208c8cef81e313ec2e64b44e783c3a11c13.zip | |
[SCSI] qla2xxx: Updates to ISP82xx support.
1) Allow transition to NEED RESET state only from READY state for ISP82xx.
2) Avoid infinite ISP aborts when chip reset fails.
3) Code cleanup to remove some of the unused debug code.
Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Santosh Vernekar <santosh.vernekar@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 7fd1344ff1f9..ab2cc71994c2 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5296,39 +5296,6 @@ qla82xx_restart_isp(scsi_qla_host_t *vha) "(%d).\n", rval); } } - } else { /* failed the ISP abort */ - vha->flags.online = 1; - if (test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) { - if (ha->isp_abort_cnt == 0) { - qla_printk(KERN_WARNING, ha, - "ISP error recovery failed - " - "board disabled\n"); - /* - * The next call disables the board - * completely. - */ - ha->isp_ops->reset_adapter(vha); - vha->flags.online = 0; - clear_bit(ISP_ABORT_RETRY, - &vha->dpc_flags); - status = 0; - } else { /* schedule another ISP abort */ - ha->isp_abort_cnt--; - qla_printk(KERN_INFO, ha, - "qla%ld: ISP abort - " - "retry remaining %d\n", - vha->host_no, ha->isp_abort_cnt); - status = 1; - } - } else { - ha->isp_abort_cnt = MAX_RETRIES_OF_ISP_ABORT; - qla_printk(KERN_INFO, ha, - "(%ld): ISP error recovery " - "- retrying (%d) more times\n", - vha->host_no, ha->isp_abort_cnt); - set_bit(ISP_ABORT_RETRY, &vha->dpc_flags); - status = 1; - } } if (!status) { |