summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-02 21:58:33 -0800
committerThomas Schwinge <thomas@codesourcery.com>2012-12-21 19:13:36 +0100
commitdb8ec819c3863040aceae97ab35ef5c6ef3c898f (patch)
tree3d166efc7af936b27e97de6ea288d7a16172a3fe
parent07a7f30953c6ab3de4362bfd7925cfb2ded23fda (diff)
ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
Based upon a patch by Philippe De Muyter, and feedback from Mark Lord and Robert Hancock. As noted by Mark Lord, the outdated ATA1 spec specifies a 20msec timeout for setting DRQ but lots of common devices overshoot this. Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from Linux kernel commit 602da297e293eb2cbd28dcdbbe247593a46a853a) * linux/src/drivers/block/ide.h (WAIT_DRQ): Increase to 1 s.
-rw-r--r--linux/src/drivers/block/ide.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/src/drivers/block/ide.h b/linux/src/drivers/block/ide.h
index 3351390..edeedc9 100644
--- a/linux/src/drivers/block/ide.h
+++ b/linux/src/drivers/block/ide.h
@@ -152,7 +152,8 @@ typedef unsigned char byte; /* used everywhere */
/*
* Timeouts for various operations:
*/
-#define WAIT_DRQ (5*HZ/100) /* 50msec - spec allows up to 20ms */
+#define WAIT_DRQ (1*HZ) /* 1s - spec allows up to 20ms, but CF
+ * cards and SSD drives need more */
#ifdef CONFIG_APM
#define WAIT_READY (5*HZ) /* 5sec - some laptops are very slow */
#else