3.4-stable patches

added patches:
	libata-ahci-add-support-for-enmotus-bobcat-device.patch

diff --git a/queue-3.4/libata-ahci-add-support-for-enmotus-bobcat-device.patch b/queue-3.4/libata-ahci-add-support-for-enmotus-bobcat-device.patch
new file mode 100644 (file)
index 0000000..5229f8d
--- /dev/null
+++ b/queue-3.4/libata-ahci-add-support-for-enmotus-bobcat-device.patch
@@ -0,0 +1,53 @@
+From 7f9c9f8e24590e7dcd26ca408458c43df5b83e61 Mon Sep 17 00:00:00 2001
+From: Hugh Daschbach <hugh.daschbach@enmotus.com>
+Date: Fri, 4 Jan 2013 14:39:09 -0800
+Subject: libata: ahci: Add support for Enmotus Bobcat device.
+
+From: Hugh Daschbach <hugh.daschbach@enmotus.com>
+
+commit 7f9c9f8e24590e7dcd26ca408458c43df5b83e61 upstream.
+
+Silicon does not support standard AHCI BAR assignment.  Add
+vendor/device exception to force BAR 2.
+
+Signed-off-by: Hugh Daschbach <hugh.daschbach@enmotus.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -53,6 +53,7 @@
+ 
+ enum {
+       AHCI_PCI_BAR_STA2X11    = 0,
++      AHCI_PCI_BAR_ENMOTUS    = 2,
+       AHCI_PCI_BAR_STANDARD   = 5,
+ };
+ 
+@@ -407,6 +408,9 @@ static const struct pci_device_id ahci_p
+       /* Asmedia */
+       { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },   /* ASM1061 */
+ 
++      /* Enmotus */
++      { PCI_DEVICE(0x1c44, 0x8000), board_ahci },
++
+       /* Generic, PCI class code for AHCI */
+       { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+         PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
+@@ -1079,9 +1083,11 @@ static int ahci_init_one(struct pci_dev
+               dev_info(&pdev->dev,
+                        "PDC42819 can only drive SATA devices with this driver\n");
+ 
+-      /* The Connext uses non-standard BAR */
++      /* Both Connext and Enmotus devices use non-standard BARs */
+       if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06)
+               ahci_pci_bar = AHCI_PCI_BAR_STA2X11;
++      else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
++              ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
+ 
+       /* acquire resources */
+       rc = pcim_enable_device(pdev);

diff --git a/queue-3.4/series b/queue-3.4/series
index 29d27885acae8b76958793ffd6d2d43cbde6354c..4679435ed0dd36f5faa119d7fbd20f462bf1118a 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -1 +1,2 @@
 drm-i915-invalidate-the-relocation-presumed_offsets-along-the-slow-path.patch
+libata-ahci-add-support-for-enmotus-bobcat-device.patch