From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] EDAC, sb_edac: Remove VLA usage From: "Gustavo A. R. Silva" Message-Id: <20180313112034.GA28234@embeddedgus> Date: Tue, 13 Mar 2018 06:20:34 -0500 To: Borislav Petkov , Mauro Carvalho Chehab Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: SW4gcHJlcGFyYXRpb24gdG8gZW5hYmxpbmcgLVd2bGEsIHJlbW92ZSBWTEEgYW5kIHJlcGxhY2Ug aXQKd2l0aCBhIGZpeGVkLWxlbmd0aCBhcnJheSBpbnN0ZWFkLgoKRml4ZWQgYXMgcGFydCBvZiB0 aGUgZGlyZWN0aXZlIHRvIHJlbW92ZSBhbGwgVkxBcyBmcm9tCnRoZSBrZXJuZWw6IGh0dHBzOi8v bGttbC5vcmcvbGttbC8yMDE4LzMvNy82MjEKClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gQS4gUi4g U2lsdmEgPGd1c3Rhdm9AZW1iZWRkZWRvci5jb20+Ci0tLQpDaGFuZ2VzIGluIHYyOgogLSBVc2Ug bWFjcm8gbWF4X3QgdG8gY29tcHV0ZSB0aGUgbWF4IG9mIGFsbCB0aHJlZSBhcnJheSBzaXplcy4K ICAgVGhpcyBjaGFuZ2UgaXMgYmFzZWQgb24gQm9yaXNsYXYncyBmZWVkYmFjay4KCiBkcml2ZXJz L2VkYWMvc2JfZWRhYy5jIHwgNiArKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvc2JfZWRhYy5jIGIv ZHJpdmVycy9lZGFjL3NiX2VkYWMuYwppbmRleCA4NzIxMDAyLi4xOTZiMDEyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2VkYWMvc2JfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9zYl9lZGFjLmMKQEAg LTExMCw2ICsxMTAsMTAgQEAgc3RhdGljIGNvbnN0IHUzMiBrbmxfaW50ZXJsZWF2ZV9saXN0W10g PSB7CiAJMHhkYywgMHhlNCwgMHhlYywgMHhmNCwgMHhmYywgLyogMTUtMTkgKi8KIAkweDEwNCwg MHgxMGMsIDB4MTE0LCAweDExYywgICAvKiAyMC0yMyAqLwogfTsKKyNkZWZpbmUgTUFYX0lOVEVS TEVBVkUgKG1heF90KHVuc2lnbmVkIGludCwgQVJSQVlfU0laRShzYnJpZGdlX2ludGVybGVhdmVf bGlzdCksXAorCQkJbWF4X3QodW5zaWduZWQgaW50LCBBUlJBWV9TSVpFKGlicmlkZ2VfaW50ZXJs ZWF2ZV9saXN0KSxcCisJCQkJCSAgICBBUlJBWV9TSVpFKGtubF9pbnRlcmxlYXZlX2xpc3QpKSkp CisKIAogc3RydWN0IGludGVybGVhdmVfcGtnIHsKIAl1bnNpZ25lZCBjaGFyIHN0YXJ0OwpAQCAt MTg5OSw3ICsxOTAzLDcgQEAgc3RhdGljIGludCBnZXRfbWVtb3J5X2Vycm9yX2RhdGEoc3RydWN0 IG1lbV9jdGxfaW5mbyAqbWNpLAogCWludAkJCW5fcmlyLCBuX3NhZHMsIG5fdGFkcywgc2FkX3dh eSwgc2NrX3hjaDsKIAlpbnQJCQlzYWRfaW50ZXJsLCBpZHgsIGJhc2VfY2g7CiAJaW50CQkJaW50 ZXJsZWF2ZV9tb2RlLCBzaGlmdHVwID0gMDsKLQl1bnNpZ25lZAkJc2FkX2ludGVybGVhdmVbcHZ0 LT5pbmZvLm1heF9pbnRlcmxlYXZlXTsKKwl1bnNpZ25lZCBpbnQJCXNhZF9pbnRlcmxlYXZlW01B WF9JTlRFUkxFQVZFXTsKIAl1MzIJCQlyZWcsIGRyYW1fcnVsZTsKIAl1OAkJCWNoX3dheSwgc2Nr X3dheSwgcGtnLCBzYWRfaGEgPSAwOwogCXUzMgkJCXRhZF9vZmZzZXQ7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932864AbeCMLlo (ORCPT ); Tue, 13 Mar 2018 07:41:44 -0400 Received: from gateway36.websitewelcome.com ([50.116.127.2]:36133 "EHLO gateway36.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932503AbeCMLln (ORCPT ); Tue, 13 Mar 2018 07:41:43 -0400 Date: Tue, 13 Mar 2018 06:20:34 -0500 From: "Gustavo A. R. Silva" To: Borislav Petkov , Mauro Carvalho Chehab Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] EDAC, sb_edac: Remove VLA usage Message-ID: <20180313112034.GA28234@embeddedgus> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.175.117.58 X-Source-L: No X-Exim-ID: 1evhyt-001f22-5a X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedgus) [189.175.117.58]:52010 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 8 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation to enabling -Wvla, remove VLA and replace it with a fixed-length array instead. Fixed as part of the directive to remove all VLAs from the kernel: https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - Use macro max_t to compute the max of all three array sizes. This change is based on Borislav's feedback. drivers/edac/sb_edac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 8721002..196b012 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -110,6 +110,10 @@ static const u32 knl_interleave_list[] = { 0xdc, 0xe4, 0xec, 0xf4, 0xfc, /* 15-19 */ 0x104, 0x10c, 0x114, 0x11c, /* 20-23 */ }; +#define MAX_INTERLEAVE (max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list),\ + max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list),\ + ARRAY_SIZE(knl_interleave_list)))) + struct interleave_pkg { unsigned char start; @@ -1899,7 +1903,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci, int n_rir, n_sads, n_tads, sad_way, sck_xch; int sad_interl, idx, base_ch; int interleave_mode, shiftup = 0; - unsigned sad_interleave[pvt->info.max_interleave]; + unsigned int sad_interleave[MAX_INTERLEAVE]; u32 reg, dram_rule; u8 ch_way, sck_way, pkg, sad_ha = 0; u32 tad_offset; -- 2.7.4