From: Alan Cox Debugging a report of a problem with an ancient solid state disk showed up some problems in the IORDY handling 1. We check the wrong bit to see if the device has IORDY 2. Even then some ancient creaking piles of crap don't support SETXFER at all. I think this should go via -mm for a bit. The cases it fixes are obscure and the risk of side effects is slight but possible. This also moves us slightly closer to supporting original MFM/RLL disks with libata but before Jeff panics I have no plans to do that.... Signed-off-by: Alan Cox Acked-by: Sergei Shtylyov Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton --- drivers/ata/libata-core.c | 6 +++++- include/linux/ata.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff -puN drivers/ata/libata-core.c~libata-correct-iordy-handling drivers/ata/libata-core.c --- a/drivers/ata/libata-core.c~libata-correct-iordy-handling +++ a/drivers/ata/libata-core.c @@ -2787,7 +2787,11 @@ static int ata_dev_set_mode(struct ata_d /* Old CFA may refuse this command, which is just fine */ if (dev->xfer_shift == ATA_SHIFT_PIO && ata_id_is_cfa(dev->id)) err_mask &= ~AC_ERR_DEV; - + /* Some very old devices and some bad newer ones fail any kind of + SET_XFERMODE request but support PIO0-2 timings and no IORDY */ + if (dev->xfer_shift == ATA_SHIFT_PIO && !ata_id_has_iordy(dev->id) && + dev->pio_mode <= XFER_PIO_2) + err_mask &= ~AC_ERR_DEV; if (err_mask) { ata_dev_printk(dev, KERN_ERR, "failed to set xfermode " "(err_mask=0x%x)\n", err_mask); diff -puN include/linux/ata.h~libata-correct-iordy-handling include/linux/ata.h --- a/include/linux/ata.h~libata-correct-iordy-handling +++ a/include/linux/ata.h @@ -354,7 +354,7 @@ struct ata_taskfile { ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \ ((id)[78] & (1 << 5)) ) #define ata_id_iordy_disable(id) ((id)[49] & (1 << 10)) -#define ata_id_has_iordy(id) ((id)[49] & (1 << 9)) +#define ata_id_has_iordy(id) ((id)[49] & (1 << 11)) #define ata_id_u32(id,n) \ (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)])) #define ata_id_u64(id,n) \ _