lkml.org 
[lkml]   [2018]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v2] EDAC, sb_edac: Remove VLA usage
Em Tue, 13 Mar 2018 06:20:34 -0500
"Gustavo A. R. Silva" <gustavo@embeddedor.com> escreveu:

> 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 <gustavo@embeddedor.com>
> ---
> 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))))
> +

In order to avoid too long lines, it would be better to do it as:

#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))))


With that:

Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

>
> 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;



Thanks,
Mauro

\
 
 \ /
  Last update: 2018-03-13 14:22    [W:0.039 / U:4.076 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site