Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 41 insertions, 9 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 045a486a09ea..8ac98ff16d7d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1515,6 +1515,7 @@ static int ata_hpa_resize(struct ata_device *dev)
 
                 return rc;
         }
+        dev->n_native_sectors = native_sectors;
 
         /* nothing to do? */
         if (native_sectors <= sectors || !ata_ignore_hpa) {
@@ -3392,17 +3393,27 @@ int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel)
 
 static int ata_dev_set_mode(struct ata_device *dev)
 {
+        struct ata_port *ap = dev->link->ap;
         struct ata_eh_context *ehc = &dev->link->eh_context;
+        const bool nosetxfer = dev->horkage & ATA_HORKAGE_NOSETXFER;
         const char *dev_err_whine = "";
         int ign_dev_err = 0;
-        unsigned int err_mask;
+        unsigned int err_mask = 0;
         int rc;
 
         dev->flags &= ~ATA_DFLAG_PIO;
         if (dev->xfer_shift == ATA_SHIFT_PIO)
                 dev->flags |= ATA_DFLAG_PIO;
 
-        err_mask = ata_dev_set_xfermode(dev);
+        if (nosetxfer && ap->flags & ATA_FLAG_SATA && ata_id_is_sata(dev->id))
+                dev_err_whine = " (SET_XFERMODE skipped)";
+        else {
+                if (nosetxfer)
+                        ata_dev_printk(dev, KERN_WARNING,
+                                       "NOSETXFER but PATA detected - can't "
+                                       "skip SETXFER, might malfunction\n");
+                err_mask = ata_dev_set_xfermode(dev);
+        }
 
         if (err_mask & ~AC_ERR_DEV)
                 goto fail;
@@ -4089,6 +4100,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
                        unsigned int readid_flags)
 {
         u64 n_sectors = dev->n_sectors;
+        u64 n_native_sectors = dev->n_native_sectors;
         int rc;
 
         if (!ata_dev_enabled(dev))
@@ -4118,16 +4130,30 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
         /* verify n_sectors hasn't changed */
         if (dev->class == ATA_DEV_ATA && n_sectors &&
             dev->n_sectors != n_sectors) {
-                ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "
+                ata_dev_printk(dev, KERN_WARNING, "n_sectors mismatch "
                                "%llu != %llu\n",
                                (unsigned long long)n_sectors,
                                (unsigned long long)dev->n_sectors);
-
-                /* restore original n_sectors */
-                dev->n_sectors = n_sectors;
-
-                rc = -ENODEV;
-                goto fail;
+                /*
+                 * Something could have caused HPA to be unlocked
+                 * involuntarily.  If n_native_sectors hasn't changed
+                 * and the new size matches it, keep the device.
+                 */
+                if (dev->n_native_sectors == n_native_sectors &&
+                    dev->n_sectors > n_sectors &&
+                    dev->n_sectors == n_native_sectors) {
+                        ata_dev_printk(dev, KERN_WARNING,
+                                       "new n_sectors matches native, probably "
+                                       "late HPA unlock, continuing\n");
+                        /* keep using the old n_sectors */
+                        dev->n_sectors = n_sectors;
+                } else {
+                        /* restore original n_[native]_sectors and fail */
+                        dev->n_native_sectors = n_native_sectors;
+                        dev->n_sectors = n_sectors;
+                        rc = -ENODEV;
+                        goto fail;
+                }
         }
 
         return 0;
@@ -4297,6 +4323,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices which aren't very happy with higher link speeds */
         { "WD My Book",                 NULL,   ATA_HORKAGE_1_5_GBPS, },
 
+        /*
+         * Devices which choke on SETXFER.  Applies only if both the
+         * device and controller are SATA.
+         */
+        { "PIONEER DVD-RW  DVRTD08",    "1.00", ATA_HORKAGE_NOSETXFER },
+
         /* End Marker */
         { }
 };