cciss: increase timeouts for post-reset no-ops

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Stephen M. Cameron and committed by

Jens Axboe 15 years ago 3e28601f 59ec86bb

+3 -2

2 changed files

expand all

drivers

block

cciss.c

cciss.h

+1 -1

drivers/block/cciss.c

··· 4353 4353 tag = readl(vaddr + SA5_REPLY_PORT_OFFSET); 4354 4354 if ((tag & ~3) == paddr32) 4355 4355 break; 4356 - schedule_timeout_uninterruptible(HZ); 4356 + msleep(CCISS_POST_RESET_NOOP_TIMEOUT_MSECS); 4357 4357 } 4358 4358 4359 4359 iounmap(vaddr);

+2 -1

drivers/block/cciss.h

··· 209 209 ((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \ 210 210 CCISS_BOARD_READY_POLL_INTERVAL_MSECS) 211 211 #define CCISS_POST_RESET_PAUSE_MSECS (3000) 212 - #define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000) 212 + #define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (4000) 213 213 #define CCISS_POST_RESET_NOOP_RETRIES (12) 214 + #define CCISS_POST_RESET_NOOP_TIMEOUT_MSECS (10000) 214 215 215 216 /* 216 217 Send the command to the hardware