aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorSaurav Kashyap <saurav.kashyap@qlogic.com>2014-04-11 16:54:06 -0400
committerChristoph Hellwig <hch@lst.de>2014-05-19 07:30:59 -0400
commitec1937a21ba193b489f669484e2180b9e08f0c7f (patch)
tree1625c85e47869b1c80286f32d2be1de1e7fa999d /drivers/scsi
parentbc6ac5e8c214a6b27ccaedbeb62bd2873a767034 (diff)
qla2xxx: Wait for reset completion without lock for ISPFX00.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 0aaf6a9c87d3..c1df39a81b3c 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -572,12 +572,13 @@ qlafx00_soc_cpu_reset(scsi_qla_host_t *vha)
572 /* Kick in Core0 to start boot process */ 572 /* Kick in Core0 to start boot process */
573 QLAFX00_SET_HBA_SOC_REG(ha, SOC_SW_RST_CONTROL_REG_CORE0, (0xF00)); 573 QLAFX00_SET_HBA_SOC_REG(ha, SOC_SW_RST_CONTROL_REG_CORE0, (0xF00));
574 574
575 spin_unlock_irqrestore(&ha->hardware_lock, flags);
576
575 /* Wait 10secs for soft-reset to complete. */ 577 /* Wait 10secs for soft-reset to complete. */
576 for (cnt = 10; cnt; cnt--) { 578 for (cnt = 10; cnt; cnt--) {
577 msleep(1000); 579 msleep(1000);
578 barrier(); 580 barrier();
579 } 581 }
580 spin_unlock_irqrestore(&ha->hardware_lock, flags);
581} 582}
582 583
583/** 584/**