From: Greg Kroah-Hartman Date: Thu, 12 Jun 2014 23:20:02 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.4.94~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02d53b7607c9048986b4fc1763fb636c7af3ac05;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: ahci-add-device-id-for-highpoint-rocketraid-642l.patch ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch --- diff --git a/queue-3.10/ahci-add-device-id-for-highpoint-rocketraid-642l.patch b/queue-3.10/ahci-add-device-id-for-highpoint-rocketraid-642l.patch new file mode 100644 index 00000000000..48dfbf2414f --- /dev/null +++ b/queue-3.10/ahci-add-device-id-for-highpoint-rocketraid-642l.patch @@ -0,0 +1,39 @@ +From d251836508fb26cd1a22b41381739835ee23728d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= +Date: Tue, 3 Jun 2014 14:56:25 -0400 +Subject: ahci: Add Device ID for HighPoint RocketRaid 642L +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= + +commit d251836508fb26cd1a22b41381739835ee23728d upstream. + +This device normally comes with a proprietary driver, using a web GUI +to configure RAID: + http://www.highpoint-tech.com/USA_new/series_rr600-download.htm +But thankfully it also works out of the box with the AHCI driver, +being just a Marvell 88SE9235. + +Devices 640L, 644L, 644LS should also be supported but not tested here. + +Signed-off-by: Jérôme Carretero +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/ahci.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -448,6 +448,8 @@ static const struct pci_device_id ahci_p + .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), + .driver_data = board_ahci_yes_fbs }, ++ { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), ++ .driver_data = board_ahci_yes_fbs }, + + /* Promise */ + { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */ diff --git a/queue-3.10/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch b/queue-3.10/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch new file mode 100644 index 00000000000..938b2b92176 --- /dev/null +++ b/queue-3.10/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch @@ -0,0 +1,34 @@ +From 754a292fe6b08196cb135c03b404444e17de520a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20Schr=C3=A4gle?= +Date: Sat, 24 May 2014 16:35:43 +0200 +Subject: ahci: add PCI ID for Marvell 88SE91A0 SATA Controller +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Andreas=20Schr=C3=A4gle?= + +commit 754a292fe6b08196cb135c03b404444e17de520a upstream. + +Add support for Marvell Technology Group Ltd. 88SE91A0 SATA 6Gb/s +Controller by adding its PCI ID. + +Signed-off-by: Andreas Schrägle +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/ahci.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -444,6 +444,8 @@ static const struct pci_device_id ahci_p + .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192), + .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */ ++ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0), ++ .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3), + .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), diff --git a/queue-3.10/series b/queue-3.10/series index 6df052e2162..0287ce10abe 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -14,3 +14,5 @@ mm-compaction-make-isolate_freepages-start-at-pageblock-boundary.patch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch scsi-megaraid-use-resource_size_t-for-pci-resources-not-long.patch mei-me-drop-harmful-wait-optimization.patch +ahci-add-device-id-for-highpoint-rocketraid-642l.patch +ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch