diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-10-22 14:21:07 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-23 18:45:06 +0200 |
| commit | afa842fa641e11a025725883b04d1e144e6bad39 (patch) | |
| tree | 3cb94bba43974ac3eac1f63ebd96ba1d743bb715 /drivers/block/cciss.h | |
| parent | 53c2eb24ff49abe1bfc45d067797f74b409690d8 (diff) | |
| download | op-kernel-dev-afa842fa641e11a025725883b04d1e144e6bad39.zip op-kernel-dev-afa842fa641e11a025725883b04d1e144e6bad39.tar.gz | |
cciss: 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.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss.h')
| -rw-r--r-- | drivers/block/cciss.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index ae340ff..4b8933d 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -200,10 +200,14 @@ struct ctlr_info * the above. */ #define CCISS_BOARD_READY_WAIT_SECS (120) +#define CCISS_BOARD_NOT_READY_WAIT_SECS (10) #define CCISS_BOARD_READY_POLL_INTERVAL_MSECS (100) #define CCISS_BOARD_READY_ITERATIONS \ ((CCISS_BOARD_READY_WAIT_SECS * 1000) / \ CCISS_BOARD_READY_POLL_INTERVAL_MSECS) +#define CCISS_BOARD_NOT_READY_ITERATIONS \ + ((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \ + CCISS_BOARD_READY_POLL_INTERVAL_MSECS) #define CCISS_POST_RESET_PAUSE_MSECS (3000) #define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000) #define CCISS_POST_RESET_NOOP_RETRIES (12) |
