]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
libata: improve HPA error handling
authorTejun Heo <htejun@gmail.com>
Sun, 23 Mar 2008 12:05:15 +0000 (21:05 +0900)
committerJeff Garzik <jeff@garzik.org>
Tue, 25 Mar 2008 02:09:40 +0000 (22:09 -0400)
There's no point in retrying and eventually failing device detection
when the device rejects READ_NATIVE_MAX[_EXT].  Disable HPA unlocking
if READ_NATIVE_MAX[_EXT] is rejected as done when SET_MAX[_EXT] is
rejected.

This allows some old drives to work even if they aren't blacklisted.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/libata-core.c

index c9c52803d0c25217b48efb87de6c52a25136edb4..c4248b37ff645c71422d67f1c67802458d020a72 100644 (file)
@@ -1416,12 +1416,12 @@ static int ata_hpa_resize(struct ata_device *dev)
        /* read native max address */
        rc = ata_read_native_max_address(dev, &native_sectors);
        if (rc) {
-               /* If HPA isn't going to be unlocked, skip HPA
-                * resizing from the next try.
+               /* If device aborted the command or HPA isn't going to
+                * be unlocked, skip HPA resizing.
                 */
-               if (!ata_ignore_hpa) {
+               if (rc == -EACCES || !ata_ignore_hpa) {
                        ata_dev_printk(dev, KERN_WARNING, "HPA support seems "
-                                      "broken, will skip HPA handling\n");
+                                      "broken, skipping HPA handling\n");
                        dev->horkage |= ATA_HORKAGE_BROKEN_HPA;
 
                        /* we can continue if device aborted the command */