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

Commit 577e75e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.  Four patches to update the blacklist and
  add a controller ID"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add PCI ID for Cannon Lake PCH-LP AHCI
  libata: blacklist Micron 500IT SSD with MU01 firmware
  libata: Apply NOLPM quirk for SAMSUNG PM830 CXM13D1Q.
  libata: Blacklist some Sandisk SSDs for NCQ
parents b68ea0ee 4544e403

drivers/ata/ahci.c

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x9c07), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0e), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0f), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9dd3), board_ahci_mobile }, /* Cannon Lake PCH-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f22), board_ahci }, /* Avoton AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f23), board_ahci }, /* Avoton AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f24), board_ahci }, /* Avoton RAID */

drivers/ata/libata-core.c

+8 −1
Original line number Diff line number Diff line
@@ -4493,6 +4493,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */

	{ "C300-CTFDDAC128MAG",	"0001",		ATA_HORKAGE_NONCQ, },



	/* Some Sandisk SSDs lock up hard with NCQ enabled.  Reported on

	   SD7SN6S256G and SD8SN8U256G */

	{ "SanDisk SD[78]SN*G",	NULL,		ATA_HORKAGE_NONCQ, },



	/* devices which puke on READ_NATIVE_MAX */

	{ "HDS724040KLSA80",	"KFAOA20N",	ATA_HORKAGE_BROKEN_HPA, },

	{ "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },
@@ -4549,13 +4553,16 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },



	/* This specific Samsung model/firmware-rev does not handle LPM well */

	/* These specific Samsung models/firmware-revs do not handle LPM well */

	{ "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, },

	{ "SAMSUNG SSD PM830 mSATA *",  "CXM13D1Q", ATA_HORKAGE_NOLPM, },



	/* Sandisk devices which are known to not handle LPM well */

	{ "SanDisk SD7UB3Q*G1001",	NULL,	ATA_HORKAGE_NOLPM, },



	/* devices that don't properly handle queued TRIM commands */

	{ "Micron_M500IT_*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Micron_M500_*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |