diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-01-06 14:48:03 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 11:29:32 -0600 |
| commit | fe5389c87f13c16cd77d976801c93422d0c05a49 (patch) | |
| tree | f90be61b1f137562dd4748004304ad5d4b235865 /drivers/scsi/hpsa.h | |
| parent | 922a9e4da34270d81e216728f929c6e11e169794 (diff) | |
| download | linux-3.10-fe5389c87f13c16cd77d976801c93422d0c05a49.tar.gz linux-3.10-fe5389c87f13c16cd77d976801c93422d0c05a49.tar.bz2 linux-3.10-fe5389c87f13c16cd77d976801c93422d0c05a49.zip | |
[SCSI] hpsa: fix board status waiting code
After a reset, we should first wait for the board to become "not ready",
and then wait for it to become "ready", instead of immediately
waiting for it to become "ready", and do this waiting *after*
restoring PCI config space registers. Also, only wait 10 secs
for board to become "not ready" after a reset (it should quickly
become not ready.)
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.h')
| -rw-r--r-- | drivers/scsi/hpsa.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index 19586e189f0..074d237f449 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -154,12 +154,16 @@ struct ctlr_info { * HPSA_BOARD_READY_ITERATIONS are derived from those. */ #define HPSA_BOARD_READY_WAIT_SECS (120) +#define HPSA_BOARD_NOT_READY_WAIT_SECS (10) #define HPSA_BOARD_READY_POLL_INTERVAL_MSECS (100) #define HPSA_BOARD_READY_POLL_INTERVAL \ ((HPSA_BOARD_READY_POLL_INTERVAL_MSECS * HZ) / 1000) #define HPSA_BOARD_READY_ITERATIONS \ ((HPSA_BOARD_READY_WAIT_SECS * 1000) / \ HPSA_BOARD_READY_POLL_INTERVAL_MSECS) +#define HPSA_BOARD_NOT_READY_ITERATIONS \ + ((HPSA_BOARD_NOT_READY_WAIT_SECS * 1000) / \ + HPSA_BOARD_READY_POLL_INTERVAL_MSECS) #define HPSA_POST_RESET_PAUSE_MSECS (3000) #define HPSA_POST_RESET_NOOP_RETRIES (12) |