PIO xfermask limits should be shared by all devices on the same
channel to avoid violating device selection timing.  libata used to
guarantee this at core level but I mistakenly dropped the code during
conversion to new EH.  This patch revives that guarantee.

Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
---
Jeff, IMHO, this is a regression and should go into #upstream-fixes.
Thanks.

 drivers/ata/libata-core.c |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Index: work/drivers/ata/libata-core.c
===================================================================
--- work.orig/drivers/ata/libata-core.c
+++ work/drivers/ata/libata-core.c
@@ -3390,6 +3390,7 @@ static void ata_dev_xfermask(struct ata_
        struct ata_port *ap = dev->ap;
        struct ata_host *host = ap->host;
        unsigned long xfer_mask;
+       int i;
 
        /* controller modes available */
        xfer_mask = ata_pack_xfermask(ap->pio_mask,
@@ -3412,6 +3413,22 @@ static void ata_dev_xfermask(struct ata_
                                       dev->mwdma_mask, dev->udma_mask);
        xfer_mask &= ata_id_xfermask(dev->id);
 
+       /* PIO xfermask limits are shared by all devices on the same
+        * channel to avoid violating device selection timing.
+        */
+       for (i = 0; i < ATA_MAX_DEVICES; i++) {
+               struct ata_device *d = &ap->device[i];
+               unsigned int pio_mask;
+
+               if (ata_dev_absent(d))
+                       continue;
+
+               ata_unpack_xfermask(ata_id_xfermask(d->id),
+                                   &pio_mask, NULL, NULL);
+               pio_mask &= d->pio_mask;
+               xfer_mask &= ata_pack_xfermask(pio_mask, UINT_MAX, UINT_MAX);
+       }
+
        /*
         *      CFA Advanced TrueIDE timings are not allowed on a shared
         *      cable
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to