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

Commit 93328e11 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

[PATCH] libata: Fix HPA handling regression 



Restore the support for handling drives that report one sector too many
(ie SCSI not ATA style). This worked before the HPA update but was
removed in that process.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 54174db3

drivers/ata/libata-core.c

+6 −1
Original line number Diff line number Diff line
@@ -915,7 +915,8 @@ static int ata_read_native_max_address(struct ata_device *dev, u64 *max_sectors) 
		*max_sectors = ata_tf_to_lba48(&tf);

	else

		*max_sectors = ata_tf_to_lba(&tf);



        if (dev->horkage & ATA_HORKAGE_HPA_SIZE)

		(*max_sectors)--;

	return 0;

}
@@ -3905,6 +3906,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA },

	{ "MAXTOR 6L080L4",	"A93.0500",	ATA_HORKAGE_BROKEN_HPA },



	/* Devices which report 1 sector over size HPA */

	{ "ST340823A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST320413A",		NULL,		ATA_HORKAGE_HPA_SIZE, },



	/* End Marker */

	{ }

};

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ enum { 
	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */

	ATA_HORKAGE_BROKEN_HPA	= (1 << 4),	/* Broken HPA */

	ATA_HORKAGE_SKIP_PM	= (1 << 5),	/* Skip PM operations */

	ATA_HORKAGE_HPA_SIZE	= (1 << 6),	/* native size off by one */

};



enum hsm_task_states {