UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wlcore: fix 64K page support 

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.

Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Arnd Bergmann 2017-05-11 13:52:09 +02:00 committed by Kalle Valo
parent c07036f18d
commit 4a4274bf2d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ti/wlcore/spi.c
View File

@ -70,10 +70,10 @@
#define WSPI_MAX_CHUNK_SIZE 4092 #define WSPI_MAX_CHUNK_SIZE 4092
/* /*
* wl18xx driver aggregation buffer size is (13 * PAGE_SIZE) compared to * wl18xx driver aggregation buffer size is (13 * 4K) compared to
* (4 * PAGE_SIZE) for wl12xx, so use the larger buffer needed for wl18xx * (4 * 4K) for wl12xx, so use the larger buffer needed for wl18xx
*/ */
#define SPI_AGGR_BUFFER_SIZE (13 * PAGE_SIZE) #define SPI_AGGR_BUFFER_SIZE (13 * SZ_4K)
/* Maximum number of SPI write chunks */ /* Maximum number of SPI write chunks */
#define WSPI_MAX_NUM_OF_CHUNKS \ #define WSPI_MAX_NUM_OF_CHUNKS \