diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-12-02 21:58:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 21:58:33 -0800 |
| commit | 602da297e293eb2cbd28dcdbbe247593a46a853a (patch) | |
| tree | 1a53703a521cc5abc83188abf65b10d4e53267ce /include/linux/ide.h | |
| parent | drivers/ide/tx4938ide.c: use resource_size() (diff) | |
| download | linux-dev-602da297e293eb2cbd28dcdbbe247593a46a853a.tar.xz linux-dev-602da297e293eb2cbd28dcdbbe247593a46a853a.zip | |
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>
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index e4135d6e0556..0ec612959042 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 */ |