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: [v4] EDAC, sb_edac: Remove VLA usage From: "Gustavo A. R. Silva" Message-Id: <20180314182131.GA25259@embeddedgus> Date: Wed, 14 Mar 2018 13:21:32 -0500 To: Mauro Carvalho Chehab , Borislav Petkov Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-ID: SW4gcHJlcGFyYXRpb24gdG8gZW5hYmxpbmcgLVd2bGEsIHJlbW92ZSBWTEEgYW5kIHJlcGxhY2Ug aXQKd2l0aCBhIGZpeGVkLWxlbmd0aCBhcnJheSBpbnN0ZWFkLgoKRml4ZWQgYXMgcGFydCBvZiB0 aGUgZGlyZWN0aXZlIHRvIHJlbW92ZSBhbGwgVkxBcyBmcm9tCnRoZSBrZXJuZWw6IGh0dHBzOi8v bGttbC5vcmcvbGttbC8yMDE4LzMvNy82MjEKCkFsc28sIHJlbW92ZSBtYXhfaW50ZXJsZWF2ZSBh cyBpdCBpcyBubyBsb25nZXIgdXNlZnVsLgoKUmV2aWV3ZWQtYnk6IE1hdXJvIENhcnZhbGhvIENo ZWhhYiA8bWNoZWhhYkBzLW9wZW5zb3VyY2UuY29tPgpTaWduZWQtb2ZmLWJ5OiBHdXN0YXZvIEEu IFIuIFNpbHZhIDxndXN0YXZvQGVtYmVkZGVkb3IuY29tPgotLS0KQ2hhbmdlcyBpbiB2NDoKIC0g UmVtb3ZlIG1heF9pbnRlcmxlYXZlLgoKQ2hhbmdlcyBpbiB2MzoKIC0gVXBkYXRlIG1hY3JvIE1B WF9JTlRFUkxFQVZFIGluIG9yZGVyIHRvIGF2b2lkIHRvbyBsb25nIGxpbmVzLgogICBUaGlzIGNo YW5nZSBpcyBiYXNlZCBvbiBNYXVybydzIGZlZWRiYWNrLgogLSBVcGRhdGUgY2hhbmdlbG9nIHdp dGggTWF1cm8ncyBSZXZpZXdlZC1ieS4KCkNoYW5nZXMgaW4gdjI6CiAtIFVzZSBtYWNybyBtYXhf dCB0byBjb21wdXRlIHRoZSBtYXggb2YgYWxsIHRocmVlIGFycmF5IHNpemVzLgogICBUaGlzIGNo YW5nZSBpcyBiYXNlZCBvbiBCb3Jpc2xhdidzIGZlZWRiYWNrLgoKIGRyaXZlcnMvZWRhYy9zYl9l ZGFjLmMgfCAxMiArKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyks IDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL3NiX2VkYWMuYyBiL2Ry aXZlcnMvZWRhYy9zYl9lZGFjLmMKaW5kZXggODcyMTAwMi4uNGE4OWM4MCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9lZGFjL3NiX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvc2JfZWRhYy5jCkBAIC0x MTAsNiArMTEwLDEwIEBAIHN0YXRpYyBjb25zdCB1MzIga25sX2ludGVybGVhdmVfbGlzdFtdID0g ewogCTB4ZGMsIDB4ZTQsIDB4ZWMsIDB4ZjQsIDB4ZmMsIC8qIDE1LTE5ICovCiAJMHgxMDQsIDB4 MTBjLCAweDExNCwgMHgxMWMsICAgLyogMjAtMjMgKi8KIH07CisjZGVmaW5lIE1BWF9JTlRFUkxF QVZFCQkJCQkJCVwKKwkobWF4X3QodW5zaWduZWQgaW50LCBBUlJBWV9TSVpFKHNicmlkZ2VfaW50 ZXJsZWF2ZV9saXN0KSwJXAorCSAgICAgICBtYXhfdCh1bnNpZ25lZCBpbnQsIEFSUkFZX1NJWkUo aWJyaWRnZV9pbnRlcmxlYXZlX2xpc3QpLAlcCisJCSAgICAgQVJSQVlfU0laRShrbmxfaW50ZXJs ZWF2ZV9saXN0KSkpKQogCiBzdHJ1Y3QgaW50ZXJsZWF2ZV9wa2cgewogCXVuc2lnbmVkIGNoYXIg c3RhcnQ7CkBAIC0zMjEsNyArMzI1LDYgQEAgc3RydWN0IHNicmlkZ2VfaW5mbyB7CiAJY29uc3Qg dTMyCSppbnRlcmxlYXZlX2xpc3Q7CiAJY29uc3Qgc3RydWN0IGludGVybGVhdmVfcGtnICppbnRl cmxlYXZlX3BrZzsKIAl1OAkJbWF4X3NhZDsKLQl1OAkJbWF4X2ludGVybGVhdmU7CiAJdTgJCSgq Z2V0X25vZGVfaWQpKHN0cnVjdCBzYnJpZGdlX3B2dCAqcHZ0KTsKIAllbnVtIG1lbV90eXBlCSgq Z2V0X21lbW9yeV90eXBlKShzdHJ1Y3Qgc2JyaWRnZV9wdnQgKnB2dCk7CiAJZW51bSBkZXZfdHlw ZQkoKmdldF93aWR0aCkoc3RydWN0IHNicmlkZ2VfcHZ0ICpwdnQsIHUzMiBtdHIpOwpAQCAtMTg5 OSw3ICsxOTAyLDcgQEAgc3RhdGljIGludCBnZXRfbWVtb3J5X2Vycm9yX2RhdGEoc3RydWN0IG1l bV9jdGxfaW5mbyAqbWNpLAogCWludAkJCW5fcmlyLCBuX3NhZHMsIG5fdGFkcywgc2FkX3dheSwg c2NrX3hjaDsKIAlpbnQJCQlzYWRfaW50ZXJsLCBpZHgsIGJhc2VfY2g7CiAJaW50CQkJaW50ZXJs ZWF2ZV9tb2RlLCBzaGlmdHVwID0gMDsKLQl1bnNpZ25lZAkJc2FkX2ludGVybGVhdmVbcHZ0LT5p bmZvLm1heF9pbnRlcmxlYXZlXTsKKwl1bnNpZ25lZCBpbnQJCXNhZF9pbnRlcmxlYXZlW01BWF9J TlRFUkxFQVZFXTsKIAl1MzIJCQlyZWcsIGRyYW1fcnVsZTsKIAl1OAkJCWNoX3dheSwgc2NrX3dh eSwgcGtnLCBzYWRfaGEgPSAwOwogCXUzMgkJCXRhZF9vZmZzZXQ7CkBAIC0zMTY5LDcgKzMxNzIs NiBAQCBzdGF0aWMgaW50IHNicmlkZ2VfcmVnaXN0ZXJfbWNpKHN0cnVjdCBzYnJpZGdlX2RldiAq c2JyaWRnZV9kZXYsIGVudW0gdHlwZSB0eXBlKQogCQlwdnQtPmluZm8uZHJhbV9hdHRyID0gZHJh bV9hdHRyOwogCQlwdnQtPmluZm8ubWF4X3NhZCA9IEFSUkFZX1NJWkUoaWJyaWRnZV9kcmFtX3J1 bGUpOwogCQlwdnQtPmluZm8uaW50ZXJsZWF2ZV9saXN0ID0gaWJyaWRnZV9pbnRlcmxlYXZlX2xp c3Q7Ci0JCXB2dC0+aW5mby5tYXhfaW50ZXJsZWF2ZSA9IEFSUkFZX1NJWkUoaWJyaWRnZV9pbnRl cmxlYXZlX2xpc3QpOwogCQlwdnQtPmluZm8uaW50ZXJsZWF2ZV9wa2cgPSBpYnJpZGdlX2ludGVy bGVhdmVfcGtnOwogCQlwdnQtPmluZm8uZ2V0X3dpZHRoID0gaWJyaWRnZV9nZXRfd2lkdGg7CiAK QEAgLTMxOTQsNyArMzE5Niw2IEBAIHN0YXRpYyBpbnQgc2JyaWRnZV9yZWdpc3Rlcl9tY2koc3Ry dWN0IHNicmlkZ2VfZGV2ICpzYnJpZGdlX2RldiwgZW51bSB0eXBlIHR5cGUpCiAJCXB2dC0+aW5m by5kcmFtX2F0dHIgPSBkcmFtX2F0dHI7CiAJCXB2dC0+aW5mby5tYXhfc2FkID0gQVJSQVlfU0la RShzYnJpZGdlX2RyYW1fcnVsZSk7CiAJCXB2dC0+aW5mby5pbnRlcmxlYXZlX2xpc3QgPSBzYnJp ZGdlX2ludGVybGVhdmVfbGlzdDsKLQkJcHZ0LT5pbmZvLm1heF9pbnRlcmxlYXZlID0gQVJSQVlf U0laRShzYnJpZGdlX2ludGVybGVhdmVfbGlzdCk7CiAJCXB2dC0+aW5mby5pbnRlcmxlYXZlX3Br ZyA9IHNicmlkZ2VfaW50ZXJsZWF2ZV9wa2c7CiAJCXB2dC0+aW5mby5nZXRfd2lkdGggPSBzYnJp ZGdlX2dldF93aWR0aDsKIApAQCAtMzIxOSw3ICszMjIwLDYgQEAgc3RhdGljIGludCBzYnJpZGdl X3JlZ2lzdGVyX21jaShzdHJ1Y3Qgc2JyaWRnZV9kZXYgKnNicmlkZ2VfZGV2LCBlbnVtIHR5cGUg dHlwZSkKIAkJcHZ0LT5pbmZvLmRyYW1fYXR0ciA9IGRyYW1fYXR0cjsKIAkJcHZ0LT5pbmZvLm1h eF9zYWQgPSBBUlJBWV9TSVpFKGlicmlkZ2VfZHJhbV9ydWxlKTsKIAkJcHZ0LT5pbmZvLmludGVy bGVhdmVfbGlzdCA9IGlicmlkZ2VfaW50ZXJsZWF2ZV9saXN0OwotCQlwdnQtPmluZm8ubWF4X2lu dGVybGVhdmUgPSBBUlJBWV9TSVpFKGlicmlkZ2VfaW50ZXJsZWF2ZV9saXN0KTsKIAkJcHZ0LT5p bmZvLmludGVybGVhdmVfcGtnID0gaWJyaWRnZV9pbnRlcmxlYXZlX3BrZzsKIAkJcHZ0LT5pbmZv LmdldF93aWR0aCA9IGlicmlkZ2VfZ2V0X3dpZHRoOwogCkBAIC0zMjQ0LDcgKzMyNDQsNiBAQCBz dGF0aWMgaW50IHNicmlkZ2VfcmVnaXN0ZXJfbWNpKHN0cnVjdCBzYnJpZGdlX2RldiAqc2JyaWRn ZV9kZXYsIGVudW0gdHlwZSB0eXBlKQogCQlwdnQtPmluZm8uZHJhbV9hdHRyID0gZHJhbV9hdHRy OwogCQlwdnQtPmluZm8ubWF4X3NhZCA9IEFSUkFZX1NJWkUoaWJyaWRnZV9kcmFtX3J1bGUpOwog CQlwdnQtPmluZm8uaW50ZXJsZWF2ZV9saXN0ID0gaWJyaWRnZV9pbnRlcmxlYXZlX2xpc3Q7Ci0J CXB2dC0+aW5mby5tYXhfaW50ZXJsZWF2ZSA9IEFSUkFZX1NJWkUoaWJyaWRnZV9pbnRlcmxlYXZl X2xpc3QpOwogCQlwdnQtPmluZm8uaW50ZXJsZWF2ZV9wa2cgPSBpYnJpZGdlX2ludGVybGVhdmVf cGtnOwogCQlwdnQtPmluZm8uZ2V0X3dpZHRoID0gYnJvYWR3ZWxsX2dldF93aWR0aDsKIApAQCAt MzI2OSw3ICszMjY4LDYgQEAgc3RhdGljIGludCBzYnJpZGdlX3JlZ2lzdGVyX21jaShzdHJ1Y3Qg c2JyaWRnZV9kZXYgKnNicmlkZ2VfZGV2LCBlbnVtIHR5cGUgdHlwZSkKIAkJcHZ0LT5pbmZvLmRy YW1fYXR0ciA9IGRyYW1fYXR0cl9rbmw7CiAJCXB2dC0+aW5mby5tYXhfc2FkID0gQVJSQVlfU0la RShrbmxfZHJhbV9ydWxlKTsKIAkJcHZ0LT5pbmZvLmludGVybGVhdmVfbGlzdCA9IGtubF9pbnRl cmxlYXZlX2xpc3Q7Ci0JCXB2dC0+aW5mby5tYXhfaW50ZXJsZWF2ZSA9IEFSUkFZX1NJWkUoa25s X2ludGVybGVhdmVfbGlzdCk7CiAJCXB2dC0+aW5mby5pbnRlcmxlYXZlX3BrZyA9IGlicmlkZ2Vf aW50ZXJsZWF2ZV9wa2c7CiAJCXB2dC0+aW5mby5nZXRfd2lkdGggPSBrbmxfZ2V0X3dpZHRoOwog Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbeCNSVf (ORCPT ); Wed, 14 Mar 2018 14:21:35 -0400 Received: from gateway22.websitewelcome.com ([192.185.47.129]:37004 "EHLO gateway22.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbeCNSVe (ORCPT ); Wed, 14 Mar 2018 14:21:34 -0400 Date: Wed, 14 Mar 2018 13:21:32 -0500 From: "Gustavo A. R. Silva" To: Mauro Carvalho Chehab , Borislav Petkov Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH v4] EDAC, sb_edac: Remove VLA usage Message-ID: <20180314182131.GA25259@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: 1ewB1p-001sw1-AR X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedgus) [189.175.117.58]:44066 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 4 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 Also, remove max_interleave as it is no longer useful. Reviewed-by: Mauro Carvalho Chehab Signed-off-by: Gustavo A. R. Silva --- Changes in v4: - Remove max_interleave. Changes in v3: - Update macro MAX_INTERLEAVE in order to avoid too long lines. This change is based on Mauro's feedback. - Update changelog with Mauro's Reviewed-by. 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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 8721002..4a89c80 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; @@ -321,7 +325,6 @@ struct sbridge_info { const u32 *interleave_list; const struct interleave_pkg *interleave_pkg; u8 max_sad; - u8 max_interleave; u8 (*get_node_id)(struct sbridge_pvt *pvt); enum mem_type (*get_memory_type)(struct sbridge_pvt *pvt); enum dev_type (*get_width)(struct sbridge_pvt *pvt, u32 mtr); @@ -1899,7 +1902,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; @@ -3169,7 +3172,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) pvt->info.dram_attr = dram_attr; pvt->info.max_sad = ARRAY_SIZE(ibridge_dram_rule); pvt->info.interleave_list = ibridge_interleave_list; - pvt->info.max_interleave = ARRAY_SIZE(ibridge_interleave_list); pvt->info.interleave_pkg = ibridge_interleave_pkg; pvt->info.get_width = ibridge_get_width; @@ -3194,7 +3196,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) pvt->info.dram_attr = dram_attr; pvt->info.max_sad = ARRAY_SIZE(sbridge_dram_rule); pvt->info.interleave_list = sbridge_interleave_list; - pvt->info.max_interleave = ARRAY_SIZE(sbridge_interleave_list); pvt->info.interleave_pkg = sbridge_interleave_pkg; pvt->info.get_width = sbridge_get_width; @@ -3219,7 +3220,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) pvt->info.dram_attr = dram_attr; pvt->info.max_sad = ARRAY_SIZE(ibridge_dram_rule); pvt->info.interleave_list = ibridge_interleave_list; - pvt->info.max_interleave = ARRAY_SIZE(ibridge_interleave_list); pvt->info.interleave_pkg = ibridge_interleave_pkg; pvt->info.get_width = ibridge_get_width; @@ -3244,7 +3244,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) pvt->info.dram_attr = dram_attr; pvt->info.max_sad = ARRAY_SIZE(ibridge_dram_rule); pvt->info.interleave_list = ibridge_interleave_list; - pvt->info.max_interleave = ARRAY_SIZE(ibridge_interleave_list); pvt->info.interleave_pkg = ibridge_interleave_pkg; pvt->info.get_width = broadwell_get_width; @@ -3269,7 +3268,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) pvt->info.dram_attr = dram_attr_knl; pvt->info.max_sad = ARRAY_SIZE(knl_dram_rule); pvt->info.interleave_list = knl_interleave_list; - pvt->info.max_interleave = ARRAY_SIZE(knl_interleave_list); pvt->info.interleave_pkg = ibridge_interleave_pkg; pvt->info.get_width = knl_get_width; -- 2.7.4