3.10-stable patches

added patches:
	ahci-add-device-ids-for-intel-9-series-pch.patch
	ahci-add-pcid-for-marvel-0x9182-controller.patch
	pata_scc-propagate-return-value-of-scc_wait_after_reset.patch

diff --git a/queue-3.10/ahci-add-device-ids-for-intel-9-series-pch.patch b/queue-3.10/ahci-add-device-ids-for-intel-9-series-pch.patch
new file mode 100644 (file)
index 0000000..99c4248
--- /dev/null
+++ b/queue-3.10/ahci-add-device-ids-for-intel-9-series-pch.patch
@@ -0,0 +1,36 @@
+From 1b071a0947dbce5c184c12262e02540fbc493457 Mon Sep 17 00:00:00 2001
+From: James Ralston <james.d.ralston@intel.com>
+Date: Wed, 27 Aug 2014 14:29:07 -0700
+Subject: ahci: Add Device IDs for Intel 9 Series PCH
+
+From: James Ralston <james.d.ralston@intel.com>
+
+commit 1b071a0947dbce5c184c12262e02540fbc493457 upstream.
+
+This patch adds the AHCI mode SATA Device IDs for the Intel 9 Series PCH.
+
+Signed-off-by: James Ralston <james.d.ralston@intel.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -304,6 +304,14 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */
+       { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */
+       { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */
++      { PCI_VDEVICE(INTEL, 0x8c83), board_ahci }, /* 9 Series AHCI */
++      { PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */
++      { PCI_VDEVICE(INTEL, 0x8c85), board_ahci }, /* 9 Series RAID */
++      { PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */
++      { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */
++      { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */
++      { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */
+ 
+       /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+       { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

diff --git a/queue-3.10/ahci-add-pcid-for-marvel-0x9182-controller.patch b/queue-3.10/ahci-add-pcid-for-marvel-0x9182-controller.patch
new file mode 100644 (file)
index 0000000..c640ae3
--- /dev/null
+++ b/queue-3.10/ahci-add-pcid-for-marvel-0x9182-controller.patch
@@ -0,0 +1,32 @@
+From c5edfff9db6f4d2c35c802acb4abe0df178becee Mon Sep 17 00:00:00 2001
+From: Murali Karicheri <m-karicheri2@ti.com>
+Date: Fri, 5 Sep 2014 13:21:00 -0400
+Subject: ahci: add pcid for Marvel 0x9182 controller
+
+From: Murali Karicheri <m-karicheri2@ti.com>
+
+commit c5edfff9db6f4d2c35c802acb4abe0df178becee upstream.
+
+Keystone K2E EVM uses Marvel 0x9182 controller. This requires support
+for the ID in the ahci driver.
+
+Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
+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
+@@ -449,6 +449,8 @@ static const struct pci_device_id ahci_p
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
+         .driver_data = board_ahci_yes_fbs },                  /* 88se9172 */
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),
++        .driver_data = board_ahci_yes_fbs },                  /* 88se9182 */
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9182),
+         .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 */

diff --git a/queue-3.10/pata_scc-propagate-return-value-of-scc_wait_after_reset.patch b/queue-3.10/pata_scc-propagate-return-value-of-scc_wait_after_reset.patch
new file mode 100644 (file)
index 0000000..635f963
--- /dev/null
+++ b/queue-3.10/pata_scc-propagate-return-value-of-scc_wait_after_reset.patch
@@ -0,0 +1,65 @@
+From 4dc7c76cd500fa78c64adfda4b070b870a2b993c Mon Sep 17 00:00:00 2001
+From: Arjun Sreedharan <arjun024@gmail.com>
+Date: Sun, 17 Aug 2014 20:00:09 +0530
+Subject: pata_scc: propagate return value of scc_wait_after_reset
+
+From: Arjun Sreedharan <arjun024@gmail.com>
+
+commit 4dc7c76cd500fa78c64adfda4b070b870a2b993c upstream.
+
+scc_bus_softreset not necessarily should return zero.
+Propagate the error code.
+
+Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/pata_scc.c |   15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+--- a/drivers/ata/pata_scc.c
++++ b/drivers/ata/pata_scc.c
+@@ -586,7 +586,7 @@ static int scc_wait_after_reset(struct a
+  *    Note: Original code is ata_bus_softreset().
+  */
+ 
+-static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,
++static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,
+                                       unsigned long deadline)
+ {
+       struct ata_ioports *ioaddr = &ap->ioaddr;
+@@ -600,9 +600,7 @@ static unsigned int scc_bus_softreset(st
+       udelay(20);
+       out_be32(ioaddr->ctl_addr, ap->ctl);
+ 
+-      scc_wait_after_reset(&ap->link, devmask, deadline);
+-
+-      return 0;
++      return scc_wait_after_reset(&ap->link, devmask, deadline);
+ }
+ 
+ /**
+@@ -619,7 +617,8 @@ static int scc_softreset(struct ata_link
+ {
+       struct ata_port *ap = link->ap;
+       unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
+-      unsigned int devmask = 0, err_mask;
++      unsigned int devmask = 0;
++      int rc;
+       u8 err;
+ 
+       DPRINTK("ENTER\n");
+@@ -635,9 +634,9 @@ static int scc_softreset(struct ata_link
+ 
+       /* issue bus reset */
+       DPRINTK("about to softreset, devmask=%x\n", devmask);
+-      err_mask = scc_bus_softreset(ap, devmask, deadline);
+-      if (err_mask) {
+-              ata_port_err(ap, "SRST failed (err_mask=0x%x)\n", err_mask);
++      rc = scc_bus_softreset(ap, devmask, deadline);
++      if (rc) {
++              ata_port_err(ap, "SRST failed (err_mask=0x%x)\n", rc);
+               return -EIO;
+       }
+ 

diff --git a/queue-3.10/series b/queue-3.10/series
index f5f97dd4079f2f85ab4d55b34072e43468bb24a8..e01d665dea1351fb644783f002f1ef67119b95a6 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -9,3 +9,6 @@ drm-ttm-fix-possible-division-by-0-in-ttm_dma_pool_shrink_scan.patch
 drm-ttm-choose-a-pool-to-shrink-correctly-in-ttm_dma_pool_shrink_scan.patch
 drm-radeon-load-the-lm63-driver-for-an-lm64-thermal-chip.patch
 drm-i915-read-head-register-back-in-init_ring_common-to-enforce-ordering.patch
+pata_scc-propagate-return-value-of-scc_wait_after_reset.patch
+ahci-add-device-ids-for-intel-9-series-pch.patch
+ahci-add-pcid-for-marvel-0x9182-controller.patch