From: Tejun Heo Date: Thu, 4 Dec 2014 18:13:28 +0000 (-0500) Subject: ahci: disable MSI on SAMSUNG 0xa800 SSD X-Git-Tag: v3.4.107~150 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa01e324fdc18c371ef3fc206cc8909e13bdacf8;p=thirdparty%2Fkernel%2Fstable.git ahci: disable MSI on SAMSUNG 0xa800 SSD commit 2b21ef0aae65f22f5ba86b13c4588f6f0c2dbefb upstream. Just like 0x1600 which got blacklisted by 66a7cbc303f4 ("ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks"), 0xa800 chokes on NCQ commands if MSI is enabled. Disable MSI. Signed-off-by: Tejun Heo Reported-by: Dominik Mierzejewski Link: https://bugzilla.kernel.org/show_bug.cgi?id=89171 Signed-off-by: Zefan Li --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 4aa63bf3384e5..6fc61eb07b7bf 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -493,6 +493,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { * enabled. https://bugzilla.kernel.org/show_bug.cgi?id=60731 */ { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi }, + { PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi }, /* Enmotus */ { PCI_DEVICE(0x1c44, 0x8000), board_ahci },