From b1786f43420febbbba73ab9deaf78104ef838bec Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Tue, 3 May 2011 14:53:41 -0500 Subject: [PATCH] --- yaml --- r: 251185 b: refs/heads/master c: 3e28601fdfdec75ce8f6aaaf58540fdd0883fb58 h: refs/heads/master i: 251183: 026d8af22bae3a56d44b23e4d6f838032e4221fb v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 2 +- trunk/drivers/block/cciss.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e8d50e8dd5e7..3530dcf3bff5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59ec86bb9872fbf9fd8572a936423f5e3ad615e7 +refs/heads/master: 3e28601fdfdec75ce8f6aaaf58540fdd0883fb58 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 3b557231e1d3..b9f8658341cc 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/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/trunk/drivers/block/cciss.h b/trunk/drivers/block/cciss.h index 21ec628ef700..16b4d58d84dd 100644 --- a/trunk/drivers/block/cciss.h +++ b/trunk/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