Commit 5920dadf authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: accept late unlocking of HPA 

On certain configurations, HPA isn't or can't be unlocked during
probing but it somehow ends up unlocked afterwards.  In the following
thread, the problem can be reliably reproduced after resuming from
STR.  The BIOS turns on HPA during boot but forgets to do it during
resume.

  http://thread.gmane.org/gmane.linux.kernel/858310



This patch updates libata revalidation such that it considers native
n_sectors.  If the device size has increased to match native
n_sectors, it's assumed that HPA has been unlocked involuntarily and
the device is recognized as the same one.  This should be fairly safe
while nicely working around the problem.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarChristof Warlich <christof@warlich.name>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 7d084d96

drivers/ata/libata-core.c

+23 −7
Original line number Diff line number Diff line
@@ -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) {
@@ -4099,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))
@@ -4128,17 +4130,31 @@ 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 */

		/*

		 * 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;

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ struct ata_device { 
#endif

	/* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */

	u64			n_sectors;	/* size of device, if ATA */

	u64			n_native_sectors; /* native size, if ATA */

	unsigned int		class;		/* ATA_DEV_xxx */

	unsigned long		unpark_deadline;

CRA Git | Maintained and supported by SUSTech CRA and CCSE