diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-12-10 14:31:19 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-12-10 14:31:24 -0500 |
| commit | d419ca08ee993be54873ee22886f1426198fb853 (patch) | |
| tree | f493a96dd573215ba8bd414c106930eedce3ca49 | |
| parent | 850c873f101c220b0e7d400bd7c6bb9805b68ed2 (diff) | |
| download | kernel-d419ca08ee993be54873ee22886f1426198fb853.tar.gz kernel-d419ca08ee993be54873ee22886f1426198fb853.tar.xz kernel-d419ca08ee993be54873ee22886f1426198fb853.zip | |
Fix MSI issues on another Samsung pci-e SSD (rhbz 1084928)
| -rw-r--r-- | ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch | 32 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 39 insertions, 0 deletions
diff --git a/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch b/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch new file mode 100644 index 00000000..edc6ce66 --- /dev/null +++ b/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch @@ -0,0 +1,32 @@ +From 905ef98a83d3782207c0bda8d093e8f654884a94 Mon Sep 17 00:00:00 2001 +From: Tejun Heo <tj@kernel.org> +Date: Thu, 4 Dec 2014 13:13:28 -0500 +Subject: [PATCH] ahci: disable MSI on SAMSUNG 0xa800 SSD + +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 <tj@kernel.org> +Reported-by: Dominik Mierzejewski <dominik@greysector.net> +Link: https://bugzilla.kernel.org/show_bug.cgi?id=89171 +Cc: stable@vger.kernel.org +--- + drivers/ata/ahci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c +index 597b15e7f6e5..ec5d57c152fa 100644 +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -492,6 +492,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 }, +-- +2.1.0 + diff --git a/kernel.spec b/kernel.spec index b2ad7911..7fc1dd25 100644 --- a/kernel.spec +++ b/kernel.spec @@ -629,6 +629,9 @@ Patch26092: xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch Patch26093: uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch Patch26094: uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch +#rhbz 1084928 +Patch26095: ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch + # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch @@ -1368,6 +1371,9 @@ ApplyPatch xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch ApplyPatch uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch +#rhbz 1084928 +ApplyPatch ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch + %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2243,6 +2249,7 @@ fi # || || %changelog * Wed Dec 10 2014 Josh Boyer <jwboyer@fedoraproject.org> +- Fix MSI issues on another Samsung pci-e SSD (rhbz 1084928) - Fix UAS crashes with Seagate and Fresco Logic drives (rhbz 1164945) - CVE-2014-8134 fix espfix for 32-bit KVM paravirt guests (rhbz 1172765 1172769) |