aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArmen Baloyan <armen.baloyan@qlogic.com>2013-08-27 01:37:31 -0400
committerJames Bottomley <JBottomley@Parallels.com>2013-09-03 10:28:01 -0400
commitb6511d9976fdcfbe98943ed68fb671548fd148f8 (patch)
tree84f25cb814d213ed7253d74dd18d40e457331680 /drivers
parentda9b1d5cb9d408a1e634740c849187bc031929db (diff)
[SCSI] qla2xxx: Set factory reset recovery timeout to 10 min. for ISPFX00.
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com> Acked-by: Srinivasa Rao <srinivasa.rao@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h1
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index d675860397f6..58e4f19a27e2 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -806,6 +806,7 @@ struct mbx_cmd_32 {
806#define MBA_MIRROR_LUN_CHANGE 0x8402 /* Mirror LUN State Change 806#define MBA_MIRROR_LUN_CHANGE 0x8402 /* Mirror LUN State Change
807 Notification */ 807 Notification */
808#define MBA_FW_POLL_STATE 0x8600 /* Firmware in poll diagnostic state */ 808#define MBA_FW_POLL_STATE 0x8600 /* Firmware in poll diagnostic state */
809#define MBA_FW_RESET_FCT 0x8502 /* Firmware reset factory defaults */
809 810
810/* 83XX FCoE specific */ 811/* 83XX FCoE specific */
811#define MBA_IDC_AEN 0x8200 /* FCoE: NIC Core state change AEN */ 812#define MBA_IDC_AEN 0x8200 /* FCoE: NIC Core state change AEN */
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 413f05021bd6..7136bf5d1c86 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -1539,6 +1539,9 @@ qlafx00_timer_routine(scsi_qla_host_t *vha)
1539 } else if ((aenmbx0 & 0xFF00) == MBA_FW_POLL_STATE) { 1539 } else if ((aenmbx0 & 0xFF00) == MBA_FW_POLL_STATE) {
1540 ha->mr.fw_reset_timer_tick = 1540 ha->mr.fw_reset_timer_tick =
1541 QLAFX00_MAX_RESET_INTERVAL; 1541 QLAFX00_MAX_RESET_INTERVAL;
1542 } else if (aenmbx0 == MBA_FW_RESET_FCT) {
1543 ha->mr.fw_reset_timer_tick =
1544 QLAFX00_MAX_RESET_INTERVAL;
1542 } 1545 }
1543 ha->mr.old_aenmbx0_state = aenmbx0; 1546 ha->mr.old_aenmbx0_state = aenmbx0;
1544 ha->mr.fw_reset_timer_tick--; 1547 ha->mr.fw_reset_timer_tick--;