From 9218a2e921908f37a75e1800bf4640413e8ce8d1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 22 Jul 2017 15:32:37 +0200 Subject: [PATCH] 3.18-stable patches added patches: wlcore-fix-64k-page-support.patch --- queue-3.18/series | 1 + queue-3.18/wlcore-fix-64k-page-support.patch | 41 ++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 queue-3.18/wlcore-fix-64k-page-support.patch diff --git a/queue-3.18/series b/queue-3.18/series index 29cd1ebf064..d5fef6498ef 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -12,3 +12,4 @@ include-stddef.h-move-offsetofend-from-vfio.h-to-a-generic-kernel-header.patch stddef.h-move-offsetofend-inside-ifndef-endif-guard-neaten.patch nfc-add-sockaddr-length-checks-before-accessing-sa_family-in-bind-handlers.patch bluetooth-use-constant-time-memory-comparison-for-secret-values.patch +wlcore-fix-64k-page-support.patch diff --git a/queue-3.18/wlcore-fix-64k-page-support.patch b/queue-3.18/wlcore-fix-64k-page-support.patch new file mode 100644 index 00000000000..c343e711937 --- /dev/null +++ b/queue-3.18/wlcore-fix-64k-page-support.patch @@ -0,0 +1,41 @@ +From 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Thu, 11 May 2017 13:52:09 +0200 +Subject: wlcore: fix 64K page support + +From: Arnd Bergmann + +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 +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + 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 \ -- 2.47.3