1 files changed, 24 insertions, 84 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 81898036dbca..33f06277b3be 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -30,6 +30,14 @@
  *  Hardware documentation available from http://www.t13.org/ and
  *  http://www.sata-io.org/
  *
+ *  Standards documents from:
+ *      http://www.t13.org (ATA standards, PCI DMA IDE spec)
+ *      http://www.t10.org (SCSI MMC - for ATAPI MMC)
+ *      http://www.sata-io.org (SATA)
+ *      http://www.compactflash.org (CF)
+ *      http://www.qic.org (QIC157 - Tape and DSC)
+ *      http://www.ce-ata.org (CE-ATA: not supported)
+ *
  */
 
 #include <linux/kernel.h>
@@ -2307,8 +2315,10 @@ int ata_dev_configure(struct ata_device *dev)
         }
 
         if ((dev->class == ATA_DEV_ATAPI) &&
-            (atapi_command_packet_set(id) == TYPE_TAPE))
+            (atapi_command_packet_set(id) == TYPE_TAPE)) {
                 dev->max_sectors = ATA_MAX_SECTORS_TAPE;
+                dev->horkage |= ATA_HORKAGE_STUCK_ERR;
+        }
 
         if (dev->horkage & ATA_HORKAGE_MAX_SEC_128)
                 dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_128,
@@ -2581,81 +2591,6 @@ void sata_print_link_status(struct ata_link *link)
 }
 
 /**
- *      __sata_phy_reset - Wake/reset a low-level SATA PHY
- *      @ap: SATA port associated with target SATA PHY.
- *
- *      This function issues commands to standard SATA Sxxx
- *      PHY registers, to wake up the phy (and device), and
- *      clear any reset condition.
- *
- *      LOCKING:
- *      PCI/etc. bus probe sem.
- *
- */
-void __sata_phy_reset(struct ata_port *ap)
-{
-        struct ata_link *link = &ap->link;
-        unsigned long timeout = jiffies + (HZ * 5);
-        u32 sstatus;
-
-        if (ap->flags & ATA_FLAG_SATA_RESET) {
-                /* issue phy wake/reset */
-                sata_scr_write_flush(link, SCR_CONTROL, 0x301);
-                /* Couldn't find anything in SATA I/II specs, but
-                 * AHCI-1.1 10.4.2 says at least 1 ms. */
-                mdelay(1);
-        }
-        /* phy wake/clear reset */
-        sata_scr_write_flush(link, SCR_CONTROL, 0x300);
-
-        /* wait for phy to become ready, if necessary */
-        do {
-                msleep(200);
-                sata_scr_read(link, SCR_STATUS, &sstatus);
-                if ((sstatus & 0xf) != 1)
-                        break;
-        } while (time_before(jiffies, timeout));
-
-        /* print link status */
-        sata_print_link_status(link);
-
-        /* TODO: phy layer with polling, timeouts, etc. */
-        if (!ata_link_offline(link))
-                ata_port_probe(ap);
-        else
-                ata_port_disable(ap);
-
-        if (ap->flags & ATA_FLAG_DISABLED)
-                return;
-
-        if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-                ata_port_disable(ap);
-                return;
-        }
-
-        ap->cbl = ATA_CBL_SATA;
-}
-
-/**
- *      sata_phy_reset - Reset SATA bus.
- *      @ap: SATA port associated with target SATA PHY.
- *
- *      This function resets the SATA bus, and then probes
- *      the bus for devices.
- *
- *      LOCKING:
- *      PCI/etc. bus probe sem.
- *
- */
-void sata_phy_reset(struct ata_port *ap)
-{
-        __sata_phy_reset(ap);
-        if (ap->flags & ATA_FLAG_DISABLED)
-                return;
-        ata_bus_reset(ap);
-}
-
-/**
  *      ata_dev_pair            -       return other device on cable
  *      @adev: device
  *
@@ -5490,11 +5425,19 @@ fsm_start:
                  * let the EH abort the command or reset the device.
                  */
                 if (unlikely(status & (ATA_ERR | ATA_DF))) {
-                        ata_port_printk(ap, KERN_WARNING, "DRQ=1 with device "
-                                        "error, dev_stat 0x%X\n", status);
-                        qc->err_mask |= AC_ERR_HSM;
-                        ap->hsm_task_state = HSM_ST_ERR;
-                        goto fsm_start;
+                        /* Some ATAPI tape drives forget to clear the ERR bit
+                         * when doing the next command (mostly request sense).
+                         * We ignore ERR here to workaround and proceed sending
+                         * the CDB.
+                         */
+                        if (!(qc->dev->horkage & ATA_HORKAGE_STUCK_ERR)) {
+                                ata_port_printk(ap, KERN_WARNING,
+                                                "DRQ=1 with device error, "
+                                                "dev_stat 0x%X\n", status);
+                                qc->err_mask |= AC_ERR_HSM;
+                                ap->hsm_task_state = HSM_ST_ERR;
+                                goto fsm_start;
+                        }
                 }
 
                 /* Send the CDB (atapi) or the first data block (ata pio out).
@@ -7653,8 +7596,6 @@ EXPORT_SYMBOL_GPL(ata_dev_disable);
 EXPORT_SYMBOL_GPL(sata_set_spd);
 EXPORT_SYMBOL_GPL(sata_link_debounce);
 EXPORT_SYMBOL_GPL(sata_link_resume);
-EXPORT_SYMBOL_GPL(sata_phy_reset);
-EXPORT_SYMBOL_GPL(__sata_phy_reset);
 EXPORT_SYMBOL_GPL(ata_bus_reset);
 EXPORT_SYMBOL_GPL(ata_std_prereset);
 EXPORT_SYMBOL_GPL(ata_std_softreset);
@@ -7725,7 +7666,6 @@ EXPORT_SYMBOL_GPL(ata_port_desc);
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL_GPL(ata_port_pbar_desc);
 #endif /* CONFIG_PCI */
-EXPORT_SYMBOL_GPL(ata_eng_timeout);
 EXPORT_SYMBOL_GPL(ata_port_schedule_eh);
 EXPORT_SYMBOL_GPL(ata_link_abort);
 EXPORT_SYMBOL_GPL(ata_port_abort);