summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2008-12-10 15:39:12 -0800
committerJeff Garzik <jgarzik@redhat.com>2009-01-08 16:10:36 -0500
commit5c18c4d28ba9a29203c1dc6b7c64df63ca00938a (patch)
treec010cc419afb9c3c770db278312dc38642b91981 /drivers/ata
parent78a7ba47fbc34a387e6347179ba571236596efbb (diff)
downloadkernel-crypto-5c18c4d28ba9a29203c1dc6b7c64df63ca00938a.tar.gz
kernel-crypto-5c18c4d28ba9a29203c1dc6b7c64df63ca00938a.tar.xz
kernel-crypto-5c18c4d28ba9a29203c1dc6b7c64df63ca00938a.zip
libata: Add special ata_pio_need_iordy() handling for Compact Flash.
According to the Compact Flash specification r4.1, PIO modes 5 and 6 do not use iordy. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9ae583554c8..175df54eb66 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2001,6 +2001,10 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)
as the caller should know this */
if (adev->link->ap->flags & ATA_FLAG_NO_IORDY)
return 0;
+ /* CF spec. r4.1 Table 22 says no iordy on PIO5 and PIO6. */
+ if (ata_id_is_cfa(adev->id)
+ && (adev->pio_mode == XFER_PIO_5 || adev->pio_mode == XFER_PIO_6))
+ return 0;
/* PIO3 and higher it is mandatory */
if (adev->pio_mode > XFER_PIO_2)
return 1;