From patchwork Tue May 9 10:05:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98895 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739442qge; Tue, 9 May 2017 03:05:22 -0700 (PDT) X-Received: by 10.99.3.208 with SMTP id 199mr23483081pgd.43.1494324322366; Tue, 09 May 2017 03:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324322; cv=none; d=google.com; s=arc-20160816; b=BhgxNiBoJ+B1o/Sm1qLD/OuwBZro32Om8q5i6PEe1oizszuvFj0YuYa8rufM8FYzl2 CZnpPAPLVXVyAvsjpauL8ra0BwsgVrW58KZ/GB69RUnSaOW+2CzzUidSflhOuINyhVep SzIYwongD8ZwFyMz6+YWYMCeeOJN87FRakwVQ5V4hQFcSORPu8IV1DUuMVBMcxKCUfs2 ZL+9n5hTteiuPwX5gDF0hAoz1yCDtnAMdiv4FtsaFhWpc3WapZTYG4Xn3IB64YaQCJ5Y L+HQPY5Y5P35SBy1dFoyKyIPh1JrXU0ki2noHl/nvs5b0uT+tnwQRNFbqE7tOQbyQRPn dsVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NHh6C4yQTTYXP65A2jAtpjXU2WSrU8LAsrwENY+KHN0=; b=pY/FgHPNXG00tVaVEZwPRpKA7s+QkVRzcTPx3lzxRwHyrq4YbYarZE/UsZ3cqDlKBO /cA0cYGkEOQMmZeqtC5o5nTpCfyAx1fV+JABsCb8Hw/g+YlMRQKE8MLRRYBQHc8zjhx5 kmQVcpeYHUB7lOF8Yl6s0dxRLMd2qqJaq85eqXxM0K3bTMY8IJ6jpdjbMf/1ojX6Mf1q H4syaqzgCCgqCtc4NmaqKq0Uzy6L43QMADO4zV8qSxEGXf8OYRhUXvp419I4SAtxdJxA gCXzdn5V7ub8yjZwOisTk80btThXyBzx28XsS9tX+4GvBhueIVkPJi3hO5jnLgGswyFp 2AWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si12805392pgn.51.2017.05.09.03.05.22; Tue, 09 May 2017 03:05:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752139AbdEIKFV (ORCPT + 6 others); Tue, 9 May 2017 06:05:21 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:57891 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdEIKFU (ORCPT ); Tue, 9 May 2017 06:05:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6AQg-1dx6Si0cws-00y7ZK; Tue, 09 May 2017 12:05:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 12/14] wlcore: fix 64K page support Date: Tue, 9 May 2017 12:05:00 +0200 Message-Id: <20170509100502.1358298-13-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:onc3oQP/Pu5osgLkdoWJpyerOKs6WVeum6wIswt9BwNhxcF4/no POjo4U8IP6z+wCPSR0sZNZse7t0Nea3wiRt12v511vix5E0s8Fn4k+W0wp1Ffyka9p+WRwr 1FBTMqkfcJqI/k1maJ57urDb2n8f2Y3xOZcJsPw7S3pSoMUNLzfsx4B1AnEfzF8thYLWU1N L1hGIAesrh9rt7tGxjTfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:AdPz3RpFHQY=:GOl2frtvdK6a9imfsBhO30 Ec9F9E81skLyPD0bulftsPCvUdD6vKkPw+Jw2GXApboBvvMwztmhy5fwZ8kqJ7BYvhL1amLmM HK3xonToUybXQvGQX2e0fQgAb79utkJAN3IlmpbhjtVwkHvWyDUgE13m42rufr7qmpzRbyB/q I3Yf+SYV8nYimzW0ii0Ggl5H+XtyLhgRDU32ICdUZ7+4el2ZWPfA6ToqwuQWhnDt3XS6ISOH9 zxZrSkQx7qvJ8oSps6ofaWY3Vcyipc52l53mz4t/Lu8NG++mOdHzO24LGzJO/dzWEpJacnW5m Xrqecx7qnaGef8Ut17dEtSOUsjuS24j04HI2eYDlinZZkNnoLVPHZEEDTPxu08xIn5ql1Ruu8 7FTkiKNfaO9WrGbl4VTjGDTqt+6kzwDxR46wcOcE5sPifZ1nc1ERswQ6QHjhpRQ/T4+qrvDpp WnitzEh+dh7cfbzADJ0UVQLtEfLHbkW8m9x8fXNa/M5tgIVbf565WjKdWQ6oZHMy+Wapfs83R IQylt//AD0J7rqnC8XPGnL3mK6gzf1PDRPg6cFVS1PWaLx00fGtW54IU6PuIxaC0XZHReh/Q0 WRzHAYmdcb55TOKOA4MCnATAv8QMErwnKItra6VQeR9D6ml3OTzWkP6FCFL0B3Xi3TDTMqk4v 5RAIKRI8FitblRLu68fUjqAvZiZ9AoSYDCGOokiFxSM18/AWHg3ZgMkpYSTe0Co0tiJs= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 --- drivers/net/wireless/ti/wlcore/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index a460fe669443..48559a5baffa 100644 --- 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 \