UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libata: unlock HPA if device shrunk 

Some BIOSes don't configure HPA during boot but do so while resuming.
This causes harddrives to shrink during resume making libata detach
and reattach them.  This can be worked around by unlocking HPA if old
size equals native size.

Add ATA_DFLAG_UNLOCK_HPA so that HPA unlocking can be controlled
per-device and update ata_dev_revalidate() such that it sets
ATA_DFLAG_UNLOCK_HPA and fails with -EIO when the above condition is
detected.

This patch fixes the following bug.

  https://bugzilla.kernel.org/show_bug.cgi?id=15396

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Oleksandr Yermolenko <yaa.bta@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Tejun Heo 2010-04-05 10:33:13 +09:00 committed by Jeff Garzik
parent 68b0ddb289
commit 445d211b0d
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/ata/libata-core.c
View File

@ -1494,6 +1494,7 @@ static int ata_hpa_resize(struct ata_device *dev)
{ {
struct ata_eh_context *ehc = &dev->link->eh_context; struct ata_eh_context *ehc = &dev->link->eh_context;
int print_info = ehc->i.flags & ATA_EHI_PRINTINFO; int print_info = ehc->i.flags & ATA_EHI_PRINTINFO;
bool unlock_hpa = ata_ignore_hpa || dev->flags & ATA_DFLAG_UNLOCK_HPA;
u64 sectors = ata_id_n_sectors(dev->id); u64 sectors = ata_id_n_sectors(dev->id);
u64 native_sectors; u64 native_sectors;
int rc; int rc;
@ -1510,7 +1511,7 @@ static int ata_hpa_resize(struct ata_device *dev)
/* If device aborted the command or HPA isn't going to /* If device aborted the command or HPA isn't going to
* be unlocked, skip HPA resizing. * be unlocked, skip HPA resizing.
*/ */
if (rc == -EACCES || !ata_ignore_hpa) { if (rc == -EACCES || !unlock_hpa) {
ata_dev_printk(dev, KERN_WARNING, "HPA support seems " ata_dev_printk(dev, KERN_WARNING, "HPA support seems "
"broken, skipping HPA handling\n"); "broken, skipping HPA handling\n");
dev->horkage |= ATA_HORKAGE_BROKEN_HPA; dev->horkage |= ATA_HORKAGE_BROKEN_HPA;
@ -1525,7 +1526,7 @@ static int ata_hpa_resize(struct ata_device *dev)
dev->n_native_sectors = native_sectors; dev->n_native_sectors = native_sectors;
/* nothing to do? */ /* nothing to do? */
if (native_sectors <= sectors || !ata_ignore_hpa) { if (native_sectors <= sectors || !unlock_hpa) {
if (!print_info || native_sectors == sectors) if (!print_info || native_sectors == sectors)
return 0; return 0;
@ -4186,36 +4187,51 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
goto fail; goto fail;
/* verify n_sectors hasn't changed */ /* verify n_sectors hasn't changed */
if (dev->class == ATA_DEV_ATA && n_sectors && if (dev->class != ATA_DEV_ATA || !n_sectors ||
dev->n_sectors != n_sectors) { dev->n_sectors == n_sectors)
ata_dev_printk(dev, KERN_WARNING, "n_sectors mismatch " return 0;
"%llu != %llu\n",
(unsigned long long)n_sectors, /* n_sectors has changed */
(unsigned long long)dev->n_sectors); ata_dev_printk(dev, KERN_WARNING, "n_sectors mismatch %llu != %llu\n",
/* (unsigned long long)n_sectors,
* Something could have caused HPA to be unlocked (unsigned long long)dev->n_sectors);
* involuntarily. If n_native_sectors hasn't changed
* and the new size matches it, keep the device. /*
*/ * Something could have caused HPA to be unlocked
if (dev->n_native_sectors == n_native_sectors && * involuntarily. If n_native_sectors hasn't changed and the
dev->n_sectors > n_sectors && * new size matches it, keep the device.
dev->n_sectors == n_native_sectors) { */
ata_dev_printk(dev, KERN_WARNING, if (dev->n_native_sectors == n_native_sectors &&
"new n_sectors matches native, probably " dev->n_sectors > n_sectors && dev->n_sectors == n_native_sectors) {
"late HPA unlock, continuing\n"); ata_dev_printk(dev, KERN_WARNING,
/* keep using the old n_sectors */ "new n_sectors matches native, probably "
dev->n_sectors = n_sectors; "late HPA unlock, continuing\n");
} else { /* keep using the old n_sectors */
/* restore original n_[native]_sectors and fail */ dev->n_sectors = n_sectors;
dev->n_native_sectors = n_native_sectors; return 0;
dev->n_sectors = n_sectors;
rc = -ENODEV;
goto fail;
}
} }
return 0; /*
* Some BIOSes boot w/o HPA but resume w/ HPA locked. Try
* unlocking HPA in those cases.
*
* https://bugzilla.kernel.org/show_bug.cgi?id=15396
*/
if (dev->n_native_sectors == n_native_sectors &&
dev->n_sectors < n_sectors && n_sectors == n_native_sectors &&
!(dev->horkage & ATA_HORKAGE_BROKEN_HPA)) {
ata_dev_printk(dev, KERN_WARNING,
"old n_sectors matches native, probably "
"late HPA lock, will try to unlock HPA\n");
/* try unlocking HPA */
dev->flags |= ATA_DFLAG_UNLOCK_HPA;
rc = -EIO;
} else
rc = -ENODEV;
/* restore original n_[native_]sectors and fail */
dev->n_native_sectors = n_native_sectors;
dev->n_sectors = n_sectors;
fail: fail:
ata_dev_printk(dev, KERN_ERR, "revalidation failed (errno=%d)\n", rc); ata_dev_printk(dev, KERN_ERR, "revalidation failed (errno=%d)\n", rc);
return rc; return rc;

1
include/linux/libata.h
View File

@ -146,6 +146,7 @@ enum {
ATA_DFLAG_SLEEPING = (1 << 15), /* device is sleeping */ ATA_DFLAG_SLEEPING = (1 << 15), /* device is sleeping */
ATA_DFLAG_DUBIOUS_XFER = (1 << 16), /* data transfer not verified */ ATA_DFLAG_DUBIOUS_XFER = (1 << 16), /* data transfer not verified */
ATA_DFLAG_NO_UNLOAD = (1 << 17), /* device doesn't support unload */ ATA_DFLAG_NO_UNLOAD = (1 << 17), /* device doesn't support unload */
ATA_DFLAG_UNLOCK_HPA = (1 << 18), /* unlock HPA */
ATA_DFLAG_INIT_MASK = (1 << 24) - 1, ATA_DFLAG_INIT_MASK = (1 << 24) - 1,
ATA_DFLAG_DETACH = (1 << 24), ATA_DFLAG_DETACH = (1 << 24),