Commit ac9f0c81 authored by Anton Lundin's avatar Anton Lundin Committed by Damien Le Moal
Browse files

ata: libata-core: Introduce ATA_HORKAGE_NO_LOG_DIR horkage 



06f6c4c6 ("ata: libata: add missing ata_identify_page_supported() calls")
introduced additional calls to ata_identify_page_supported(), thus also
adding indirectly accesses to the device log directory log page through
ata_log_supported(). Reading this log page causes SATADOM-ML 3ME devices
to lock up.

Introduce the horkage flag ATA_HORKAGE_NO_LOG_DIR to prevent accesses to
the log directory in ata_log_supported() and add a blacklist entry
with this flag for "SATADOM-ML 3ME" devices.

Fixes: 636f6e2a ("libata: add horkage for missing Identify Device log")
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: default avatarAnton Lundin <glance@acc.umu.se>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent d052c5d3

drivers/ata/libata-core.c

+10 −0
Original line number Diff line number Diff line
@@ -2007,6 +2007,9 @@ static bool ata_log_supported(struct ata_device *dev, u8 log) 
{

	struct ata_port *ap = dev->link->ap;



	if (dev->horkage & ATA_HORKAGE_NO_LOG_DIR)

		return false;



	if (ata_read_log_page(dev, ATA_LOG_DIRECTORY, 0, ap->sector_buf, 1))

		return false;

	return get_unaligned_le16(&ap->sector_buf[log * 2]) ? true : false;
@@ -4073,6 +4076,13 @@ 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 },



	/*

	 * This sata dom device goes on a walkabout when the ATA_LOG_DIRECTORY

	 * log page is accessed. Ensure we never ask for this log page with

	 * these devices.

	 */

	{ "SATADOM-ML 3ME",		NULL,	ATA_HORKAGE_NO_LOG_DIR },



	/* End Marker */

	{ }

};

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ enum { 
	ATA_HORKAGE_MAX_TRIM_128M = (1 << 26),	/* Limit max trim size to 128M */

	ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27),	/* Disable NCQ on ATI chipset */

	ATA_HORKAGE_NO_ID_DEV_LOG = (1 << 28),	/* Identify device log missing */

	ATA_HORKAGE_NO_LOG_DIR	= (1 << 29),	/* Do not read log directory */



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

	    renumber */