Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e999736 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

libata: HPA support 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>

Add support for ignoring the BIOS HPA result (off by default) and setting
the disk to the full available size unless already frozen.

Tested with various platforms/disks and confirmed to work with the
Macintosh (which broke earlier) and ata_piix (breakage due to the LBA48
readback that Tejun fixed).

For normal users this brings us, I believe, to feature parity with old IDE
(and of course more featured in some areas too).
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6bfff31e

drivers/ata/libata-core.c

+209 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,10 @@ int libata_fua = 0; 
module_param_named(fua, libata_fua, int, 0444);

module_param_named(fua, libata_fua, int, 0444);

MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");

MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");





static int ata_ignore_hpa = 0;

module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);

MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");



static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;

static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;

module_param(ata_probe_timeout, int, 0444);

module_param(ata_probe_timeout, int, 0444);

MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");

MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -808,6 +812,202 @@ void ata_id_c_string(const u16 *id, unsigned char *s, 
	*p = '\0';

	*p = '\0';

}

}





static u64 ata_tf_to_lba48(struct ata_taskfile *tf)

{

	u64 sectors = 0;



	sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40;

	sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32;

	sectors |= (tf->hob_lbal & 0xff) << 24;

	sectors |= (tf->lbah & 0xff) << 16;

	sectors |= (tf->lbam & 0xff) << 8;

	sectors |= (tf->lbal & 0xff);



	return ++sectors;

}



static u64 ata_tf_to_lba(struct ata_taskfile *tf)

{

	u64 sectors = 0;



	sectors |= (tf->device & 0x0f) << 24;

	sectors |= (tf->lbah & 0xff) << 16;

	sectors |= (tf->lbam & 0xff) << 8;

	sectors |= (tf->lbal & 0xff);



	return ++sectors;

}



/**

 *	ata_read_native_max_address_ext	-	LBA48 native max query

 *	@dev: Device to query

 *

 *	Perform an LBA48 size query upon the device in question. Return the

 *	actual LBA48 size or zero if the command fails.

 */



static u64 ata_read_native_max_address_ext(struct ata_device *dev)

{

	unsigned int err;

	struct ata_taskfile tf;



	ata_tf_init(dev, &tf);



	tf.command = ATA_CMD_READ_NATIVE_MAX_EXT;

	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48 | ATA_TFLAG_ISADDR;

	tf.protocol |= ATA_PROT_NODATA;

	tf.device |= 0x40;



	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);

	if (err)

		return 0;



	return ata_tf_to_lba48(&tf);

}



/**

 *	ata_read_native_max_address	-	LBA28 native max query

 *	@dev: Device to query

 *

 *	Performa an LBA28 size query upon the device in question. Return the

 *	actual LBA28 size or zero if the command fails.

 */



static u64 ata_read_native_max_address(struct ata_device *dev)

{

	unsigned int err;

	struct ata_taskfile tf;



	ata_tf_init(dev, &tf);



	tf.command = ATA_CMD_READ_NATIVE_MAX;

	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;

	tf.protocol |= ATA_PROT_NODATA;

	tf.device |= 0x40;



	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);

	if (err)

		return 0;



	return ata_tf_to_lba(&tf);

}



/**

 *	ata_set_native_max_address_ext	-	LBA48 native max set

 *	@dev: Device to query

 *

 *	Perform an LBA48 size set max upon the device in question. Return the

 *	actual LBA48 size or zero if the command fails.

 */



static u64 ata_set_native_max_address_ext(struct ata_device *dev, u64 new_sectors)

{

	unsigned int err;

	struct ata_taskfile tf;



	new_sectors--;



	ata_tf_init(dev, &tf);



	tf.command = ATA_CMD_SET_MAX_EXT;

	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48 | ATA_TFLAG_ISADDR;

	tf.protocol |= ATA_PROT_NODATA;

	tf.device |= 0x40;



	tf.lbal = (new_sectors >> 0) & 0xff;

	tf.lbam = (new_sectors >> 8) & 0xff;

	tf.lbah = (new_sectors >> 16) & 0xff;



	tf.hob_lbal = (new_sectors >> 24) & 0xff;

	tf.hob_lbam = (new_sectors >> 32) & 0xff;

	tf.hob_lbah = (new_sectors >> 40) & 0xff;



	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);

	if (err)

		return 0;



	return ata_tf_to_lba48(&tf);

}



/**

 *	ata_set_native_max_address	-	LBA28 native max set

 *	@dev: Device to query

 *

 *	Perform an LBA28 size set max upon the device in question. Return the

 *	actual LBA28 size or zero if the command fails.

 */



static u64 ata_set_native_max_address(struct ata_device *dev, u64 new_sectors)

{

	unsigned int err;

	struct ata_taskfile tf;



	new_sectors--;



	ata_tf_init(dev, &tf);



	tf.command = ATA_CMD_SET_MAX;

	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;

	tf.protocol |= ATA_PROT_NODATA;



	tf.lbal = (new_sectors >> 0) & 0xff;

	tf.lbam = (new_sectors >> 8) & 0xff;

	tf.lbah = (new_sectors >> 16) & 0xff;

	tf.device |= ((new_sectors >> 24) & 0x0f) | 0x40;



	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);

	if (err)

		return 0;



	return ata_tf_to_lba(&tf);

}



