From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 22 Jul 2017 13:32:49 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v3.18.63~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1501b2997ae360a87f349dfc145019c08149709f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	wlcore-fix-64k-page-support.patch
---

diff --git a/queue-4.4/series b/queue-4.4/series
index e09015ca7e9..474a6a8e5be 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -18,3 +18,4 @@ perf-intel-pt-fix-missing-stack-clear.patch
 perf-intel-pt-ensure-ip-is-zero-when-state-is-intel_pt_state_no_ip.patch
 perf-intel-pt-clear-fup-flag-on-error.patch
 bluetooth-use-constant-time-memory-comparison-for-secret-values.patch
+wlcore-fix-64k-page-support.patch
diff --git a/queue-4.4/wlcore-fix-64k-page-support.patch b/queue-4.4/wlcore-fix-64k-page-support.patch
new file mode 100644
index 00000000000..c343e711937
--- /dev/null
+++ b/queue-4.4/wlcore-fix-64k-page-support.patch
@@ -0,0 +1,41 @@
+From 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 11 May 2017 13:52:09 +0200
+Subject: wlcore: fix 64K page support
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 upstream.
+
+In the stable linux-3.16 branch, I ran into a warning in the
+wlcore driver:
+
+drivers/net/wireless/ti/wlcore/spi.c: In function 'wl12xx_spi_raw_write':
+drivers/net/wireless/ti/wlcore/spi.c:315:1: error: the frame size of 12848 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
+
+Newer kernels no longer show the warning, but the bug is still there,
+as the allocation is based on the CPU page size rather than the
+actual capabilities of the hardware.
+
+This replaces the PAGE_SIZE macro with the SZ_4K macro, i.e. 4096 bytes
+per buffer.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ti/wlcore/spi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ti/wlcore/spi.c
++++ b/drivers/net/wireless/ti/wlcore/spi.c
+@@ -71,7 +71,7 @@
+  * only support SPI for 12xx - this code should be reworked when 18xx
+  * support is introduced
+  */
+-#define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
++#define SPI_AGGR_BUFFER_SIZE (4 * SZ_4K)
+ 
+ /* Maximum number of SPI write chunks */
+ #define WSPI_MAX_NUM_OF_CHUNKS \