From: Greg Kroah-Hartman Date: Thu, 12 Jun 2014 23:20:11 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.4.94~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4be137cd204dfef2063df52cb4a5215bd23f84a5;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..9fee935004e --- /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?= +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 +@@ -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 490bf0dd4d5..a957568d73d 100644 --- 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