Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9f8ab2d authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent bd3adca5

drivers/ata/libata-core.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -4373,7 +4373,14 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) 
	tf.feature = SETFEATURES_XFER;

	tf.feature = SETFEATURES_XFER;

	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING;

	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING;

	tf.protocol = ATA_PROT_NODATA;

	tf.protocol = ATA_PROT_NODATA;

	/* If we are using IORDY we must send the mode setting command */

 	if (ata_pio_need_iordy(dev))

 		tf.nsect = dev->xfer_mode;

 		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);

	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);