diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-05-03 21:53:41 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-05-06 16:23:54 +0200 |
| commit | 3e28601fdfdec75ce8f6aaaf58540fdd0883fb58 (patch) | |
| tree | be2dc2fe3301ab7beb7afd0afd22d9569e28d65d | |
| parent | cciss: clarify messages around reset behavior (diff) | |
| download | linux-3e28601fdfdec75ce8f6aaaf58540fdd0883fb58.tar.xz linux-3e28601fdfdec75ce8f6aaaf58540fdd0883fb58.zip | |
cciss: increase timeouts for post-reset no-ops
Just to reduce the messages about timeouts that appear.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | drivers/block/cciss.c | 2 | ||||
| -rw-r--r-- | drivers/block/cciss.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 3b557231e1d3..b9f8658341cc 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4353,7 +4353,7 @@ static __devinit int cciss_message(struct pci_dev *pdev, unsigned char opcode, u tag = readl(vaddr + SA5_REPLY_PORT_OFFSET); if ((tag & ~3) == paddr32) break; - schedule_timeout_uninterruptible(HZ); + msleep(CCISS_POST_RESET_NOOP_TIMEOUT_MSECS); } iounmap(vaddr); diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index 21ec628ef700..16b4d58d84dd 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -209,8 +209,9 @@ struct ctlr_info ((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_INTERVAL_MSECS (4000) #define CCISS_POST_RESET_NOOP_RETRIES (12) +#define CCISS_POST_RESET_NOOP_TIMEOUT_MSECS (10000) /* Send the command to the hardware |