/**

 *	ata_hpa_resize		-	Resize a device with an HPA set

 *	@dev: Device to resize

 *

 *	Read the size of an LBA28 or LBA48 disk with HPA features and resize

 *	it if required to the full size of the media. The caller must check

 *	the drive has the HPA feature set enabled.

 */



static u64 ata_hpa_resize(struct ata_device *dev)

{

	u64 sectors = dev->n_sectors;

	u64 hpa_sectors;

	

	if (ata_id_has_lba48(dev->id))

		hpa_sectors = ata_read_native_max_address_ext(dev);

	else

		hpa_sectors = ata_read_native_max_address(dev);



	/* if no hpa, both should be equal */

	ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, hpa_sectors = %lld\n",

		__FUNCTION__, sectors, hpa_sectors);



	if (hpa_sectors > sectors) {

		ata_dev_printk(dev, KERN_INFO,

			"Host Protected Area detected:\n"

			"\tcurrent size: %lld sectors\n"

			"\tnative size: %lld sectors\n",

			sectors, hpa_sectors);



		if (ata_ignore_hpa) {

			if (ata_id_has_lba48(dev->id))

				hpa_sectors = ata_set_native_max_address_ext(dev, hpa_sectors);

			else

				hpa_sectors = ata_set_native_max_address(dev, hpa_sectors);



			if (hpa_sectors) {

				ata_dev_printk(dev, KERN_INFO,

					"native size increased to %lld sectors\n", hpa_sectors);

				return hpa_sectors;

			}

		}

	}

	return sectors;

}



static u64 ata_id_n_sectors(const u16 *id)

static u64 ata_id_n_sectors(const u16 *id)

{

{

	if (ata_id_has_lba(id)) {

	if (ata_id_has_lba(id)) {
@@ -1662,6 +1862,7 @@ int ata_dev_configure(struct ata_device *dev) 
			snprintf(revbuf, 7, "ATA-%d",  ata_id_major_version(id));

			snprintf(revbuf, 7, "ATA-%d",  ata_id_major_version(id));





		dev->n_sectors = ata_id_n_sectors(id);

		dev->n_sectors = ata_id_n_sectors(id);

		dev->n_sectors_boot = dev->n_sectors;





		/* SCSI only uses 4-char revisions, dump full 8 chars from ATA */

		/* SCSI only uses 4-char revisions, dump full 8 chars from ATA */

		ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,

		ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
@@ -1688,6 +1889,9 @@ int ata_dev_configure(struct ata_device *dev) 
					dev->flags |= ATA_DFLAG_FLUSH_EXT;

					dev->flags |= ATA_DFLAG_FLUSH_EXT;

			}

			}





			if (ata_id_hpa_enabled(dev->id))

				dev->n_sectors = ata_hpa_resize(dev);



			/* config NCQ */

			/* config NCQ */

			ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));

			ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
@@ -3346,6 +3550,11 @@ static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class, 
			       "%llu != %llu\n",

			       "%llu != %llu\n",

			       (unsigned long long)dev->n_sectors,

			       (unsigned long long)dev->n_sectors,

			       (unsigned long long)new_n_sectors);

			       (unsigned long long)new_n_sectors);

		/* Are we the boot time size - if so we appear to be the

		   same disk at this point and our HPA got reapplied */

		if (ata_ignore_hpa && dev->n_sectors_boot == new_n_sectors 

		    && ata_id_hpa_enabled(new_id))

			return 1;

		return 0;

		return 0;

	}

	}

include/linux/ata.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,8 @@ enum { 
	ATA_CMD_INIT_DEV_PARAMS	= 0x91,

	ATA_CMD_INIT_DEV_PARAMS	= 0x91,

	ATA_CMD_READ_NATIVE_MAX	= 0xF8,

	ATA_CMD_READ_NATIVE_MAX	= 0xF8,

	ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,

	ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,

	ATA_CMD_SET_MAX		= 0xF9,

	ATA_CMD_SET_MAX_EXT	= 0x37,

	ATA_CMD_READ_LOG_EXT	= 0x2f,

	ATA_CMD_READ_LOG_EXT	= 0x2f,





	/* READ_LOG_EXT pages */

	/* READ_LOG_EXT pages */

include/linux/libata.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -446,6 +446,7 @@ struct ata_device { 
	struct scsi_device	*sdev;		/* attached SCSI device */

	struct scsi_device	*sdev;		/* attached SCSI device */

	/* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */

	/* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */

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

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

	u64			n_sectors_boot;	/* size of ATA device at startup */

	unsigned int		class;		/* ATA_DEV_xxx */

	unsigned int		class;		/* ATA_DEV_xxx */

	u16			id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */

	u16			id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */

	u8			pio_mode;

	u8			pio_mode;