4.1-stable patches

added patches:
	ath10k-fix-qca61x4-hw2.1-support.patch

diff --git a/queue-4.1/ath10k-fix-qca61x4-hw2.1-support.patch b/queue-4.1/ath10k-fix-qca61x4-hw2.1-support.patch
new file mode 100644 (file)
index 0000000..3f519f0
--- /dev/null
+++ b/queue-4.1/ath10k-fix-qca61x4-hw2.1-support.patch
@@ -0,0 +1,43 @@
+From 11a002efbaa7fbd9f6e616695ab42aa9f1caf060 Mon Sep 17 00:00:00 2001
+From: Michal Kazior <michal.kazior@tieto.com>
+Date: Mon, 20 Apr 2015 09:20:41 +0000
+Subject: ath10k: fix qca61x4 hw2.1 support
+
+From: Michal Kazior <michal.kazior@tieto.com>
+
+commit 11a002efbaa7fbd9f6e616695ab42aa9f1caf060 upstream.
+
+During initialization firmware does some sort of
+memory switch between DRAM and IRAM. If
+configuration value for bank switching isn't
+correct device crashes during init.
+
+The new value prevents firmware 11.0.0.302 (and
+possibly others) for qca61x4 hw2.1 from crashing
+during init.
+
+Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
+Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath10k/pci.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath10k/pci.c
++++ b/drivers/net/wireless/ath/ath10k/pci.c
+@@ -1524,12 +1524,11 @@ static int ath10k_pci_get_num_banks(stru
+               switch (MS(ar->chip_id, SOC_CHIP_ID_REV)) {
+               case QCA6174_HW_1_0_CHIP_ID_REV:
+               case QCA6174_HW_1_1_CHIP_ID_REV:
++              case QCA6174_HW_2_1_CHIP_ID_REV:
++              case QCA6174_HW_2_2_CHIP_ID_REV:
+                       return 3;
+               case QCA6174_HW_1_3_CHIP_ID_REV:
+                       return 2;
+-              case QCA6174_HW_2_1_CHIP_ID_REV:
+-              case QCA6174_HW_2_2_CHIP_ID_REV:
+-                      return 6;
+               case QCA6174_HW_3_0_CHIP_ID_REV:
+               case QCA6174_HW_3_1_CHIP_ID_REV:
+               case QCA6174_HW_3_2_CHIP_ID_REV:

diff --git a/queue-4.1/series b/queue-4.1/series
index 4069931dac05258e0891462215eeaa788c074e97..bbf6f7d6d7d53ca44375d95a3e04f7aef14fa5f6 100644 (file)
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -27,3 +27,4 @@ usb-udc-core-add-device_del-call-to-error-pathway.patch
 usb-chipidea-ehci_init_driver-is-intended-to-call-one-time.patch
 phy-twl4030-usb-make-runtime-pm-more-reliable.patch
 md-use-kzalloc-when-bitmap-is-disabled.patch
+ath10k-fix-qca61x4-hw2.1-support.patch