3 files changed, 44 insertions, 3 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 1393a5890ed5..1a3dbd1b196e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2222,6 +2222,16 @@ int ata_dev_configure(struct ata_device *dev)
         if (rc)
                 return rc;
 
+        /* some WD SATA-1 drives have issues with LPM, turn on NOLPM for them */
+        if ((dev->horkage & ATA_HORKAGE_WD_BROKEN_LPM) &&
+            (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2)
+                dev->horkage |= ATA_HORKAGE_NOLPM;
+
+        if (dev->horkage & ATA_HORKAGE_NOLPM) {
+                ata_dev_warn(dev, "LPM support broken, forcing max_power\n");
+                dev->link->ap->target_lpm_policy = ATA_LPM_MAX_POWER;
+        }
+
         /* let ACPI work its magic */
         rc = ata_acpi_on_devcfg(dev);
         if (rc)
@@ -4216,6 +4226,23 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "Micron_M500*",               NULL,   ATA_HORKAGE_NO_NCQ_TRIM, },
         { "Crucial_CT???M500SSD1",      NULL,   ATA_HORKAGE_NO_NCQ_TRIM, },
 
+        /*
+         * Some WD SATA-I drives spin up and down erratically when the link
+         * is put into the slumber mode.  We don't have full list of the
+         * affected devices.  Disable LPM if the device matches one of the
+         * known prefixes and is SATA-1.  As a side effect LPM partial is
+         * lost too.
+         *
+         * https://bugzilla.kernel.org/show_bug.cgi?id=57211
+         */
+        { "WDC WD800JD-*",              NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD1200JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD1600JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD2000JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD2500JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD3000JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+        { "WDC WD3200JD-*",             NULL,   ATA_HORKAGE_WD_BROKEN_LPM },
+
         /* End Marker */
         { }
 };
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 176f62950e3d..75ef9527603e 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -111,12 +111,14 @@ static const char *ata_lpm_policy_names[] = {
         [ATA_LPM_MIN_POWER]     = "min_power",
 };
 
-static ssize_t ata_scsi_lpm_store(struct device *dev,
+static ssize_t ata_scsi_lpm_store(struct device *device,
                                   struct device_attribute *attr,
                                   const char *buf, size_t count)
 {
-        struct Scsi_Host *shost = class_to_shost(dev);
+        struct Scsi_Host *shost = class_to_shost(device);
         struct ata_port *ap = ata_shost_to_port(shost);
+        struct ata_link *link;
+        struct ata_device *dev;
         enum ata_lpm_policy policy;
         unsigned long flags;
 
@@ -132,10 +134,20 @@ static ssize_t ata_scsi_lpm_store(struct device *dev,
                 return -EINVAL;
 
         spin_lock_irqsave(ap->lock, flags);
+
+        ata_for_each_link(link, ap, EDGE) {
+                ata_for_each_dev(dev, &ap->link, ENABLED) {
+                        if (dev->horkage & ATA_HORKAGE_NOLPM) {
+                                count = -EOPNOTSUPP;
+                                goto out_unlock;
+                        }
+                }
+        }
+
         ap->target_lpm_policy = policy;
         ata_port_schedule_eh(ap);
+out_unlock:
         spin_unlock_irqrestore(ap->lock, flags);
-
         return count;
 }
 
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 9b503376738f..bec6dbe939a0 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -419,6 +419,8 @@ enum {
         ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17),  /* Set max sects to 65535 */
         ATA_HORKAGE_ATAPI_DMADIR = (1 << 18),   /* device requires dmadir */
         ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19),    /* don't use queued TRIM */
+        ATA_HORKAGE_NOLPM       = (1 << 20),    /* don't use LPM */
+        ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21),  /* some WDs have broken LPM */
 
          /* DMA mask for user DMA control: User visible values; DO NOT
             renumber */