From: David S. Miller Date: Thu, 3 Dec 2009 05:58:33 +0000 (-0800) Subject: ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives. X-Git-Tag: v2.6.33-rc1~341^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=602da297e293eb2cbd28dcdbbe247593a46a853a;p=thirdparty%2Fkernel%2Flinux.git 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 --- diff --git a/include/linux/ide.h b/include/linux/ide.h index e4135d6e05568..0ec612959042d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -125,8 +125,8 @@ struct ide_io_ports { * Timeouts for various operations: */ enum { - /* spec allows up to 20ms */ - WAIT_DRQ = HZ / 10, /* 100ms */ + /* spec allows up to 20ms, but CF cards and SSD drives need more */ + WAIT_DRQ = 1 * HZ, /* 1s */ /* some laptops are very slow */ WAIT_READY = 5 * HZ, /* 5s */ /* should be less than 3ms (?), if all ATAPI CD is closed at boot */