Skip to content

GitLab

Commit b7f6525d authored by Justin Chadwell's avatar Justin Chadwell Committed by Madhukar Pappireddy
Browse files

Enable -Wshadow always 



Variable shadowing is, according to the C standard, permitted and valid
behaviour. However, allowing a local variable to take the same name as a
global one can cause confusion and can make refactoring and bug hunting
more difficult.

This patch moves -Wshadow from WARNING2 into the general warning group
so it is always used. It also fixes all warnings that this introduces
by simply renaming the local variable to a new name

Change-Id: I6b71bdce6580c6e58b5e0b41e4704ab0aa38576e
Signed-off-by: default avatarJustin Chadwell <justin.chadwell@arm.com>
parent b8baa934
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ b7f6525d
...@@ -230,7 +230,7 @@ ASFLAGS_aarch64 = $(march64-directive) ...@@ -230,7 +230,7 @@ ASFLAGS_aarch64 = $(march64-directive)
# General warnings # General warnings
WARNINGS := -Wall -Wmissing-include-dirs -Wunused \ WARNINGS := -Wall -Wmissing-include-dirs -Wunused \
-Wdisabled-optimization -Wvla \ -Wdisabled-optimization -Wvla -Wshadow \
-Wno-unused-parameter -Wno-unused-parameter
# Additional warnings # Additional warnings
...@@ -242,10 +242,10 @@ WARNING1 += -Wmissing-prototypes ...@@ -242,10 +242,10 @@ WARNING1 += -Wmissing-prototypes
WARNING1 += -Wold-style-definition WARNING1 += -Wold-style-definition
WARNING1 += -Wunused-const-variable WARNING1 += -Wunused-const-variable
# Level 2
WARNING2 := -Waggregate-return WARNING2 := -Waggregate-return
WARNING2 += -Wcast-align WARNING2 += -Wcast-align
WARNING2 += -Wnested-externs WARNING2 += -Wnested-externs
WARNING2 += -Wshadow
WARNING2 += -Wlogical-op WARNING2 += -Wlogical-op
WARNING3 := -Wbad-function-cast WARNING3 := -Wbad-function-cast
......
drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
View file @ b7f6525d
...@@ -254,10 +254,10 @@ static void ddrtbl_setval(uint32_t *tbl, uint32_t _regdef, uint32_t val); ...@@ -254,10 +254,10 @@ static void ddrtbl_setval(uint32_t *tbl, uint32_t _regdef, uint32_t val);
static uint32_t ddrtbl_getval(uint32_t *tbl, uint32_t _regdef); static uint32_t ddrtbl_getval(uint32_t *tbl, uint32_t _regdef);
static uint32_t ddrphy_regif_chk(void); static uint32_t ddrphy_regif_chk(void);
static inline void ddrphy_regif_idle(void); static inline void ddrphy_regif_idle(void);
static uint16_t _f_scale(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, uint32_t ps, static uint16_t _f_scale(uint32_t _ddr_mbps, uint32_t _ddr_mbpsdiv, uint32_t ps,
uint16_t cyc); uint16_t cyc);
static void _f_scale_js2(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, static void _f_scale_js2(uint32_t _ddr_mbps, uint32_t _ddr_mbpsdiv,
uint16_t *js2); uint16_t *_js2);
static int16_t _f_scale_adj(int16_t ps); static int16_t _f_scale_adj(int16_t ps);
static void ddrtbl_load(void); static void ddrtbl_load(void);
static void ddr_config_sub(void); static void ddr_config_sub(void);
...@@ -991,15 +991,15 @@ static uint16_t js2[JS2_CNT]; ...@@ -991,15 +991,15 @@ static uint16_t js2[JS2_CNT];
static uint8_t RL; static uint8_t RL;
static uint8_t WL; static uint8_t WL;
static uint16_t _f_scale(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, uint32_t ps, static uint16_t _f_scale(uint32_t _ddr_mbps, uint32_t _ddr_mbpsdiv, uint32_t ps,
uint16_t cyc) uint16_t cyc)
{ {
uint32_t tmp; uint32_t tmp;
uint32_t div; uint32_t div;
tmp = (((uint32_t)(ps) + 9) / 10) * ddr_mbps; tmp = (((uint32_t)(ps) + 9) / 10) * _ddr_mbps;
div = tmp / (200000 * ddr_mbpsdiv); div = tmp / (200000 * _ddr_mbpsdiv);
if (tmp != (div * 200000 * ddr_mbpsdiv)) if (tmp != (div * 200000 * _ddr_mbpsdiv))
div = div + 1; div = div + 1;
if (div > cyc) if (div > cyc)
...@@ -1007,19 +1007,19 @@ static uint16_t _f_scale(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, uint32_t ps, ...@@ -1007,19 +1007,19 @@ static uint16_t _f_scale(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, uint32_t ps,
return cyc; return cyc;
} }
static void _f_scale_js2(uint32_t ddr_mbps, uint32_t ddr_mbpsdiv, static void _f_scale_js2(uint32_t _ddr_mbps, uint32_t _ddr_mbpsdiv,
uint16_t *js2) uint16_t *_js2)
{ {
int i; int i;
for (i = 0; i < JS2_TBLCNT; i++) { for (i = 0; i < JS2_TBLCNT; i++) {
js2[i] = _f_scale(ddr_mbps, ddr_mbpsdiv, _js2[i] = _f_scale(_ddr_mbps, _ddr_mbpsdiv,
1UL * jedec_spec2[JS2_DERATE][i].ps, 1UL * jedec_spec2[JS2_DERATE][i].ps,
jedec_spec2[JS2_DERATE][i].cyc); jedec_spec2[JS2_DERATE][i].cyc);
} }
js2[js2_trcpb] = js2[js2_tras] + js2[js2_trppb]; _js2[js2_trcpb] = _js2[js2_tras] + _js2[js2_trppb];
js2[js2_trcab] = js2[js2_tras] + js2[js2_trpab]; _js2[js2_trcab] = _js2[js2_tras] + _js2[js2_trpab];
} }
/* scaler for DELAY value */ /* scaler for DELAY value */
......
plat/layerscape/common/ns_access.c
View file @ b7f6525d
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "ns_access.h" #include "ns_access.h"
static void enable_devices_ns_access(struct csu_ns_dev *ns_dev, uint32_t num) static void enable_devices_ns_access(struct csu_ns_dev *_ns_dev, uint32_t num)
{ {
uint32_t *base = (uint32_t *)CONFIG_SYS_FSL_CSU_ADDR; uint32_t *base = (uint32_t *)CONFIG_SYS_FSL_CSU_ADDR;
uint32_t *reg; uint32_t *reg;
...@@ -21,14 +21,14 @@ static void enable_devices_ns_access(struct csu_ns_dev *ns_dev, uint32_t num) ...@@ -21,14 +21,14 @@ static void enable_devices_ns_access(struct csu_ns_dev *ns_dev, uint32_t num)
int i; int i;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
reg = base + ns_dev[i].ind / 2; reg = base + _ns_dev[i].ind / 2;
val = be32toh(mmio_read_32((uintptr_t)reg)); val = be32toh(mmio_read_32((uintptr_t)reg));
if (ns_dev[i].ind % 2 == 0) { if (_ns_dev[i].ind % 2 == 0) {
val &= 0x0000ffff; val &= 0x0000ffff;
val |= ns_dev[i].val << 16; val |= _ns_dev[i].val << 16;
} else { } else {
val &= 0xffff0000; val &= 0xffff0000;
val |= ns_dev[i].val; val |= _ns_dev[i].val;
} }
mmio_write_32((uintptr_t)reg, htobe32(val)); mmio_write_32((uintptr_t)reg, htobe32(val));
} }
......
plat/mediatek/mt8173/drivers/spm/spm_suspend.c
View file @ b7f6525d
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -239,13 +239,13 @@ static struct pwr_ctrl spm_ctrl = { ...@@ -239,13 +239,13 @@ static struct pwr_ctrl spm_ctrl = {
/* /*
* go_to_sleep_before_wfi() - trigger SPM to enter suspend scenario * go_to_sleep_before_wfi() - trigger SPM to enter suspend scenario
*/ */
static void go_to_sleep_before_wfi(const unsigned int spm_flags) static void go_to_sleep_before_wfi(const unsigned int flags_spm)
{ {
struct pwr_ctrl *pwrctrl; struct pwr_ctrl *pwrctrl;
pwrctrl = &spm_ctrl; pwrctrl = &spm_ctrl;
set_pwrctrl_pcm_flags(pwrctrl, spm_flags); set_pwrctrl_pcm_flags(pwrctrl, flags_spm);
spm_set_sysclk_settle(); spm_set_sysclk_settle();
......
plat/renesas/rcar/bl2_plat_setup.c
View file @ b7f6525d
...@@ -408,7 +408,7 @@ struct meminfo *bl2_plat_sec_mem_layout(void) ...@@ -408,7 +408,7 @@ struct meminfo *bl2_plat_sec_mem_layout(void)
return &bl2_tzram_layout; return &bl2_tzram_layout;
} }
static void bl2_populate_compatible_string(void *fdt) static void bl2_populate_compatible_string(void *dt)
{ {
uint32_t board_type; uint32_t board_type;
uint32_t board_rev; uint32_t board_rev;
...@@ -419,32 +419,32 @@ static void bl2_populate_compatible_string(void *fdt) ...@@ -419,32 +419,32 @@ static void bl2_populate_compatible_string(void *fdt)
rcar_get_board_type(&board_type, &board_rev); rcar_get_board_type(&board_type, &board_rev);
switch (board_type) { switch (board_type) {
case BOARD_SALVATOR_X: case BOARD_SALVATOR_X:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,salvator-x"); "renesas,salvator-x");
break; break;
case BOARD_SALVATOR_XS: case BOARD_SALVATOR_XS:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,salvator-xs"); "renesas,salvator-xs");
break; break;
case BOARD_STARTER_KIT: case BOARD_STARTER_KIT:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,m3ulcb"); "renesas,m3ulcb");
break; break;
case BOARD_STARTER_KIT_PRE: case BOARD_STARTER_KIT_PRE:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,h3ulcb"); "renesas,h3ulcb");
break; break;
case BOARD_EAGLE: case BOARD_EAGLE:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,eagle"); "renesas,eagle");
break; break;
case BOARD_EBISU: case BOARD_EBISU:
case BOARD_EBISU_4D: case BOARD_EBISU_4D:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,ebisu"); "renesas,ebisu");
break; break;
case BOARD_DRAAK: case BOARD_DRAAK:
ret = fdt_setprop_string(fdt, 0, "compatible", ret = fdt_setprop_string(dt, 0, "compatible",
"renesas,draak"); "renesas,draak");
break; break;
default: default:
...@@ -460,27 +460,27 @@ static void bl2_populate_compatible_string(void *fdt) ...@@ -460,27 +460,27 @@ static void bl2_populate_compatible_string(void *fdt)
reg = mmio_read_32(RCAR_PRR); reg = mmio_read_32(RCAR_PRR);
switch (reg & PRR_PRODUCT_MASK) { switch (reg & PRR_PRODUCT_MASK) {
case PRR_PRODUCT_H3: case PRR_PRODUCT_H3:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a7795"); "renesas,r8a7795");
break; break;
case PRR_PRODUCT_M3: case PRR_PRODUCT_M3:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a7796"); "renesas,r8a7796");
break; break;
case PRR_PRODUCT_M3N: case PRR_PRODUCT_M3N:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a77965"); "renesas,r8a77965");
break; break;
case PRR_PRODUCT_V3M: case PRR_PRODUCT_V3M:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a77970"); "renesas,r8a77970");
break; break;
case PRR_PRODUCT_E3: case PRR_PRODUCT_E3:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a77990"); "renesas,r8a77990");
break; break;
case PRR_PRODUCT_D3: case PRR_PRODUCT_D3:
ret = fdt_appendprop_string(fdt, 0, "compatible", ret = fdt_appendprop_string(dt, 0, "compatible",
"renesas,r8a77995"); "renesas,r8a77995");
break; break;
default: default:
......
plat/rockchip/rk3399/drivers/dram/dfs.c
View file @ b7f6525d
/* /*
* Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -78,10 +78,10 @@ static struct rk3399_sdram_default_config lpddr4_default_config = { ...@@ -78,10 +78,10 @@ static struct rk3399_sdram_default_config lpddr4_default_config = {
.zqcsi = 0 .zqcsi = 0
}; };
static uint32_t get_cs_die_capability(struct rk3399_sdram_params *sdram_config, static uint32_t get_cs_die_capability(struct rk3399_sdram_params *ram_config,
uint8_t channel, uint8_t cs) uint8_t channel, uint8_t cs)
{ {
struct rk3399_sdram_channel *ch = &sdram_config->ch[channel]; struct rk3399_sdram_channel *ch = &ram_config->ch[channel];
uint32_t bandwidth; uint32_t bandwidth;
uint32_t die_bandwidth; uint32_t die_bandwidth;
uint32_t die; uint32_t die;
......
services/std_svc/spm_mm/spm_main.c
View file @ b7f6525d
/* /*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -86,14 +86,14 @@ int sp_state_try_switch(sp_context_t *sp_ptr, sp_state_t from, sp_state_t to) ...@@ -86,14 +86,14 @@ int sp_state_try_switch(sp_context_t *sp_ptr, sp_state_t from, sp_state_t to)
* This function takes an SP context pointer and performs a synchronous entry * This function takes an SP context pointer and performs a synchronous entry
* into it. * into it.
******************************************************************************/ ******************************************************************************/
static uint64_t spm_sp_synchronous_entry(sp_context_t *sp_ctx) static uint64_t spm_sp_synchronous_entry(sp_context_t *ctx)
{ {
uint64_t rc; uint64_t rc;
assert(sp_ctx != NULL); assert(ctx != NULL);
/* Assign the context of the SP to this CPU */ /* Assign the context of the SP to this CPU */
cm_set_context(&(sp_ctx->cpu_ctx), SECURE); cm_set_context(&(ctx->cpu_ctx), SECURE);
/* Restore the context assigned above */ /* Restore the context assigned above */
cm_el1_sysregs_context_restore(SECURE); cm_el1_sysregs_context_restore(SECURE);
...@@ -104,7 +104,7 @@ static uint64_t spm_sp_synchronous_entry(sp_context_t *sp_ctx) ...@@ -104,7 +104,7 @@ static uint64_t spm_sp_synchronous_entry(sp_context_t *sp_ctx)
dsbish(); dsbish();
/* Enter Secure Partition */ /* Enter Secure Partition */
rc = spm_secure_partition_enter(&sp_ctx->c_rt_ctx); rc = spm_secure_partition_enter(&ctx->c_rt_ctx);
/* Save secure state */ /* Save secure state */
cm_el1_sysregs_context_save(SECURE); cm_el1_sysregs_context_save(SECURE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment