3.4-stable patches

added patches:
	ahci-add-device-id-for-highpoint-rocketraid-642l.patch

diff --git a/queue-3.4/ahci-add-device-id-for-highpoint-rocketraid-642l.patch b/queue-3.4/ahci-add-device-id-for-highpoint-rocketraid-642l.patch
new file mode 100644 (file)
index 0000000..9fee935
--- /dev/null
+++ b/queue-3.4/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?= <cJ-ko@zougloub.eu>
+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?= <cJ-ko@zougloub.eu>
+
+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 <cJ-ko@zougloub.eu>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -441,6 +441,8 @@ static const struct pci_device_id ahci_p
+         .driver_data = board_ahci_yes_fbs },
+       { PCI_DEVICE(0x1b4b, 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.4/series b/queue-3.4/series
index 490bf0dd4d5b2b90c4bc898966b6136f9339b6cf..a957568d73d1700d4b6bb1366e7f6075dce90ddc 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -5,3 +5,4 @@ zram-protect-sysfs-handler-from-invalid-memory-access.patch
 staging-zram-fix-memory-leak-by-refcount-mismatch.patch
 auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
 scsi-megaraid-use-resource_size_t-for-pci-resources-not-long.patch
+ahci-add-device-id-for-highpoint-rocketraid-642l.patch