[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>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index d675860..58e4f19 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -806,6 +806,7 @@ struct mbx_cmd_32 {
 #define MBA_MIRROR_LUN_CHANGE  0x8402  /* Mirror LUN State Change
                                           Notification */
 #define MBA_FW_POLL_STATE      0x8600  /* Firmware in poll diagnostic state */
+#define MBA_FW_RESET_FCT       0x8502  /* Firmware reset factory defaults */
 
 /* 83XX FCoE specific */
 #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 413f050..7136bf5 100644 (file)
--- 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)
                } else if ((aenmbx0 & 0xFF00) == MBA_FW_POLL_STATE) {
                        ha->mr.fw_reset_timer_tick =
                            QLAFX00_MAX_RESET_INTERVAL;
+               } else if (aenmbx0 == MBA_FW_RESET_FCT) {
+                       ha->mr.fw_reset_timer_tick =
+                           QLAFX00_MAX_RESET_INTERVAL;
                }
                ha->mr.old_aenmbx0_state = aenmbx0;
                ha->mr.fw_reset_timer_tick--;