From: Greg Kroah-Hartman Date: Mon, 8 Dec 2014 04:57:44 +0000 (-0800) Subject: 3.14-stable patches X-Git-Tag: v3.10.63~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37f294ee15aac76770c265041d62db73d0e7bc47;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: ahci-add-deviceids-for-sunrise-point-lp-sata-controller.patch ahci-disable-msi-on-samsung-0xa800-ssd.patch sata_fsl-fix-error-handling-of-irq_of_parse_and_map.patch --- diff --git a/queue-3.14/ahci-add-deviceids-for-sunrise-point-lp-sata-controller.patch b/queue-3.14/ahci-add-deviceids-for-sunrise-point-lp-sata-controller.patch new file mode 100644 index 00000000000..e82b67e44c7 --- /dev/null +++ b/queue-3.14/ahci-add-deviceids-for-sunrise-point-lp-sata-controller.patch @@ -0,0 +1,31 @@ +From 249cd0a187ed4ef1d0af7f74362cc2791ec5581b Mon Sep 17 00:00:00 2001 +From: Devin Ryles +Date: Fri, 7 Nov 2014 17:59:05 -0500 +Subject: AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller + +From: Devin Ryles + +commit 249cd0a187ed4ef1d0af7f74362cc2791ec5581b upstream. + +This patch adds DeviceIDs for Sunrise Point-LP. + +Signed-off-by: Devin Ryles +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/ahci.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -322,6 +322,9 @@ static const struct pci_device_id ahci_p + { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */ ++ { PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */ ++ { PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */ ++ { PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */ + { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */ + { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */ diff --git a/queue-3.14/ahci-disable-msi-on-samsung-0xa800-ssd.patch b/queue-3.14/ahci-disable-msi-on-samsung-0xa800-ssd.patch new file mode 100644 index 00000000000..fb9037a5aca --- /dev/null +++ b/queue-3.14/ahci-disable-msi-on-samsung-0xa800-ssd.patch @@ -0,0 +1,32 @@ +From 2b21ef0aae65f22f5ba86b13c4588f6f0c2dbefb Mon Sep 17 00:00:00 2001 +From: Tejun Heo +Date: Thu, 4 Dec 2014 13:13:28 -0500 +Subject: ahci: disable MSI on SAMSUNG 0xa800 SSD + +From: Tejun Heo + +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: Greg Kroah-Hartman + +--- + drivers/ata/ahci.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -496,6 +496,7 @@ static const struct pci_device_id ahci_p + * 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 }, diff --git a/queue-3.14/sata_fsl-fix-error-handling-of-irq_of_parse_and_map.patch b/queue-3.14/sata_fsl-fix-error-handling-of-irq_of_parse_and_map.patch new file mode 100644 index 00000000000..0676ab1ad5e --- /dev/null +++ b/queue-3.14/sata_fsl-fix-error-handling-of-irq_of_parse_and_map.patch @@ -0,0 +1,31 @@ +From aad0b624129709c94c2e19e583b6053520353fa8 Mon Sep 17 00:00:00 2001 +From: Dmitry Torokhov +Date: Fri, 14 Nov 2014 13:39:05 -0800 +Subject: sata_fsl: fix error handling of irq_of_parse_and_map + +From: Dmitry Torokhov + +commit aad0b624129709c94c2e19e583b6053520353fa8 upstream. + +irq_of_parse_and_map() returns 0 on error (the result is unsigned int), +so testing for negative result never works. + +Signed-off-by: Dmitry Torokhov +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/sata_fsl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/ata/sata_fsl.c ++++ b/drivers/ata/sata_fsl.c +@@ -1503,7 +1503,7 @@ static int sata_fsl_probe(struct platfor + host_priv->csr_base = csr_base; + + irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); +- if (irq < 0) { ++ if (!irq) { + dev_err(&ofdev->dev, "invalid irq from platform\n"); + goto error_exit_with_cleanup; + } diff --git a/queue-3.14/series b/queue-3.14/series index 9b790987870..ada4606e1f9 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -12,3 +12,6 @@ drm-i915-unlock-panel-even-when-lvds-is-disabled.patch x86-use-objdump-instead-of-plain-objdump.patch media-smiapp-only-some-selection-targets-are-settable.patch usb-xhci-reset-a-halted-endpoint-immediately-when-we-encounter-a-stall.patch +ahci-add-deviceids-for-sunrise-point-lp-sata-controller.patch +ahci-disable-msi-on-samsung-0xa800-ssd.patch +sata_fsl-fix-error-handling-of-irq_of_parse_and_map.patch