diff options
| author | Quinn Tran <quinn.tran@cavium.com> | 2016-12-23 18:06:12 -0800 |
|---|---|---|
| committer | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-01-17 11:26:57 -0800 |
| commit | 200ffb159b2f48857aa18c0502a4d29b102d013b (patch) | |
| tree | 4f79ce099359d308f49ec3dad84672caae3c3a49 /drivers/scsi | |
| parent | 5f35509db179ca7ed1feaa4b14f841adb06ed220 (diff) | |
| download | linux-rpi-200ffb159b2f48857aa18c0502a4d29b102d013b.tar.gz linux-rpi-200ffb159b2f48857aa18c0502a4d29b102d013b.tar.bz2 linux-rpi-200ffb159b2f48857aa18c0502a4d29b102d013b.zip | |
qla2xxx: Reduce exess wait during chip reset
Soft reset and Risc reset should take 100uS to complete.
This change pad the timeout up to 400uS, which should be
plenty.
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 632d5f30386a..7b6317c8c2e9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1191,7 +1191,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha) /* Wait for soft-reset to complete. */ RD_REG_DWORD(®->ctrl_status); - for (cnt = 0; cnt < 6000000; cnt++) { + for (cnt = 0; cnt < 60; cnt++) { barrier(); if ((RD_REG_DWORD(®->ctrl_status) & CSRX_ISP_SOFT_RESET) == 0) @@ -1234,7 +1234,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha) RD_REG_DWORD(®->hccr); RD_REG_WORD(®->mailbox0); - for (cnt = 6000000; RD_REG_WORD(®->mailbox0) != 0 && + for (cnt = 60; RD_REG_WORD(®->mailbox0) != 0 && rval == QLA_SUCCESS; cnt--) { barrier(); if (cnt) |