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

Commit 15b04859 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Just a couple patches blacklisting more broken devices"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8 (2BA30001)
  libata: disable queued TRIM for Crucial M500 mSATA SSDs
parents 9f93585f b28a613e

drivers/ata/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -4175,6 +4175,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 


	/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */

	{ "ST1000LM024 HN-M101MBB", "2AR10001",	ATA_HORKAGE_BROKEN_FPDMA_AA },

	{ "ST1000LM024 HN-M101MBB", "2BA30001",	ATA_HORKAGE_BROKEN_FPDMA_AA },



	/* Blacklist entries taken from Silicon Image 3124/3132

	   Windows driver .inf file - also several Linux problem reports */
@@ -4225,6 +4226,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* devices that don't properly handle queued TRIM commands */

	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Crucial_CT???M500SSD1",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Crucial_CT???M500SSD3",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },



	/*

	 * Some WD SATA-I drives spin up and down erratically when the link