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

Commit 2aca3923 authored by Tejun Heo's avatar Tejun Heo
Browse files

Revert "libata: quirk read log on no-name M.2 SSD" 



This reverts commit 35f0b6a7.

We now conditionalize issuing of READ LOG PAGE on the TRUSTED
COMPUTING SUPPORTED bit in the identity data and this shouldn't be
necessary.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e8f11db9

drivers/ata/libata-core.c

+0 −4
Original line number Diff line number Diff line
@@ -2079,8 +2079,6 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log, 
	 */

	if (ap_flags & ATA_FLAG_NO_LOG_PAGE)

		return AC_ERR_DEV;

	if (dev->horkage & ATA_HORKAGE_NO_LOG_PAGE)

		return AC_ERR_DEV;



retry:

	ata_tf_init(dev, &tf);
@@ -4583,8 +4581,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "WDC WD3000JD-*",		NULL,	ATA_HORKAGE_WD_BROKEN_LPM },

	{ "WDC WD3200JD-*",		NULL,	ATA_HORKAGE_WD_BROKEN_LPM },





	{ "M.2 (S42) 3ME3",		NULL,	ATA_HORKAGE_NO_LOG_PAGE },

	/* End Marker */

	{ }

};

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ enum { 
	ATA_HORKAGE_NO_DMA_LOG	= (1 << 23),	/* don't use DMA for log read */

	ATA_HORKAGE_NOTRIM	= (1 << 24),	/* don't use TRIM */

	ATA_HORKAGE_MAX_SEC_1024 = (1 << 25),	/* Limit max sects to 1024 */

	ATA_HORKAGE_NO_LOG_PAGE = (1 << 26),	/* Doesn't like Get Log Page */



	 /* DMA mask for user DMA control: User visible values; DO NOT

	    renumber */