libata: IORDY handling, quiet handling
PATCH 1/1 libata: IORDY handling, quiet handling
For further review
Turn on the IORDY handling logic.
If a controller doesnt support IORDY don't try and use it If a device doesn't support IORDY don't try and use it Otherwise use it whenever possible.
Always use IORDY for PIO3 and higher (it's mandatory)
Send the correct set_features command if operating without IORDY
drivers/ata/libata-core.c +39 -12
@@ -1404,30 +1446,44 @@* Check if the current speed of the device requires IORDY. Used * by various controllers for chip configuration. */ - +unsigned int ata_pio_need_iordy (const struct ata_device *adev) { -int pio; -int speed = adev->pio_mode -XFER_PIO_0 ; - -if (speed <2 ) +/* Controller doesn't support IORDY. Probably a pointless check +as the caller should know this */ +if (adev->ap->flags &ATA_FLAG_NO_IORDY )return 0 ; -if (speed >2 ) +/* PIO3 and higher it is mandatory */ +if (adev->pio_mode >XFER_PIO_2 )return 1 ; +/* We turn it on when possible */ +if (ata_id_has_iordy (adev->id)) +return 1 ; +return 0 ; +} +/** +* ata_pio_mask_no_iordy - Return the non IORDY mask +* @adev: ATA device +* +* Compute the highest mode possible if we are not using iordy. Return +* -1 if no iordy mode is available. +*/ + +static u32 ata_pio_mask_no_iordy (const struct ata_device *adev) +{/* If we have no drive specific rule, then PIO 2 is non IORDY */ -if (adev->id[ATA_ID_FIELD_VALID ] &2 ) {/* EIDE */ - pio = adev->id[ATA_ID_EIDE_PIO ]; +u16 pio = adev->id[ATA_ID_EIDE_PIO ];/* Is the speed faster than the drive allows non IORDY ? */ if (pio) {/* This is cycle times not frequency - watch the logic! */ if (pio >240 )/* PIO2 is 240nS per cycle */ -return 1 ; -return 0 ; +return 3 <<ATA_SHIFT_PIO ; +return 7 <<ATA_SHIFT_PIO ; } } -return 0 ; +return 3 <<ATA_SHIFT_PIO ; }/**
@@ -3410,6 +3470,9 @@ dev->mwdma_mask, dev->udma_mask); xfer_mask &=ata_id_xfermask (dev->id); +if (ap->flags &ATA_FLAG_NO_IORDY ) + xfer_mask &=ata_pio_mask_no_iordy (dev); +/* * CFA Advanced TrueIDE timings are not allowed on a shared * cable
@@ -3466,8 +3529,18 @@ tf.command =ATA_CMD_SET_FEATURES ; tf.feature =SETFEATURES_XFER ; tf.flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; + +/* Older CFA may not support this command */ +if (ata_id_is_cfa (dev->id)) + tf.flags |=ATA_TFLAG_QUIET ; + tf.protocol =ATA_PROT_NODATA ; - tf.nsect = dev->xfer_mode; + +/* Ancient devices may need us to avoid IORDY */ +if (ata_pio_need_iordy (dev)) + tf.nsect = dev->xfer_mode; +else + tf.nsect =0x01 ; err_mask =ata_exec_internal (dev, &tf,NULL ,DMA_NONE ,NULL ,0 );
Quoted 7 lines · Alan
For further review
Turn on the IORDY handling logic.
If a controller doesnt support IORDY don't try and use it
If a device doesn't support IORDY don't try and use it
Looks like we shouldn't change it default PIO mode at all in this case.
See below why...
Quoted 55 lines
Otherwise use it whenever possible.
Always use IORDY for PIO3 and higher (it's mandatory)Send the correct
set_featurescommand if operating without IORDYSigned-off-by Alan Cox <[email protected]>diff -u --new-file --recursive --exclude-from
/usr/src/excludelinux.vanilla-2.6.20-rc6-mm3/drivers/ata/libata-core.clinux-2.6.20-rc6-mm3/drivers/ata/libata-core.cdrivers/ata/libata-core.c +22
-8@@ -1404,30 +1446,44 @@* Check if the current speed of the device requires IORDY. Used * by various controllers for chip configuration. */ - +unsigned int ata_pio_need_iordy (const struct ata_device *adev) { -int pio; -int speed = adev->pio_mode -XFER_PIO_0 ; - -if (speed <2 ) +/* Controller doesn't support IORDY. Probably a pointless check +as the caller should know this */ +if (adev->ap->flags &ATA_FLAG_NO_IORDY )return 0 ; -if (speed >2 ) +/* PIO3 and higher it is mandatory */ +if (adev->pio_mode >XFER_PIO_2 )return 1 ; +/* We turn it on when possible */ +if (ata_id_has_iordy (adev->id)) +return 1 ; +return 0 ; +} +/** +* ata_pio_mask_no_iordy - Return the non IORDY mask +* @adev: ATA device +* +* Compute the highest mode possible if we are not using iordy. Return +* -1 if no iordy mode is available. +*/ + +static u32 ata_pio_mask_no_iordy (const struct ata_device *adev) +{/* If we have no drive specific rule, then PIO 2 is non IORDY */ -if (adev->id[ATA_ID_FIELD_VALID ] &2 ) {/* EIDE */ - pio = adev->id[ATA_ID_EIDE_PIO ]; +u16 pio = adev->id[ATA_ID_EIDE_PIO ];/* Is the speed faster than the drive allows non IORDY ? */ if (pio) {/* This is cycle times not frequency - watch the logic! */
drivers/ata/libata-core.c line 1487
Quoted 10 lines
drivers/ata/libata-core.c +3
-3if (pio >240 )/* PIO2 is 240nS per cycle */ -return 1 ; -return 0 ; +return 3 <<ATA_SHIFT_PIO ; +return 7 <<ATA_SHIFT_PIO ; } } -return 0 ; +return 3 <<ATA_SHIFT_PIO ; }
Well, after looking into ATA-1, it seems that the logic may have been and
may be still is somewhat wrong here. There was PIO2 already defined but no EIDE fields yet (and yet optional IORDY line already here). We probably should always consider PIO2 non-IORDY indeed (unless told not to by the word 67) but go figure... :-)
Quoted 7 lines
drivers/ata/libata-core.c +3
-0@@ -3466,8 +3529,18 @@ tf.command =ATA_CMD_SET_FEATURES ; tf.feature =SETFEATURES_XFER ; tf.flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; + +/* Older CFA may not support this command */ +if (ata_id_is_cfa (dev->id))
drivers/ata/libata-core.c line 3543
Quoted 10 lines
drivers/ata/libata-core.c +8
-1+ tf.flags |=ATA_TFLAG_QUIET ; + tf.protocol =ATA_PROT_NODATA ; - tf.nsect = dev->xfer_mode; + +/* Ancient devices may need us to avoid IORDY */ +if (ata_pio_need_iordy (dev)) + tf.nsect = dev->xfer_mode; +else + tf.nsect =0x01 ;
Note that ATA-1 did *not* yet define this subcode (only 0 for "block
transfer"). I think that we should not change the PIO modes at all on non-IORDY drives, otherwise it's becoming pointless and messy -- you're not setting what you're told here and force the drive's default mode instead... why then change it at all?
MBR, Sergei
Quoted 12 lines · Hello, I wrote:
Quoted 12 lines
drivers/ata/libata-core.c +6
-1@@ -3466,8 +3529,18 @@ tf.command =ATA_CMD_SET_FEATURES ; tf.feature =SETFEATURES_XFER ; tf.flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; + +/* Older CFA may not support this command */ +if (ata_id_is_cfa (dev->id)) + tf.flags |=ATA_TFLAG_QUIET ; + tf.protocol =ATA_PROT_NODATA ; - tf.nsect = dev->xfer_mode; +
Quoted 8 lines
drivers/ata/libata-core.c line 3543
Quoted 5 lines
drivers/ata/libata-core.c +5
-0+/* Ancient devices may need us to avoid IORDY */ +if (ata_pio_need_iordy (dev)) + tf.nsect = dev->xfer_mode; +else + tf.nsect =0x01 ;Note that ATA-1 did *not* yet define this subcode (only 0 for "block
transfer"). I think that we should not change the PIO modes at all on non-IORDY drives, otherwise it's becoming pointless and messy -- you're
After thinking a bit more: we should not do it on non-EIDE drives
(however, this is probably the same thing).
If our host by some mischance has no IORDY support and an EIDE drive has
it and supports disabling (otherwise there's little we can do), we must issue subcode 0x01 and tune our host controller to the default PIO mode.
Quoted 1 line
not setting what you're told here and force the drive's default mode instead... why then change it at all?
Anyway, all this logic should be one layer higher than this function...
MBR, Sergei
Quoted 4 lines · Alan
For further review
Turn on the IORDY handling logic.
Quoted 8 lines
If a controller doesnt support IORDY don't try and use it If a device doesn't support IORDY don't try and use it Otherwise use it whenever possible.
Always use IORDY for PIO3 and higher (it's mandatory)Send the correct
set_featurescommand if operating without IORDYSigned-off-by Alan Cox <[email protected]>
modulo TFLAG_QUIET mentioned in previous email, this seems OK to me.