diff options
| author | Alan Cox | 2007-11-19 15:33:11 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2008-01-23 11:24:09 +0100 |
| commit | b9f8ab2dafba2dc12dd94e5d2db31d5cf495775f (patch) | |
| tree | 4c6a80d72a1af2c02ab28caa5b0978b0742d4619 /drivers/ata/libata-core.c | |
| parent | libata-acpi: add ACPI _PSx method (diff) | |
| download | kernel-qcow2-linux-b9f8ab2dafba2dc12dd94e5d2db31d5cf495775f.tar.gz kernel-qcow2-linux-b9f8ab2dafba2dc12dd94e5d2db31d5cf495775f.tar.xz kernel-qcow2-linux-b9f8ab2dafba2dc12dd94e5d2db31d5cf495775f.zip | |
libata: IORDY handling
I believe this version meets all Sergei's objections
Correct the logic for when we issue a set features for transfer mode
- If the device has IORDY and the controller has IORDY - set the mode
- If the device has IORDY and the controller does not - turn IORDY off
- If neither has IORDY do nothing
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 9b7f3c477730..3dd0e942df36 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4373,7 +4373,14 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) tf.feature = SETFEATURES_XFER; tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING; tf.protocol = ATA_PROT_NODATA; - tf.nsect = dev->xfer_mode; + /* If we are using IORDY we must send the mode setting command */ + if (ata_pio_need_iordy(dev)) + tf.nsect = dev->xfer_mode; + /* If the device has IORDY and the controller does not - turn it off */ + else if (ata_id_has_iordy(dev->id)) + tf.nsect = 0x01; + else /* In the ancient relic department - skip all of this */ + return 0; err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0); |