From: Borislav Petkov <bp@alien8.de>
To: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [v3] EDAC, sb_edac: Remove VLA usage
Date: Wed, 14 Mar 2018 19:03:06 +0100 [thread overview]
Message-ID: <20180314180305.GI16605@pd.tnic> (raw)
On Tue, Mar 13, 2018 at 08:44:49AM -0500, Gustavo A. R. Silva wrote:
> 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
>
> Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> 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 | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
> index 8721002..aff4778 100644
> --- a/drivers/edac/sb_edac.c
> +++ b/drivers/edac/sb_edac.c
> @@ -110,6 +110,11 @@ 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 +1904,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];
Where's the hunk removing ->max_interleave ?
WARNING: multiple messages have this Message-ID (diff)
From: Borislav Petkov <bp@alien8.de>
To: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] EDAC, sb_edac: Remove VLA usage
Date: Wed, 14 Mar 2018 19:03:06 +0100 [thread overview]
Message-ID: <20180314180305.GI16605@pd.tnic> (raw)
In-Reply-To: <20180313134449.GA24398@embeddedgus>
On Tue, Mar 13, 2018 at 08:44:49AM -0500, Gustavo A. R. Silva wrote:
> 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
>
> Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> 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 | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
> index 8721002..aff4778 100644
> --- a/drivers/edac/sb_edac.c
> +++ b/drivers/edac/sb_edac.c
> @@ -110,6 +110,11 @@ 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 +1904,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];
Where's the hunk removing ->max_interleave ?
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next reply other threads:[~2018-03-14 18:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 18:03 Borislav Petkov [this message]
2018-03-14 18:03 ` [PATCH v3] EDAC, sb_edac: Remove VLA usage Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2018-03-14 18:23 [v3] " Gustavo A. R. Silva
2018-03-14 18:23 ` [PATCH v3] " Gustavo A. R. Silva
2018-03-13 13:44 [v3] " Gustavo A. R. Silva
2018-03-13 13:44 ` [PATCH v3] " Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180314180305.GI16605@pd.tnic \
--to=bp@alien8.de \
--cc=gustavo@embeddedor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.