Remove several warnings reported with W=2
Improved support for W=2 compilation flag by solving some nested-extern and sign-compare warnings. The libraries are compiling with warnings (which turn into errors with the Werror flag). Outside of libraries, some warnings cannot be fixed. Change-Id: I06b1923857f2a6a50e93d62d0274915b268cef05 Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
This commit is contained in:
parent
609e053caa
commit
bde2836fcc
|
@ -52,9 +52,6 @@ __dead2 static void bl1_fwu_done(void *client_cookie, void *reserved);
|
||||||
*/
|
*/
|
||||||
static unsigned int sec_exec_image_id = INVALID_IMAGE_ID;
|
static unsigned int sec_exec_image_id = INVALID_IMAGE_ID;
|
||||||
|
|
||||||
/* Authentication status of each image. */
|
|
||||||
extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Top level handler for servicing FWU SMCs.
|
* Top level handler for servicing FWU SMCs.
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
*/
|
*/
|
||||||
|
@ -18,7 +18,8 @@
|
||||||
int scmi_ap_core_set_reset_addr(void *p, uint64_t reset_addr, uint32_t attr)
|
int scmi_ap_core_set_reset_addr(void *p, uint64_t reset_addr, uint32_t attr)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
@ -51,7 +52,8 @@ int scmi_ap_core_set_reset_addr(void *p, uint64_t reset_addr, uint32_t attr)
|
||||||
int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr)
|
int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
uint32_t lo_addr, hi_addr;
|
uint32_t lo_addr, hi_addr;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
*/
|
*/
|
||||||
|
@ -90,7 +90,8 @@ void scmi_put_channel(scmi_channel_t *ch)
|
||||||
int scmi_proto_version(void *p, uint32_t proto_id, uint32_t *version)
|
int scmi_proto_version(void *p, uint32_t proto_id, uint32_t *version)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
@ -122,7 +123,8 @@ int scmi_proto_msg_attr(void *p, uint32_t proto_id,
|
||||||
uint32_t command_id, uint32_t *attr)
|
uint32_t command_id, uint32_t *attr)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2017, 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
|
||||||
*/
|
*/
|
||||||
|
@ -19,7 +19,8 @@ int scmi_pwr_state_set(void *p, uint32_t domain_id,
|
||||||
uint32_t scmi_pwr_state)
|
uint32_t scmi_pwr_state)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Only asynchronous mode of `set power state` command is allowed on
|
* Only asynchronous mode of `set power state` command is allowed on
|
||||||
|
@ -59,7 +60,8 @@ int scmi_pwr_state_get(void *p, uint32_t domain_id,
|
||||||
uint32_t *scmi_pwr_state)
|
uint32_t *scmi_pwr_state)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2017, 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
|
||||||
*/
|
*/
|
||||||
|
@ -18,7 +18,8 @@
|
||||||
int scmi_sys_pwr_state_set(void *p, uint32_t flags, uint32_t system_state)
|
int scmi_sys_pwr_state_set(void *p, uint32_t flags, uint32_t system_state)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
@ -50,7 +51,8 @@ int scmi_sys_pwr_state_set(void *p, uint32_t flags, uint32_t system_state)
|
||||||
int scmi_sys_pwr_state_get(void *p, uint32_t *system_state)
|
int scmi_sys_pwr_state_get(void *p, uint32_t *system_state)
|
||||||
{
|
{
|
||||||
mailbox_mem_t *mbx_mem;
|
mailbox_mem_t *mbx_mem;
|
||||||
int token = 0, ret;
|
unsigned int token = 0;
|
||||||
|
int ret;
|
||||||
scmi_channel_t *ch = (scmi_channel_t *)p;
|
scmi_channel_t *ch = (scmi_channel_t *)p;
|
||||||
|
|
||||||
validate_scmi_channel(ch);
|
validate_scmi_channel(ch);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
*/
|
*/
|
||||||
|
@ -99,7 +99,7 @@ void css_scp_suspend(const struct psci_power_state *target_state)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#if !HW_ASSISTED_COHERENCY
|
#if !HW_ASSISTED_COHERENCY
|
||||||
int lvl;
|
unsigned int lvl;
|
||||||
uint32_t scmi_pwr_state = 0;
|
uint32_t scmi_pwr_state = 0;
|
||||||
/*
|
/*
|
||||||
* If we reach here, then assert that power down at system power domain
|
* If we reach here, then assert that power down at system power domain
|
||||||
|
@ -145,7 +145,8 @@ void css_scp_suspend(const struct psci_power_state *target_state)
|
||||||
*/
|
*/
|
||||||
void css_scp_off(const struct psci_power_state *target_state)
|
void css_scp_off(const struct psci_power_state *target_state)
|
||||||
{
|
{
|
||||||
int lvl = 0, ret;
|
unsigned int lvl = 0;
|
||||||
|
int ret;
|
||||||
uint32_t scmi_pwr_state = 0;
|
uint32_t scmi_pwr_state = 0;
|
||||||
|
|
||||||
/* At-least the CPU level should be specified to be OFF */
|
/* At-least the CPU level should be specified to be OFF */
|
||||||
|
@ -184,7 +185,8 @@ void css_scp_off(const struct psci_power_state *target_state)
|
||||||
*/
|
*/
|
||||||
void css_scp_on(u_register_t mpidr)
|
void css_scp_on(u_register_t mpidr)
|
||||||
{
|
{
|
||||||
int lvl = 0, ret, core_pos;
|
unsigned int lvl = 0;
|
||||||
|
int ret, core_pos;
|
||||||
uint32_t scmi_pwr_state = 0;
|
uint32_t scmi_pwr_state = 0;
|
||||||
|
|
||||||
for (; lvl <= PLAT_MAX_PWR_LVL; lvl++)
|
for (; lvl <= PLAT_MAX_PWR_LVL; lvl++)
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include <drivers/arm/sp804_delay_timer.h>
|
||||||
#include <drivers/delay_timer.h>
|
#include <drivers/delay_timer.h>
|
||||||
#include <lib/mmio.h>
|
#include <lib/mmio.h>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015-2018, 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
|
||||||
*/
|
*/
|
||||||
|
@ -30,10 +30,6 @@
|
||||||
|
|
||||||
#pragma weak plat_set_nv_ctr2
|
#pragma weak plat_set_nv_ctr2
|
||||||
|
|
||||||
/* Pointer to CoT */
|
|
||||||
extern const auth_img_desc_t *const cot_desc_ptr;
|
|
||||||
extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
|
|
||||||
|
|
||||||
static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a,
|
static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a,
|
||||||
const auth_param_type_desc_t *b)
|
const auth_param_type_desc_t *b)
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
console_t *console_list;
|
console_t *console_list;
|
||||||
uint8_t console_state = CONSOLE_FLAG_BOOT;
|
uint8_t console_state = CONSOLE_FLAG_BOOT;
|
||||||
|
|
||||||
|
IMPORT_SYM(console_t *, __STACKS_START__, stacks_start)
|
||||||
|
IMPORT_SYM(console_t *, __STACKS_END__, stacks_end)
|
||||||
|
|
||||||
int console_register(console_t *console)
|
int console_register(console_t *console)
|
||||||
{
|
{
|
||||||
IMPORT_SYM(console_t *, __STACKS_START__, stacks_start)
|
|
||||||
IMPORT_SYM(console_t *, __STACKS_END__, stacks_end)
|
|
||||||
|
|
||||||
/* Assert that the struct is not on the stack (common mistake). */
|
/* Assert that the struct is not on the stack (common mistake). */
|
||||||
assert((console < stacks_start) || (console >= stacks_end));
|
assert((console < stacks_start) || (console >= stacks_end));
|
||||||
/* Assert that we won't make a circle in the list. */
|
/* Assert that we won't make a circle in the list. */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -160,7 +160,7 @@ long semihosting_system(char *command_line)
|
||||||
long semihosting_get_flen(const char *file_name)
|
long semihosting_get_flen(const char *file_name)
|
||||||
{
|
{
|
||||||
long file_handle;
|
long file_handle;
|
||||||
size_t length;
|
long length;
|
||||||
|
|
||||||
assert(semihosting_connection_supported());
|
assert(semihosting_connection_supported());
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ static int is_watchdog_reset(void)
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
int plat_arm_bl1_fwu_needed(void)
|
int plat_arm_bl1_fwu_needed(void)
|
||||||
{
|
{
|
||||||
const uint32_t *nv_flags_ptr = (const uint32_t *)V2M_SYS_NVFLAGS_ADDR;
|
const int32_t *nv_flags_ptr = (const int32_t *)V2M_SYS_NVFLAGS_ADDR;
|
||||||
|
|
||||||
/* Check if TOC is invalid or watchdog reset happened. */
|
/* Check if TOC is invalid or watchdog reset happened. */
|
||||||
if ((arm_io_is_toc_valid() != 1) ||
|
if ((arm_io_is_toc_valid() != 1) ||
|
||||||
|
|
|
@ -42,7 +42,7 @@ int spm_response_add(uint16_t client_id, uint16_t handle, uint32_t token,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < ARRAY_SIZE(responses); i++) {
|
for (unsigned int i = 0U; i < ARRAY_SIZE(responses); i++) {
|
||||||
struct sprt_response *resp = &(responses[i]);
|
struct sprt_response *resp = &(responses[i]);
|
||||||
|
|
||||||
if (resp->is_valid == 0) {
|
if (resp->is_valid == 0) {
|
||||||
|
|
Loading…
Reference in New Issue