From: Jan Kulich <jan.kulich@qlogic.com>
Date: Thu, 25 Sep 2014 09:16:45 +0000 (-0400)
Subject: qla2xxx: ISPFx00 unexpected resets during adapter boot sequence.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e475f9c0a5a12dfc79647f5a9b222f20db5f61a5;p=linux-beck.git

qla2xxx: ISPFx00 unexpected resets during adapter boot sequence.

Signed-off-by: Jan Kulich <jan.kulich@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 620e60a7a0ee..c54a53de351b 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -1551,7 +1551,10 @@ qlafx00_timer_routine(scsi_qla_host_t *vha)
 			ha->mr.fw_reset_timer_tick =
 			    QLAFX00_MAX_RESET_INTERVAL;
 		}
-		ha->mr.old_aenmbx0_state = aenmbx0;
+		if (ha->mr.old_aenmbx0_state != aenmbx0) {
+			ha->mr.old_aenmbx0_state = aenmbx0;
+			ha->mr.fw_reset_timer_tick = QLAFX00_RESET_INTERVAL;
+		}
 		ha->mr.fw_reset_timer_tick--;
 	}
 	if (test_bit(FX00_CRITEMP_RECOVERY, &vha->dpc_flags)) {