diff options
Diffstat (limited to 'drivers/scsi/qla4xxx')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index a1ba085565af..3cb74c9269a4 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
| @@ -711,15 +711,17 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha) | |||
| 711 | test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) { | 711 | test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) { |
| 712 | if (dev_state == QLA82XX_DEV_NEED_RESET && | 712 | if (dev_state == QLA82XX_DEV_NEED_RESET && |
| 713 | !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { | 713 | !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { |
| 714 | printk("scsi%ld: %s: HW State: NEED RESET!\n", | 714 | if (!ql4xdontresethba) { |
| 715 | ha->host_no, __func__); | 715 | ql4_printk(KERN_INFO, ha, "%s: HW State: " |
| 716 | set_bit(DPC_RESET_HA, &ha->dpc_flags); | 716 | "NEED RESET!\n", __func__); |
| 717 | qla4xxx_wake_dpc(ha); | 717 | set_bit(DPC_RESET_HA, &ha->dpc_flags); |
| 718 | qla4xxx_mailbox_premature_completion(ha); | 718 | qla4xxx_wake_dpc(ha); |
| 719 | qla4xxx_mailbox_premature_completion(ha); | ||
| 720 | } | ||
| 719 | } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT && | 721 | } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT && |
| 720 | !test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags)) { | 722 | !test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags)) { |
| 721 | printk("scsi%ld: %s: HW State: NEED QUIES!\n", | 723 | ql4_printk(KERN_INFO, ha, "%s: HW State: NEED QUIES!\n", |
| 722 | ha->host_no, __func__); | 724 | __func__); |
| 723 | set_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags); | 725 | set_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags); |
| 724 | qla4xxx_wake_dpc(ha); | 726 | qla4xxx_wake_dpc(ha); |
| 725 | } else { | 727 | } else { |