1 files changed, 22 insertions, 18 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 927b692d723c..3c89f205c83f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2126,6 +2126,13 @@ int ata_dev_configure(struct ata_device *dev)
         dev->horkage |= ata_dev_blacklisted(dev);
         ata_force_horkage(dev);
 
+        if (dev->horkage & ATA_HORKAGE_DISABLE) {
+                ata_dev_printk(dev, KERN_INFO,
+                               "unsupported device, disabling\n");
+                ata_dev_disable(dev);
+                return 0;
+        }
+
         /* let ACPI work its magic */
         rc = ata_acpi_on_devcfg(dev);
         if (rc)
@@ -3490,22 +3497,11 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
         if ((rc = sata_link_debounce(link, params, deadline)))
                 return rc;
 
-        /* Clear SError.  PMP and some host PHYs require this to
-         * operate and clearing should be done before checking PHY
-         * online status to avoid race condition (hotplugging between
-         * link resume and status check).
-         */
+        /* clear SError, some PHYs require this even for SRST to work */
         if (!(rc = sata_scr_read(link, SCR_ERROR, &serror)))
                 rc = sata_scr_write(link, SCR_ERROR, serror);
-        if (rc == 0 || rc == -EINVAL) {
-                unsigned long flags;
 
-                spin_lock_irqsave(link->ap->lock, flags);
-                link->eh_info.serror = 0;
-                spin_unlock_irqrestore(link->ap->lock, flags);
-                rc = 0;
-        }
-        return rc;
+        return rc != -EINVAL ? rc : 0;
 }
 
 /**
@@ -3653,9 +3649,13 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
         if (check_ready)
                 rc = ata_wait_ready(link, deadline, check_ready);
  out:
-        if (rc && rc != -EAGAIN)
+        if (rc && rc != -EAGAIN) {
+                /* online is set iff link is online && reset succeeded */
+                if (online)
+                        *online = false;
                 ata_link_printk(link, KERN_ERR,
                                 "COMRESET failed (errno=%d)\n", rc);
+        }
         DPRINTK("EXIT, rc=%d\n", rc);
         return rc;
 }
@@ -3700,8 +3700,14 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
  */
 void ata_std_postreset(struct ata_link *link, unsigned int *classes)
 {
+        u32 serror;
+
         DPRINTK("ENTER\n");
 
+        /* reset complete, clear SError */
+        if (!sata_scr_read(link, SCR_ERROR, &serror))
+                sata_scr_write(link, SCR_ERROR, serror);
+
         /* print link status */
         sata_print_link_status(link);
 
@@ -3894,8 +3900,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "SAMSUNG CD-ROM SN-124", "N001",      ATA_HORKAGE_NODMA },
         { "Seagate STT20000A", NULL,            ATA_HORKAGE_NODMA },
         /* Odd clown on sil3726/4726 PMPs */
-        { "Config  Disk",       NULL,           ATA_HORKAGE_NODMA |
-                                                ATA_HORKAGE_SKIP_PM },
+        { "Config  Disk",       NULL,           ATA_HORKAGE_DISABLE },
 
         /* Weird ATAPI devices */
         { "TORiSAN DVD-ROM DRD-N216", NULL,     ATA_HORKAGE_MAX_SEC_128 },
@@ -5616,7 +5621,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                         spin_lock_irqsave(ap->lock, flags);
 
                         ehi->probe_mask |= ATA_ALL_DEVICES;
-                        ehi->action |= ATA_EH_RESET;
+                        ehi->action |= ATA_EH_RESET | ATA_EH_LPM;
                         ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
 
                         ap->pflags &= ~ATA_PFLAG_INITIALIZING;
@@ -5649,7 +5654,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                 struct ata_port *ap = host->ports[i];
 
                 ata_scsi_scan_host(ap, 1);
-                ata_lpm_schedule(ap, ap->pm_policy);
         }
 
         return 0;