EDAC, sb_edac: Remove variable length array usage
In preparation for enabling -Wvla, remove VLA and replace it with a fixed-length array instead. Also, remove max_interleave as it is no longer needed. Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20180314182131.GA25259@embeddedgus Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
parent
58ca9ac146
commit
6fd0526652
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue