[libata] Improve timeout handling

On a timeout call a device specific handler early in the recovery so that
we can complete and process successful commands which timed out due to IRQ
loss or the like rather more elegantly.

[Revised to exclude the timeout handling on a few devices that inherit from
 SFF but are not SFF enough to use the default timeout handler]

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index afa8f704271e..4bceb8803a10 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -17,7 +17,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_isapnp"
-#define DRV_VERSION "0.2.2"
+#define DRV_VERSION "0.2.5"
 
 static struct scsi_host_template isapnp_sht = {
         ATA_PIO_SHT(DRV_NAME),
@@ -28,6 +28,13 @@ static struct ata_port_operations isapnp_port_ops = {
         .cable_detect   = ata_cable_40wire,
 };
 
+static struct ata_port_operations isapnp_noalt_port_ops = {
+        .inherits       = &ata_sff_port_ops,
+        .cable_detect   = ata_cable_40wire,
+        /* No altstatus so we don't want to use the lost interrupt poll */
+        .lost_interrupt = ATA_OP_NULL,
+};
+
 /**
  *      isapnp_init_one         -       attach an isapnp interface
  *      @idev: PnP device
@@ -65,7 +72,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
 
         ap = host->ports[0];
 
-        ap->ops = &isapnp_port_ops;
+        ap->ops = &isapnp_noalt_port_ops;
         ap->pio_mask = ATA_PIO0;
         ap->flags |= ATA_FLAG_SLAVE_POSS;
 
@@ -76,6 +83,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
                                            pnp_port_start(idev, 1), 1);
                 ap->ioaddr.altstatus_addr = ctl_addr;
                 ap->ioaddr.ctl_addr = ctl_addr;
+                ap->ops = &isapnp_port_ops;
         }
 
         ata_sff_std_ports(&ap->ioaddr);